Skip to content

Commit 430790f

Browse files
sdrabenhsdrabenh
authored
Merge pull request #600 from GEOS-ESM/develop
Sync develop into main
2 parents c89d0f0 + 1046239 commit 430790f

File tree

18 files changed

+1675
-5901
lines changed

18 files changed

+1675
-5901
lines changed

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2732,9 +2732,9 @@ subroutine SetServices ( GC, RC )
27322732
VERIFY_(STATUS)
27332733

27342734
call MAPL_AddExportSpec(GC ,&
2735-
LONG_NAME = 'depth_to_water_table_from_surface',&
2735+
LONG_NAME = 'depth_to_water_table_from_surface_in_peat',&
27362736
UNITS = 'm' ,&
2737-
SHORT_NAME = 'WATERTABLED' ,&
2737+
SHORT_NAME = 'PEATCLSM_WATERLEVEL' ,&
27382738
DIMS = MAPL_DimsHorzOnly ,&
27392739
VLOCATION = MAPL_VLocationNone ,&
27402740
RC=STATUS )
@@ -2743,7 +2743,7 @@ subroutine SetServices ( GC, RC )
27432743
call MAPL_AddExportSpec(GC ,&
27442744
LONG_NAME = 'change_in_free_surface_water_reservoir_on_peat',&
27452745
UNITS = 'kg m-2 s-1' ,&
2746-
SHORT_NAME = 'FSWCHANGE' ,&
2746+
SHORT_NAME = 'PEATCLSM_FSWCHANGE' ,&
27472747
DIMS = MAPL_DimsHorzOnly ,&
27482748
VLOCATION = MAPL_VLocationNone ,&
27492749
RC=STATUS )
@@ -5125,8 +5125,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
51255125
real, pointer, dimension(:,:) :: RMELTBC002 => NULL()
51265126
real, pointer, dimension(:,:) :: RMELTOC001 => NULL()
51275127
real, pointer, dimension(:,:) :: RMELTOC002 => NULL()
5128-
real, pointer, dimension(:,:) :: WATERTABLED => NULL()
5129-
real, pointer, dimension(:,:) :: FSWCHANGE => NULL()
5128+
real, pointer, dimension(:,:) :: PEATCLSM_WATERLEVEL => NULL()
5129+
real, pointer, dimension(:,:) :: PEATCLSM_FSWCHANGE => NULL()
51305130

51315131
! CN model
51325132
real, pointer, dimension(:,:) :: CNLAI => NULL()
@@ -5386,8 +5386,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
53865386
real, pointer, dimension(:) :: RMELTBC002TILE => NULL()
53875387
real, pointer, dimension(:) :: RMELTOC001TILE => NULL()
53885388
real, pointer, dimension(:) :: RMELTOC002TILE => NULL()
5389-
real, pointer, dimension(:) :: WATERTABLEDTILE => NULL()
5390-
real, pointer, dimension(:) :: FSWCHANGETILE => NULL()
5389+
real, pointer, dimension(:) :: PEATCLSM_WATERLEVELTILE => NULL()
5390+
real, pointer, dimension(:) :: PEATCLSM_FSWCHANGETILE => NULL()
53915391

53925392
real, pointer, dimension(:) :: CNLAITILE => NULL()
53935393
real, pointer, dimension(:) :: CNTLAITILE => NULL()
@@ -6222,8 +6222,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
62226222
call MAPL_GetPointer(EXPORT , RMELTBC002 , 'RMELTBC002', RC=STATUS); VERIFY_(STATUS)
62236223
call MAPL_GetPointer(EXPORT , RMELTOC001 , 'RMELTOC001', RC=STATUS); VERIFY_(STATUS)
62246224
call MAPL_GetPointer(EXPORT , RMELTOC002 , 'RMELTOC002', RC=STATUS); VERIFY_(STATUS)
6225-
call MAPL_GetPointer(EXPORT , WATERTABLED, 'WATERTABLED', RC=STATUS); VERIFY_(STATUS)
6226-
call MAPL_GetPointer(EXPORT , FSWCHANGE , 'FSWCHANGE', RC=STATUS); VERIFY_(STATUS)
6225+
call MAPL_GetPointer(EXPORT , PEATCLSM_WATERLEVEL, 'PEATCLSM_WATERLEVEL', RC=STATUS); VERIFY_(STATUS)
6226+
call MAPL_GetPointer(EXPORT , PEATCLSM_FSWCHANGE, 'PEATCLSM_FSWCHANGE', RC=STATUS); VERIFY_(STATUS)
62276227

62286228

