Skip to content

Commit 34d174f

Browse files
gmao-rreichlegmao-rreichle
committed
renamed MOSFC_EXTRA_DERIVS_LAND to MOSFC_EXTRA_DERIVS_OFFL_LAND for clarity (GEOS_Catch*GridComp.F90, catch_wrap_state.F90)
1 parent 1b57c53 commit 34d174f

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6152,7 +6152,7 @@ subroutine Driver ( RC )
61526152
ALWN(:,N) = -3.0*BLWN(:,N)*TC(:,N)
61536153
BLWN(:,N) = 4.0*BLWN(:,N)
61546154
end do
6155-
if(catchcn_internal%CHOOSEMOSFC==0 .and. catchcn_internal%MOSFC_EXTRA_DERIVS_LAND==1) then
6155+
if(catchcn_internal%CHOOSEMOSFC==0 .and. catchcn_internal%MOSFC_EXTRA_DERIVS_OFFL_LAND==1) then
61566156
do N=1,NUM_SUBTILES
61576157
DEVSBT(:,N)=CQ(:,N)+max(0.0,-DCQ(:,N)*MAPL_VIREPS*TC(:,N)*(QC(:,N)-QA))
61586158
DEDTC(:,N) =max(0.0,-DCQ(:,N)*(1.+MAPL_VIREPS*QC(:,N))*(QC(:,N)-QA))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6182,7 +6182,7 @@ subroutine Driver ( RC )
61826182
ALWN(:,N) = -3.0*BLWN(:,N)*TC(:,N)
61836183
BLWN(:,N) = 4.0*BLWN(:,N)
61846184
end do
6185-
if(catchcn_internal%CHOOSEMOSFC==0 .and. catchcn_internal%MOSFC_EXTRA_DERIVS_LAND==1) then
6185+
if(catchcn_internal%CHOOSEMOSFC==0 .and. catchcn_internal%MOSFC_EXTRA_DERIVS_OFFL_LAND==1) then
61866186
do N=1,NUM_SUBTILES
61876187
DEVSBT(:,N)=CQ(:,N)+max(0.0,-DCQ(:,N)*MAPL_VIREPS*TC(:,N)*(QC(:,N)-QA))
61886188
DEDTC(:,N) =max(0.0,-DCQ(:,N)*(1.+MAPL_VIREPS*QC(:,N))*(QC(:,N)-QA))

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ subroutine SetServices ( GC, RC )
13991399
RC=STATUS )
14001400
VERIFY_(STATUS)
14011401

1402-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND == 1) then
1402+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND == 1) then
14031403

14041404
! for *analytical* extra derivatives in louissurface
14051405

@@ -1425,7 +1425,7 @@ subroutine SetServices ( GC, RC )
14251425
RC=STATUS )
14261426
VERIFY_(STATUS)
14271427

1428-
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND >= 2) then
1428+
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND >= 2) then
14291429

14301430
! for *numerical* extra derivatives in helfsurface and louissurface
14311431

@@ -3364,14 +3364,14 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
33643364
call MAPL_GetPointer(INTERNAL,WW , 'WW' , RC=STATUS)
33653365
VERIFY_(STATUS)
33663366

3367-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND == 1) then
3367+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND == 1) then
33683368

33693369
call MAPL_GetPointer(INTERNAL,delCH_delTVA , 'delCH_delTVA' , RC=STATUS)
33703370
VERIFY_(STATUS)
33713371
call MAPL_GetPointer(INTERNAL,delCQ_delTVA , 'delCQ_delTVA' , RC=STATUS)
33723372
VERIFY_(STATUS)
33733373

3374-
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND >= 2) then
3374+
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND >= 2) then
33753375

33763376
call MAPL_GetPointer(INTERNAL,delCQ_delQC , 'delCQ_delQC' , RC=STATUS)
33773377
VERIFY_(STATUS)
@@ -3514,7 +3514,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
35143514
allocate(IWATER(NT),STAT=STATUS)
35153515
VERIFY_(STATUS)
35163516

3517-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND>=2) then
3517+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND>=2) then
35183518

