Skip to content

Commit

Permalink
Merge branch 'develop' into feature/stefanocasirati/irrigation; manua…
Browse files Browse the repository at this point in the history 
…lly resolved conflicts in make_bcs_questionary.py and mkCatchParam.F90; manually edited rmTinyCatchParaMod.F90 to fix merge conflict not detected by git auto-merge
  • Loading branch information
@gmao-rreichle
gmao-rreichle committed Feb 24, 2025
2 parents 9803b4d + e625513 commit fac3b5c
Show file tree
Hide file tree
Showing 33 changed files with 12,443 additions and 13,274 deletions.
35 changes: 20 additions & 15 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5912,11 +5912,13 @@ subroutine Driver ( RC )

!--------------- GOSWIM IMPORTS FROM GOCART ---------------
! Initialization
RCONSTIT(:,:,:) = 0.0
TOTDEPOS(:,:) = 0.0
RMELT(:,:) = 0.0
if (N_constit>0) then
RCONSTIT(:,:,:) = 0.0
TOTDEPOS(:,:) = 0.0
RMELT(:,:) = 0.0
end if
!------------------------------------------------------------------

! Zero the light-absorbing aerosol (LAA) deposition rates from GOCART:

select case (catchcn_internal%AEROSOL_DEPOSITION)
Expand Down Expand Up @@ -5953,6 +5955,8 @@ subroutine Driver ( RC )
OCSD(:,:)=0.

end select

if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then

! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
! Note: Explanations of each variable
Expand Down Expand Up @@ -5992,8 +5996,6 @@ subroutine Driver ( RC )

! --------------- GOSWIM PROGRNOSTICS ---------------------------

if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then

! Conversion of the masses of the snow impurities
! Note: Explanations of each variable
! Number of snow layer is 15: N = 1-15
Expand Down Expand Up @@ -7452,15 +7454,18 @@ subroutine Driver ( RC )
if(associated(FICE2 )) FICE2 = max( min( FICESOUT(2,:),1.0 ), 0.0 )
if(associated(FICE3 )) FICE3 = max( min( FICESOUT(3,:),1.0 ), 0.0 )

if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
if (N_constit>0) then
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
end if

if(associated(PEATCLSM_FSWCHANGE)) then
where (POROS >= PEATCLSM_POROS_THRESHOLD)
PEATCLSM_FSWCHANGE = FSW_CHANGE
Expand Down
33 changes: 19 additions & 14 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5943,9 +5943,11 @@ subroutine Driver ( RC )

!--------------- GOSWIM IMPORTS FROM GOCART ---------------
! Initialization
RCONSTIT(:,:,:) = 0.0
TOTDEPOS(:,:) = 0.0
RMELT(:,:) = 0.0
if (N_constit>0) then
RCONSTIT(:,:,:) = 0.0
TOTDEPOS(:,:) = 0.0
RMELT(:,:) = 0.0
end if
!------------------------------------------------------------------

! Zero the light-absorbing aerosol (LAA) deposition rates from GOCART:
Expand Down Expand Up @@ -5985,6 +5987,8 @@ subroutine Driver ( RC )

end select

if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then

! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
! Note: Explanations of each variable
! TOTDEPOS(:,1): Combined dust deposition from size bin 1 (dry, conv-scav, ls-scav, sed)
Expand Down Expand Up @@ -6023,8 +6027,6 @@ subroutine Driver ( RC )

! --------------- GOSWIM PROGRNOSTICS ---------------------------

if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then

! Conversion of the masses of the snow impurities
! Note: Explanations of each variable
! Number of snow layer is 15: N = 1-15
Expand Down Expand Up @@ -7733,15 +7735,18 @@ subroutine Driver ( RC )
if(associated(FICE2 )) FICE2 = max( min( FICESOUT(2,:),1.0 ), 0.0 )
if(associated(FICE3 )) FICE3 = max( min( FICESOUT(3,:),1.0 ), 0.0 )

if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
if (N_constit>0) then
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
end if

if(associated(PEATCLSM_FSWCHANGE )) then
where (POROS >= PEATCLSM_POROS_THRESHOLD)
PEATCLSM_FSWCHANGE = FSW_CHANGE
Expand Down
32 changes: 19 additions & 13 deletions ...GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4965,9 +4965,11 @@ subroutine Driver ( RC )

!--------------- GOSWIM IMPORTS FROM GOCART ---------------
! Initialization
RCONSTIT(:,:,:) = 0.0
TOTDEPOS(:,:) = 0.0
RMELT(:,:) = 0.0
if (N_constit>0) then
RCONSTIT(:,:,:) = 0.0
TOTDEPOS(:,:) = 0.0
RMELT(:,:) = 0.0
end if
!------------------------------------------------------------------

! Zero the light-absorbing aerosol (LAA) deposition rates from GOCART:
Expand Down Expand Up @@ -5007,6 +5009,8 @@ subroutine Driver ( RC )

end select

if (CATCH_INTERNAL_STATE%N_CONST_LAND4SNWALB /= 0) then

! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
! Note: Explanations of each variable
! TOTDEPOS(:,1): Combined dust deposition from size bin 1 (dry, conv-scav, ls-scav, sed)
Expand Down Expand Up @@ -5066,7 +5070,6 @@ subroutine Driver ( RC )
! RCONSTIT(NTILES,N,14): Sea salt mass from size bin 4 in layer N
! RCONSTIT(NTILES,N,15): Sea salt mass from size bin 5 in layer N

if (CATCH_INTERNAL_STATE%N_CONST_LAND4SNWALB /= 0) then
RCONSTIT(:,:,1) = RDU001(:,:)
RCONSTIT(:,:,2) = RDU002(:,:)
RCONSTIT(:,:,3) = RDU003(:,:)
Expand Down Expand Up @@ -6032,15 +6035,18 @@ subroutine Driver ( RC )
if(associated(FICE2 )) FICE2 = max( min( FICESOUT(2,:),1.0 ), 0.0 )
if(associated(FICE3 )) FICE3 = max( min( FICESOUT(3,:),1.0 ), 0.0 )

if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)

if (N_constit>0) then
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
end if

if(associated(DZGT1 )) DZGT1 = DZGT(1) ! [m]
if(associated(DZGT2 )) DZGT2 = DZGT(2) ! [m]
Expand Down
Loading

0 comments on commit fac3b5c

Please sign in to comment.