Skip to content

Commit

Permalink
Merge pull request #926 from GEOS-ESM/feature/sdrabenh/add_moist_expo…
Browse files Browse the repository at this point in the history 
…rts_for_precip

Add moist exports for mass fraction of suspended rain, snow, and graupel
  • Loading branch information
@sdrabenh
sdrabenh authored May 6, 2024
2 parents 38a76a2 + 42d3aa5 commit 5427f09
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 29 deletions.
9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_BACM_1M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,15 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
endif
endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = RAD_QR*RAD_CF

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = RAD_QS*RAD_CF

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = RAD_QG*RAD_CF

call MAPL_TimerOff (MAPL,"--BACM_1M")

end subroutine BACM_1M_Run
Expand Down
9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GFDL_1M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,15 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)

endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QRAIN

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QSNOW

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QGRAUPEL

call MAPL_TimerOff(MAPL,"--GFDL_1M",RC=STATUS)

end subroutine GFDL_1M_Run
Expand Down
9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MGB2_2M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2494,6 +2494,15 @@ subroutine MGB2_2M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
endif
endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QRAIN

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QSNOW

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QGRAUPEL

call MAPL_TimerOff(MAPL,"--MGB2_2M",__RC__)

end subroutine MGB2_2M_Run
Expand Down
82 changes: 53 additions & 29 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,29 +913,53 @@ subroutine SetServices ( GC, RC )


call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QCTOT', &
LONG_NAME = 'mass_fraction_of_total_cloud_water', &
UNITS = 'kg kg-1', &
SHORT_NAME = 'QCTOT', &
LONG_NAME = 'mass_fraction_of_total_cloud_water', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QLTOT', &
LONG_NAME = 'grid_box_mass_fraction_of_cloud_liquid_water', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
SHORT_NAME = 'QLTOT', &
LONG_NAME = 'grid_box_mass_fraction_of_cloud_liquid_water', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QITOT', &
LONG_NAME = 'grid_box_mass_fraction_of_cloud_ice_water', &
UNITS = 'kg kg-1', &
SHORT_NAME = 'QITOT', &
LONG_NAME = 'grid_box_mass_fraction_of_cloud_ice_water', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QRTOT', &
LONG_NAME = 'grid_box_mass_fraction_of_suspended_rain', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QSTOT', &
LONG_NAME = 'grid_box_mass_fraction_of_suspended_snow', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QGTOT', &
LONG_NAME = 'grid_box_mass_fraction_of_suspended_graupel', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QPTOTLS', &
LONG_NAME = 'mass_fraction_of_large_scale_falling_precip', &
Expand Down Expand Up @@ -1880,57 +1904,57 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'FCLD' , &
LONG_NAME = 'cloud_fraction_for_radiation', &
UNITS = '1', &
SHORT_NAME = 'FCLD' , &
LONG_NAME = 'cloud_fraction_for_radiation', &
UNITS = '1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME ='QV', &
SHORT_NAME ='QV', &
LONG_NAME ='water_vapor_for_radiation', &
UNITS ='kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QL', &
LONG_NAME = 'in_cloud_cloud_liquid_for_radiation', &
UNITS = 'kg kg-1', &
SHORT_NAME = 'QL', &
LONG_NAME = 'in_cloud_cloud_liquid_for_radiation', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QI', &
LONG_NAME = 'in_cloud_cloud_ice_for_radiation', &
UNITS = 'kg kg-1', &
SHORT_NAME = 'QI', &
LONG_NAME = 'in_cloud_cloud_ice_for_radiation', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QR', &
LONG_NAME = 'Falling_rain_for_radiation', &
UNITS = 'kg kg-1', &
SHORT_NAME = 'QR', &
LONG_NAME = 'in_cloud_ralling_rain_for_radiation', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QS', &
LONG_NAME = 'Falling_snow_for_radiation', &
UNITS = 'kg kg-1', &
SHORT_NAME = 'QS', &
LONG_NAME = 'in_cloud_falling_snow_for_radiation', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'QG', &
LONG_NAME = 'Falling_graupel_for_radiation', &
UNITS = 'kg kg-1', &
SHORT_NAME = 'QG', &
LONG_NAME = 'in_cloud_falling_graupel_for_radiation', &
UNITS = 'kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand Down
9 changes: 9 additions & 0 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_THOM_1M_InterfaceMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,15 @@ subroutine THOM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)

endif

call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QRAIN

call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QSNOW

call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = QGRAUPEL

call MAPL_TimerOff(MAPL,"--THOM_1M",RC=STATUS)

end subroutine THOM_1M_Run
Expand Down

0 comments on commit 5427f09

Please sign in to comment.