35193519
! allocate variables for numerical extra derivatives (louissurface, helfsurface)
35203520

@@ -3632,7 +3632,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
36323632
WW(:,N) = 0.
36333633
CM(:,N) = 0.
36343634

3635-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND==1) then
3635+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND==1) then
36363636

36373637
! analytical extra derivatives (default for Louis)
36383638

@@ -3642,7 +3642,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
36423642

36433643
! none .or. numerical extra derivatives
36443644

3645-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND>=2) then
3645+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND>=2) then
36463646

36473647
! Prep calculation of numerical extra derivatives. Start with calling louissurface with perturbed inputs and
36483648
! save only the perturbed exchange coeffs. The final call with nominal inputs produces the unperturbed
@@ -3658,7 +3658,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
36583658

36593659
call louissurface( 3,N,UU,WW,PS,TA,TC+DeltaTC,QA,QC ,PCU,LAI,DummyZ0T,DZE,DummyCM,CN,RIB,ZT,ZQ,CHpert,CQ ,UUU,UCN,RE)
36603660

3661-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND==2) then
3661+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND==2) then
36623662

36633663
! perturb QC: send in (QC+DeltaQC), get back CQpert
36643664

@@ -3677,7 +3677,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
36773677

36783678
call louissurface(3,N,UU,WW,PS,TA,TC,QA,QC,PCU,LAI,Z0T,DZE,CM,CN,RIB,ZT,ZQ,CH,CQ,UUU,UCN,RE)
36793679

3680-
end if ! MOSFC_EXTRA_DERIVS_LAND
3680+
end if ! MOSFC_EXTRA_DERIVS_OFFL_LAND
36813681

36823682
elseif (CATCH_INTERNAL_STATE%CHOOSEMOSFC.eq.1)then
36833683

@@ -3692,7 +3692,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
36923692
PSL = PSMB * (1. - (DZE*MAPL_GRAV)/(MAPL_RGAS*(TA+TC(:,N)) ) ) / &
36933693
(1. + (DZE*MAPL_GRAV)/(MAPL_RGAS*(TA+TC(:,N)) ) )
36943694

3695-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND==2) then
3695+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND==2) then
36963696

36973697
! Prep calculation of numerical extra derivatives. Start with calling louissurface with perturbed inputs and
36983698
! save only the perturbed exchange coeffs. The final call with nominal inputs produces the unperturbed
@@ -3723,7 +3723,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
37233723

37243724
CQpert( :,N) = VKH
37253725

3726-
end if ! MOSFC_EXTRA_DERIVS_LAND==2
3726+
end if ! MOSFC_EXTRA_DERIVS_OFFL_LAND==2
37273727

37283728
! Call with nominal inputs [after calls with perturbed inputs to obtain correct outputs (Z0T, [*]2m, [*]10m, etc.)]
37293729

@@ -3757,14 +3757,14 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
37573757

37583758
endif ! CHOOSEMOSFC
37593759

3760-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND==2) then
3760+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND==2) then
37613761

37623762
! finalize numerical derivatives
37633763

37643764
delCH_delTC(:,N) = (CHpert(:,N) - CH(:,N)) / DeltaTC(:,N)
37653765
delCQ_delQC(:,N) = (CQpert(:,N) - CQ(:,N)) / DeltaQC(:,N)
37663766

3767-
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND==3) then
3767+
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND==3) then
37683768

37693769
! finalize numerical derivatives (valid for Louis only!)
37703770

@@ -3876,7 +3876,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
38763876
deallocate(IWATER)
38773877
deallocate(PSMB)
38783878
deallocate(PSL)
3879-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND>=2) then
3879+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND>=2) then
38803880
deallocate(DeltaTC )
38813881
deallocate(DeltaQC )
38823882
deallocate(CHpert )
@@ -4703,12 +4703,12 @@ subroutine Driver ( RC )
47034703
call MAPL_GetPointer(INTERNAL,CQ ,'CQ' ,RC=STATUS); VERIFY_(STATUS)
47044704
call MAPL_GetPointer(INTERNAL,FR ,'FR' ,RC=STATUS); VERIFY_(STATUS)
47054705

