Skip to content

Commit

Permalink
Merge pull request #858 from GEOS-ESM/feature/sdrabenh/moist_updates_…
Browse files Browse the repository at this point in the history 
…WMP_20231121

Updates from feature/wmputman/KM_v11_3_2_Moist_WMP as of 2023-11-21
  • Loading branch information
@sdrabenh
sdrabenh authored Nov 29, 2023
2 parents 6fd33ea + 1949213 commit 0acac06
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationEdge, &
AVERAGING_INTERVAL = AVRGNINT, &
REFRESH_INTERVAL = RFRSHINT, &
RESTART = MAPL_RestartSkip, &
RC=STATUS )
VERIFY_(STATUS)

Expand All @@ -222,6 +223,7 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationEdge, &
AVERAGING_INTERVAL = AVRGNINT, &
REFRESH_INTERVAL = RFRSHINT, &
RESTART = MAPL_RestartSkip, &
RC=STATUS )
VERIFY_(STATUS)

Expand All @@ -233,6 +235,7 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationEdge, &
AVERAGING_INTERVAL = AVRGNINT, &
REFRESH_INTERVAL = RFRSHINT, &
RESTART = MAPL_RestartSkip, &
RC=STATUS )
VERIFY_(STATUS)

Expand Down Expand Up @@ -376,6 +379,7 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationCenter, &
AVERAGING_INTERVAL = AVRGNINT, &
REFRESH_INTERVAL = RFRSHINT, &
RESTART = MAPL_RestartSkip, &
RC=STATUS )
VERIFY_(STATUS)

Expand All @@ -387,6 +391,7 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationCenter, &
AVERAGING_INTERVAL = AVRGNINT, &
REFRESH_INTERVAL = RFRSHINT, &
RESTART = MAPL_RestartSkip, &
RC=STATUS )
VERIFY_(STATUS)

Expand All @@ -398,6 +403,7 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationCenter, &
AVERAGING_INTERVAL = AVRGNINT, &
REFRESH_INTERVAL = RFRSHINT, &
RESTART = MAPL_RestartSkip, &
RC=STATUS )
VERIFY_(STATUS)

Expand All @@ -409,6 +415,7 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationCenter, &
AVERAGING_INTERVAL = AVRGNINT, &
REFRESH_INTERVAL = RFRSHINT, &
RESTART = MAPL_RestartSkip, &
RC=STATUS )
VERIFY_(STATUS)

Expand Down Expand Up @@ -517,6 +524,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'TAUOROX', &
LONG_NAME = 'surface_eastward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -525,6 +533,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'TAUOROY', &
LONG_NAME = 'surface_northward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -534,6 +543,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'OMEGA', &
LONG_NAME = 'vertical_pressure_velocity', &
UNITS = 'Pa s-1', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -570,6 +580,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'DTDTDYN', &
LONG_NAME = 'tendency_of_air_temperature_due_to_dynamics', &
UNITS = 'K s-1', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -578,6 +589,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'DQVDTDYN', &
LONG_NAME = 'tendency_of_specific_humidity_due_to_dynamics', &
UNITS = 'kg/kg/s', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -586,6 +598,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'QV_DYN_IN', &
LONG_NAME = 'spec_humidity_at_begin_of_time_step', &
UNITS = 'kg kg-1', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -594,6 +607,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'T_DYN_IN', &
LONG_NAME = 'temperature_at_begin_of_time_step', &
UNITS = 'K', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -602,6 +616,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'U_DYN_IN', &
LONG_NAME = 'u_wind_at_begin_of_time_step', &
UNITS = 'm s-1', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -610,6 +625,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'V_DYN_IN', &
LONG_NAME = 'v_wind_at_begin_of_time_step', &
UNITS = 'm s-1', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -618,6 +634,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'PLE_DYN_IN', &
LONG_NAME = 'edge_pressure_at_begin_of_time_step', &
UNITS = 'Pa', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationEdge, RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -711,6 +728,7 @@ subroutine SetServices ( GC, RC )
LONG_NAME = 'surface geopotential height', &
UNITS = 'm+2 s-2', &
SHORT_NAME = 'PHIS', &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
RC=STATUS )
Expand Down Expand Up @@ -5830,7 +5848,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
if (associated(PTR3D)) PTR3D = QILS+QICN

call MAPL_GetPointer(EXPORT, PTR3D, 'QCTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = MIN(CLLS+CLCN,1.0)
if (associated(PTR3D)) PTR3D = QLLS+QLCN+QILS+QICN

! Cloud condensate exports
call MAPL_GetPointer(EXPORT, PTR3D, 'QLLSX1', RC=STATUS); VERIFY_(STATUS)
Expand Down

0 comments on commit 0acac06

Please sign in to comment.