62296229
IF(LSM_CHOICE > 1) THEN
@@ -6798,8 +6798,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
67986798
call MKTILE(RMELTBC002 ,RMELTBC002TILE ,NT,RC=STATUS); VERIFY_(STATUS)
67996799
call MKTILE(RMELTOC001 ,RMELTOC001TILE ,NT,RC=STATUS); VERIFY_(STATUS)
68006800
call MKTILE(RMELTOC002 ,RMELTOC002TILE ,NT,RC=STATUS); VERIFY_(STATUS)
6801-
call MKTILE(WATERTABLED,WATERTABLEDTILE,NT,RC=STATUS); VERIFY_(STATUS)
6802-
call MKTILE(FSWCHANGE ,FSWCHANGETILE ,NT,RC=STATUS); VERIFY_(STATUS)
6801+
call MKTILE(PEATCLSM_WATERLEVEL,PEATCLSM_WATERLEVELTILE,NT,RC=STATUS); VERIFY_(STATUS)
6802+
call MKTILE(PEATCLSM_FSWCHANGE ,PEATCLSM_FSWCHANGETILE ,NT,RC=STATUS); VERIFY_(STATUS)
68036803

68046804
IF (LSM_CHOICE > 1) THEN
68056805
call MKTILE(CNLAI ,CNLAITILE ,NT,RC=STATUS); VERIFY_(STATUS)
@@ -7644,8 +7644,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
76447644
if(associated(RMELTBC002 ))call MAPL_LocStreamTransform(LOCSTREAM,RMELTBC002 ,RMELTBC002TILE, RC=STATUS); VERIFY_(STATUS)
76457645
if(associated(RMELTOC001 ))call MAPL_LocStreamTransform(LOCSTREAM,RMELTOC001 ,RMELTOC001TILE, RC=STATUS); VERIFY_(STATUS)
76467646
if(associated(RMELTOC002 ))call MAPL_LocStreamTransform(LOCSTREAM,RMELTOC002 ,RMELTOC002TILE, RC=STATUS); VERIFY_(STATUS)
7647-
if(associated(WATERTABLED))call MAPL_LocStreamTransform(LOCSTREAM,WATERTABLED,WATERTABLEDTILE,RC=STATUS); VERIFY_(STATUS)
7648-
if(associated(FSWCHANGE ))call MAPL_LocStreamTransform(LOCSTREAM,FSWCHANGE ,FSWCHANGETILE, RC=STATUS); VERIFY_(STATUS)
7647+
if(associated(PEATCLSM_WATERLEVEL))call MAPL_LocStreamTransform(LOCSTREAM,PEATCLSM_WATERLEVEL,PEATCLSM_WATERLEVELTILE,RC=STATUS); VERIFY_(STATUS)
7648+
if(associated(PEATCLSM_FSWCHANGE ))call MAPL_LocStreamTransform(LOCSTREAM,PEATCLSM_FSWCHANGE ,PEATCLSM_FSWCHANGETILE, RC=STATUS); VERIFY_(STATUS)
76497649

76507650
if(associated(CNLAI)) then
76517651
call MAPL_LocStreamTransform( LOCSTREAM,CNLAI ,CNLAITILE , RC=STATUS)
@@ -8179,8 +8179,8 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
81798179
if(associated(RMELTBC002TILE )) deallocate(RMELTBC002TILE )
81808180
if(associated(RMELTOC001TILE )) deallocate(RMELTOC001TILE )
81818181
if(associated(RMELTOC002TILE )) deallocate(RMELTOC002TILE )
8182-
if(associated(WATERTABLEDTILE)) deallocate(WATERTABLEDTILE)
8183-
if(associated(FSWCHANGETILE )) deallocate(FSWCHANGETILE )
8182+
if(associated(PEATCLSM_WATERLEVELTILE)) deallocate(PEATCLSM_WATERLEVELTILE)
8183+
if(associated(PEATCLSM_FSWCHANGETILE )) deallocate(PEATCLSM_FSWCHANGETILE )
81848184
if(associated(CNLAITILE )) deallocate(CNLAITILE )
81858185
if(associated(CNTLAITILE )) deallocate(CNTLAITILE )
81868186
if(associated(CNSAITILE )) deallocate(CNSAITILE )
@@ -8516,9 +8516,9 @@ subroutine DOTYPE(type,RC)
85168516
VERIFY_(STATUS)
85178517
call MAPL_GetPointer(GEX(type), dum, 'RMELTOC002' , ALLOC=associated(RMELTOC002TILE ), notFoundOK=.true., RC=STATUS)
85188518
VERIFY_(STATUS)
8519-
call MAPL_GetPointer(GEX(type), dum, 'WATERTABLED', ALLOC=associated(WATERTABLEDTILE ),notFoundOK=.true., RC=STATUS)
8519+
call MAPL_GetPointer(GEX(type), dum, 'PEATCLSM_WATERLEVEL', ALLOC=associated(PEATCLSM_WATERLEVELTILE), notFoundOK=.true., RC=STATUS)
85208520
VERIFY_(STATUS)
8521-
call MAPL_GetPointer(GEX(type), dum, 'FSWCHANGE' , ALLOC=associated(FSWCHANGETILE ) , notFoundOK=.true., RC=STATUS)
8521+
call MAPL_GetPointer(GEX(type), dum, 'PEATCLSM_FSWCHANGE' , ALLOC=associated(PEATCLSM_FSWCHANGETILE ), notFoundOK=.true., RC=STATUS)
85228522
VERIFY_(STATUS)
85238523