4706-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND == 1) then
4706+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND == 1) then
47074707

47084708
call MAPL_GetPointer(INTERNAL,delCQ_delTVA ,'delCQ_delTVA' ,RC=STATUS); VERIFY_(STATUS)
47094709
call MAPL_GetPointer(INTERNAL,delCH_delTVA ,'delCH_delTVA' ,RC=STATUS); VERIFY_(STATUS)
47104710

4711-
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND >= 2) then
4711+
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND >= 2) then
47124712

47134713
call MAPL_GetPointer(INTERNAL,delCH_delTC ,'delCH_delTC' ,RC=STATUS); VERIFY_(STATUS)
47144714
call MAPL_GetPointer(INTERNAL,delCQ_delQC ,'delCQ_delQC' ,RC=STATUS); VERIFY_(STATUS)
@@ -5426,7 +5426,7 @@ subroutine Driver ( RC )
54265426

54275427
end do
54285428

5429-
select case (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND)
5429+
select case (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND)
54305430

54315431
case (0) ! ignore derivatives of exchange coeffs w.r.t. canopy temp and specific humidity
54325432

@@ -5457,7 +5457,7 @@ subroutine Driver ( RC )
54575457

54585458
case default
54595459

5460-
_ASSERT(.false., 'unknown MOSFC_EXTRA_DERIVS_LAND')
5460+
_ASSERT(.false., 'unknown MOSFC_EXTRA_DERIVS_OFFL_LAND')
54615461

54625462
end select
54635463

@@ -6620,14 +6620,14 @@ subroutine RUN0(gc, import, export, clock, rc)
66206620
call MAPL_GetPointer(INTERNAL, ww, 'WW', rc=status)
66216621
VERIFY_(status)
66226622

6623-
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND == 1) then
6623+
if (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND == 1) then
66246624

66256625
call MAPL_GetPointer(INTERNAL, delCQ_delTVA, 'delCQ_delTVA', rc=status)
66266626
VERIFY_(status)
66276627
call MAPL_GetPointer(INTERNAL, delCH_delTVA, 'delCH_delTVA', rc=status)
66286628
VERIFY_(status)
66296629

6630-
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_LAND >= 2) then
6630+
elseif (CATCH_INTERNAL_STATE%MOSFC_EXTRA_DERIVS_OFFL_LAND >= 2) then
66316631

66326632
call MAPL_GetPointer(INTERNAL, delCH_delTC, 'delCH_delTC', rc=status)
66336633
VERIFY_(status)

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/Shared/catch_wrap_state.F90‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module catch_wrap_stateMod
2727
!
2828
! some (but not all) resource parameters from GEOS_SurfaceGridComp.rc:
2929
integer :: USE_ASCATZ0, Z0_FORMULATION, AEROSOL_DEPOSITION, N_CONST_LAND4SNWALB
30-
integer :: CHOOSEMOSFC, MOSFC_EXTRA_DERIVS_LAND, SNOW_ALBEDO_INFO
30+
integer :: CHOOSEMOSFC, MOSFC_EXTRA_DERIVS_OFFL_LAND, SNOW_ALBEDO_INFO
3131
real :: SURFLAY
3232
real :: FWETC, FWETL
3333
logical :: USE_FWET_FOR_RUNOFF
@@ -71,7 +71,7 @@ subroutine surface_params_to_wrap_state(statePtr, scf, rc)
7171
call MAPL_GetResource( SCF, statePtr%USE_ASCATZ0, label='USE_ASCATZ0:', DEFAULT=0, __RC__ )
7272
call MAPL_GetResource( SCF, statePtr%CHOOSEMOSFC, label='CHOOSEMOSFC:', DEFAULT=1, __RC__ )
7373

74-
! MOSFC_EXTRA_DERIVS_LAND: Resource parameter for *offline* (LDAS) mode.
74+
! MOSFC_EXTRA_DERIVS_OFFL_LAND: Resource parameter for *offline* (LDAS) mode.
7575
!
7676
! Over *land*, use derivatives of exchange coeffs w.r.t. temp. & humidity.
7777
!
@@ -86,25 +86,25 @@ subroutine surface_params_to_wrap_state(statePtr, scf, rc)
8686

