Skip to content

Commit 832e96f

Browse files
sdrabenhsdrabenh
authored
Merge branch 'develop' into feature/adarmenov/update_ww3_to_noaa
2 parents 7ca9c34 + e625513 commit 832e96f

File tree

33 files changed

+12442
-13271
lines changed

33 files changed

+12442
-13271
lines changed

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5986,11 +5986,13 @@ subroutine Driver ( RC )
59865986

59875987
!--------------- GOSWIM IMPORTS FROM GOCART ---------------
59885988
! Initialization
5989-
RCONSTIT(:,:,:) = 0.0
5990-
TOTDEPOS(:,:) = 0.0
5991-
RMELT(:,:) = 0.0
5989+
if (N_constit>0) then
5990+
RCONSTIT(:,:,:) = 0.0
5991+
TOTDEPOS(:,:) = 0.0
5992+
RMELT(:,:) = 0.0
5993+
end if
59925994
!------------------------------------------------------------------
5993-
5995+
59945996
! Zero the light-absorbing aerosol (LAA) deposition rates from GOCART:
59955997

59965998
select case (catchcn_internal%AEROSOL_DEPOSITION)
@@ -6027,6 +6029,8 @@ subroutine Driver ( RC )
60276029
OCSD(:,:)=0.
60286030

60296031
end select
6032+
6033+
if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
60306034

60316035
! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
60326036
! Note: Explanations of each variable
@@ -6066,8 +6070,6 @@ subroutine Driver ( RC )
60666070

60676071
! --------------- GOSWIM PROGRNOSTICS ---------------------------
60686072

6069-
if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
6070-
60716073
! Conversion of the masses of the snow impurities
60726074
! Note: Explanations of each variable
60736075
! Number of snow layer is 15: N = 1-15
@@ -7519,15 +7521,18 @@ subroutine Driver ( RC )
75197521
if(associated(FICE2 )) FICE2 = max( min( FICESOUT(2,:),1.0 ), 0.0 )
75207522
if(associated(FICE3 )) FICE3 = max( min( FICESOUT(3,:),1.0 ), 0.0 )
75217523

7522-
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
7523-
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
7524-
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
7525-
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
7526-
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
7527-
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
7528-
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
7529-
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
7530-
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
7524+
if (N_constit>0) then
7525+
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
7526+
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
7527+
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
7528+
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
7529+
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
7530+
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
7531+
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
7532+
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
7533+
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
7534+
end if
7535+
75317536
if(associated(PEATCLSM_FSWCHANGE)) then
75327537
where (POROS >= PEATCLSM_POROS_THRESHOLD)
75337538
PEATCLSM_FSWCHANGE = FSW_CHANGE

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6015,9 +6015,11 @@ subroutine Driver ( RC )
60156015

60166016
!--------------- GOSWIM IMPORTS FROM GOCART ---------------
60176017
! Initialization
6018-
RCONSTIT(:,:,:) = 0.0
6019-
TOTDEPOS(:,:) = 0.0
6020-
RMELT(:,:) = 0.0
6018+
if (N_constit>0) then
6019+
RCONSTIT(:,:,:) = 0.0
6020+
TOTDEPOS(:,:) = 0.0
6021+
RMELT(:,:) = 0.0
6022+
end if
60216023
!------------------------------------------------------------------
60226024

60236025
! Zero the light-absorbing aerosol (LAA) deposition rates from GOCART:
@@ -6057,6 +6059,8 @@ subroutine Driver ( RC )
60576059

60586060
end select
60596061

6062+
if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
6063+
60606064
! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
60616065
! Note: Explanations of each variable
60626066
! TOTDEPOS(:,1): Combined dust deposition from size bin 1 (dry, conv-scav, ls-scav, sed)
@@ -6095,8 +6099,6 @@ subroutine Driver ( RC )
60956099

60966100
! --------------- GOSWIM PROGRNOSTICS ---------------------------
60976101