85248524
IF (LSM_CHOICE > 1) THEN
@@ -9088,8 +9088,8 @@ subroutine DOTYPE(type,RC)
90889088
if(associated(RMELTBC002TILE)) call FILLOUT_TILE(GEX(type), 'RMELTBC002' , RMELTBC002TILE , XFORM, RC=STATUS);VERIFY_(STATUS)
90899089
if(associated(RMELTOC001TILE)) call FILLOUT_TILE(GEX(type), 'RMELTOC001' , RMELTOC001TILE , XFORM, RC=STATUS);VERIFY_(STATUS)
90909090
if(associated(RMELTOC002TILE)) call FILLOUT_TILE(GEX(type), 'RMELTOC002' , RMELTOC002TILE , XFORM, RC=STATUS);VERIFY_(STATUS)
9091-
if(associated(WATERTABLEDTILE))call FILLOUT_TILE(GEX(type), 'WATERTABLED', WATERTABLEDTILE, XFORM, RC=STATUS);VERIFY_(STATUS)
9092-
if(associated(FSWCHANGETILE)) call FILLOUT_TILE(GEX(type), 'FSWCHANGE' , FSWCHANGETILE , XFORM, RC=STATUS);VERIFY_(STATUS)
9091+
if(associated(PEATCLSM_WATERLEVELTILE)) call FILLOUT_TILE(GEX(type), 'PEATCLSM_WATERLEVEL', PEATCLSM_WATERLEVELTILE, XFORM, RC=STATUS);VERIFY_(STATUS)
9092+
if(associated(PEATCLSM_FSWCHANGETILE)) call FILLOUT_TILE(GEX(type), 'PEATCLSM_FSWCHANGE' , PEATCLSM_FSWCHANGETILE , XFORM, RC=STATUS);VERIFY_(STATUS)
90939093

90949094
if(associated(CNLAITILE)) then
90959095
call FILLOUT_TILE(GEX(type), 'CNLAI' , CNLAITILE , XFORM, RC=STATUS)

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOS_LandGridComp.F90‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -920,8 +920,8 @@ subroutine SetServices ( GC, RC )
920920
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTBC002', CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
921921
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTOC001', CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
922922
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTOC002', CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
923-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'WATERTABLED',CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
924-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'FSWCHANGE', CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
923+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PEATCLSM_WATERLEVEL',CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
924+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PEATCLSM_FSWCHANGE', CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
925925

926926
if (DO_GOSWIM /= 0) then
927927
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RDU001', CHILD_ID = CATCH(1), RC=STATUS) ; VERIFY_(STATUS)
@@ -1292,8 +1292,8 @@ subroutine SetServices ( GC, RC )
12921292
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTBC002', CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)
12931293
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTOC001', CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)
12941294
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTOC002', CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)
1295-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'WATERTABLED',CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)
1296-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'FSWCHANGE', CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)
1295+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PEATCLSM_WATERLEVEL',CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)
1296+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PEATCLSM_FSWCHANGE', CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)
12971297

12981298
if (DO_GOSWIM /= 0) then
12991299
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RDU001', CHILD_ID = CATCHCN(1), RC=STATUS) ; VERIFY_(STATUS)

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -984,8 +984,8 @@ subroutine SetServices ( GC, RC )
984984
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTBC002', CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)
985985
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTOC001', CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)
986986
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RMELTOC002', CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)
987-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'WATERTABLED',CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)
988-
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'FSWCHANGE' , CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)
987+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PEATCLSM_WATERLEVEL',CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)
988+
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'PEATCLSM_FSWCHANGE' ,CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)
989989

990990
if (DO_GOSWIM /= 0) then
991991
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'RDU001', CHILD_ID = CATCHCN, RC=STATUS) ; VERIFY_(STATUS)

0 commit comments

Comments
 (0)