8787
if (statePtr%CATCH_OFFLINE==0) then
8888

89-
statePtr%MOSFC_EXTRA_DERIVS_LAND = 0 ! must be 0 for GCM
89+
statePtr%MOSFC_EXTRA_DERIVS_OFFL_LAND = 0 ! must be 0 for GCM
9090

9191
else
9292

93-
! offline (LDAS) mode; default for MOSFC_EXTRA_DERIVS_LAND depends on CHOOSEMOSFC (Louis or Helfand)
93+
! offline (LDAS) mode; default for MOSFC_EXTRA_DERIVS_OFFL_LAND depends on CHOOSEMOSFC (Louis or Helfand)
9494

9595
if (statePtr%CHOOSEMOSFC==0) then
9696

9797
! Louis
98-
call MAPL_GetResource( SCF, statePtr%MOSFC_EXTRA_DERIVS_LAND, label='MOSFC_EXTRA_DERIVS_LAND:', DEFAULT=1, __RC__ )
98+
call MAPL_GetResource( SCF, statePtr%MOSFC_EXTRA_DERIVS_OFFL_LAND, label='MOSFC_EXTRA_DERIVS_OFFL_LAND:', DEFAULT=1, __RC__ )
9999
! make sure parameter value is allowed
100-
ii = statePtr%MOSFC_EXTRA_DERIVS_LAND ; _ASSERT(ii>=0 .and. ii<=3, 'unknown MOSFC_EXTRA_DERIVS_LAND for Louis ')
100+
ii = statePtr%MOSFC_EXTRA_DERIVS_OFFL_LAND ; _ASSERT(ii>=0 .and. ii<=3, 'unknown MOSFC_EXTRA_DERIVS_OFFL_LAND for Louis ')
101101

102102
elseif (statePtr%CHOOSEMOSFC==1) then
103103

104104
! Helfand
105-
call MAPL_GetResource( SCF, statePtr%MOSFC_EXTRA_DERIVS_LAND, label='MOSFC_EXTRA_DERIVS_LAND:', DEFAULT=0, __RC__ )
105+
call MAPL_GetResource( SCF, statePtr%MOSFC_EXTRA_DERIVS_OFFL_LAND, label='MOSFC_EXTRA_DERIVS_OFFL_LAND:', DEFAULT=0, __RC__ )
106106
! make sure parameter value is allowed (analytical derivs not implemented for Helfand)
107-
ii = statePtr%MOSFC_EXTRA_DERIVS_LAND ; _ASSERT(ii==0 .or. ii==2, 'unknown MOSFC_EXTRA_DERIVS_LAND for Helfand')
107+
ii = statePtr%MOSFC_EXTRA_DERIVS_OFFL_LAND ; _ASSERT(ii==0 .or. ii==2, 'unknown MOSFC_EXTRA_DERIVS_OFFL_LAND for Helfand')
108108

109109
else
110110

@@ -114,12 +114,12 @@ subroutine surface_params_to_wrap_state(statePtr, scf, rc)
114114

115115
end if
116116

117-
! for CatchCN, must have MOSFC_EXTRA_DERIVS_LAND<=1 (numerical derivatives not yet implemented for CatchCN)
117+
! for CatchCN, must have MOSFC_EXTRA_DERIVS_OFFL_LAND<=1 (numerical derivatives not yet implemented for CatchCN)
118118

119119
select type (statePtr)
120120
type is (T_CATCHCN_STATE) ! CATCHCN
121121

122-
_ASSERT( statePtr%MOSFC_EXTRA_DERIVS_LAND<=1, 'selected choice for MOSFC_EXTRA_DERIVS_LAND not yet implemented for CatchCN')
122+
_ASSERT( statePtr%MOSFC_EXTRA_DERIVS_OFFL_LAND<=1, 'selected choice for MOSFC_EXTRA_DERIVS_OFFL_LAND not yet implemented for CatchCN')
123123

124124
end select
125125

0 commit comments

Comments
 (0)