6098-
if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
6099-
61006102
! Conversion of the masses of the snow impurities
61016103
! Note: Explanations of each variable
61026104
! Number of snow layer is 15: N = 1-15
@@ -7800,15 +7802,18 @@ subroutine Driver ( RC )
78007802
if(associated(FICE2 )) FICE2 = max( min( FICESOUT(2,:),1.0 ), 0.0 )
78017803
if(associated(FICE3 )) FICE3 = max( min( FICESOUT(3,:),1.0 ), 0.0 )
78027804

7803-
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
7804-
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
7805-
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
7806-
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
7807-
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
7808-
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
7809-
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
7810-
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
7811-
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
7805+
if (N_constit>0) then
7806+
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
7807+
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
7808+
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
7809+
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
7810+
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
7811+
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
7812+
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
7813+
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
7814+
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
7815+
end if
7816+
78127817
if(associated(PEATCLSM_FSWCHANGE )) then
78137818
where (POROS >= PEATCLSM_POROS_THRESHOLD)
78147819
PEATCLSM_FSWCHANGE = FSW_CHANGE

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4904,9 +4904,11 @@ subroutine Driver ( RC )
49044904

49054905
!--------------- GOSWIM IMPORTS FROM GOCART ---------------
49064906
! Initialization
4907-
RCONSTIT(:,:,:) = 0.0
4908-
TOTDEPOS(:,:) = 0.0
4909-
RMELT(:,:) = 0.0
4907+
if (N_constit>0) then
4908+
RCONSTIT(:,:,:) = 0.0
4909+
TOTDEPOS(:,:) = 0.0
4910+
RMELT(:,:) = 0.0
4911+
end if
49104912
!------------------------------------------------------------------
49114913

49124914
! Zero the light-absorbing aerosol (LAA) deposition rates from GOCART:
@@ -4946,6 +4948,8 @@ subroutine Driver ( RC )
49464948

49474949
end select
49484950

4951+
if (CATCH_INTERNAL_STATE%N_CONST_LAND4SNWALB /= 0) then
4952+
49494953
! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
49504954
! Note: Explanations of each variable
49514955
! TOTDEPOS(:,1): Combined dust deposition from size bin 1 (dry, conv-scav, ls-scav, sed)
@@ -5005,7 +5009,6 @@ subroutine Driver ( RC )
50055009
! RCONSTIT(NTILES,N,14): Sea salt mass from size bin 4 in layer N
50065010
! RCONSTIT(NTILES,N,15): Sea salt mass from size bin 5 in layer N
50075011

5008-
if (CATCH_INTERNAL_STATE%N_CONST_LAND4SNWALB /= 0) then
50095012
RCONSTIT(:,:,1) = RDU001(:,:)
50105013
RCONSTIT(:,:,2) = RDU002(:,:)
50115014
RCONSTIT(:,:,3) = RDU003(:,:)
@@ -5933,15 +5936,18 @@ subroutine Driver ( RC )
59335936
if(associated(FICE2 )) FICE2 = max( min( FICESOUT(2,:),1.0 ), 0.0 )
59345937
if(associated(FICE3 )) FICE3 = max( min( FICESOUT(3,:),1.0 ), 0.0 )
59355938

5936-
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
5937-
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
5938-
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
5939-
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
5940-
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
5941-
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
5942-
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
5943-
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
5944-
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
5939+
5940+
if (N_constit>0) then
5941+
if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1)
5942+
if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2)
5943+
if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3)
5944+
if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4)
5945+
if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5)
5946+
if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6)
5947+
if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7)
5948+
if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8)
5949+
if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
5950+
end if
59455951

59465952
if(associated(DZGT1 )) DZGT1 = DZGT(1) ! [m]
59475953
if(associated(DZGT2 )) DZGT2 = DZGT(2) ! [m]

0 commit comments

Comments
 (0)