Skip to content

Commit 5427f09

Browse files
sdrabenhsdrabenh
authored
Merge pull request #926 from GEOS-ESM/feature/sdrabenh/add_moist_exports_for_precip
Add moist exports for mass fraction of suspended rain, snow, and graupel
2 parents 38a76a2 + 42d3aa5 commit 5427f09

File tree

5 files changed

+89
-29
lines changed

5 files changed

+89
-29
lines changed

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_BACM_1M_InterfaceMod.F90‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,15 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
821821
endif
822822
endif
823823

824+
call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
825+
if (associated(PTR3D)) PTR3D = RAD_QR*RAD_CF
826+
827+
call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
828+
if (associated(PTR3D)) PTR3D = RAD_QS*RAD_CF
829+
830+
call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
831+
if (associated(PTR3D)) PTR3D = RAD_QG*RAD_CF
832+
824833
call MAPL_TimerOff (MAPL,"--BACM_1M")
825834

826835
end subroutine BACM_1M_Run

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_GFDL_1M_InterfaceMod.F90‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,15 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
962962

963963
endif
964964

965+
call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
966+
if (associated(PTR3D)) PTR3D = QRAIN
967+
968+
call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
969+
if (associated(PTR3D)) PTR3D = QSNOW
970+
971+
call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
972+
if (associated(PTR3D)) PTR3D = QGRAUPEL
973+
965974
call MAPL_TimerOff(MAPL,"--GFDL_1M",RC=STATUS)
966975

967976
end subroutine GFDL_1M_Run

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MGB2_2M_InterfaceMod.F90‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2494,6 +2494,15 @@ subroutine MGB2_2M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
24942494
endif
24952495
endif
24962496

2497+
call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
2498+
if (associated(PTR3D)) PTR3D = QRAIN
2499+
2500+
call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
2501+
if (associated(PTR3D)) PTR3D = QSNOW
2502+
2503+
call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
2504+
if (associated(PTR3D)) PTR3D = QGRAUPEL
2505+
24972506
call MAPL_TimerOff(MAPL,"--MGB2_2M",__RC__)
24982507

24992508
end subroutine MGB2_2M_Run

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90‎

Lines changed: 53 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -913,29 +913,53 @@ subroutine SetServices ( GC, RC )
913913

914914

915915
call MAPL_AddExportSpec(GC, &
916-
SHORT_NAME = 'QCTOT', &
917-
LONG_NAME = 'mass_fraction_of_total_cloud_water', &
918-
UNITS = 'kg kg-1', &
916+
SHORT_NAME = 'QCTOT', &
917+
LONG_NAME = 'mass_fraction_of_total_cloud_water', &
918+
UNITS = 'kg kg-1', &
919919
DIMS = MAPL_DimsHorzVert, &
920920
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
921921
VERIFY_(STATUS)
922922

923923
call MAPL_AddExportSpec(GC, &
924-
SHORT_NAME = 'QLTOT', &
925-
LONG_NAME = 'grid_box_mass_fraction_of_cloud_liquid_water', &
926-
UNITS = 'kg kg-1', &
927-
DIMS = MAPL_DimsHorzVert, &
924+
SHORT_NAME = 'QLTOT', &
925+
LONG_NAME = 'grid_box_mass_fraction_of_cloud_liquid_water', &
926+
UNITS = 'kg kg-1', &
927+
DIMS = MAPL_DimsHorzVert, &
928928
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
929929
VERIFY_(STATUS)
930930

931931
call MAPL_AddExportSpec(GC, &
932-
SHORT_NAME = 'QITOT', &
933-
LONG_NAME = 'grid_box_mass_fraction_of_cloud_ice_water', &
934-
UNITS = 'kg kg-1', &
932+
SHORT_NAME = 'QITOT', &
933+
LONG_NAME = 'grid_box_mass_fraction_of_cloud_ice_water', &
934+
UNITS = 'kg kg-1', &
935935
DIMS = MAPL_DimsHorzVert, &
936936
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
937937
VERIFY_(STATUS)
938938

939+
call MAPL_AddExportSpec(GC, &
940+
SHORT_NAME = 'QRTOT', &
941+
LONG_NAME = 'grid_box_mass_fraction_of_suspended_rain', &
942+
UNITS = 'kg kg-1', &
943+
DIMS = MAPL_DimsHorzVert, &
944+
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
945+
VERIFY_(STATUS)
946+
947+
call MAPL_AddExportSpec(GC, &
948+
SHORT_NAME = 'QSTOT', &
949+
LONG_NAME = 'grid_box_mass_fraction_of_suspended_snow', &
950+
UNITS = 'kg kg-1', &
951+
DIMS = MAPL_DimsHorzVert, &
952+
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
953+
VERIFY_(STATUS)
954+
955+
call MAPL_AddExportSpec(GC, &
956+
SHORT_NAME = 'QGTOT', &
957+
LONG_NAME = 'grid_box_mass_fraction_of_suspended_graupel', &
958+
UNITS = 'kg kg-1', &
959+
DIMS = MAPL_DimsHorzVert, &
960+
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
961+
VERIFY_(STATUS)
962+
939963
call MAPL_AddExportSpec(GC, &
940964
SHORT_NAME = 'QPTOTLS', &
941965
LONG_NAME = 'mass_fraction_of_large_scale_falling_precip', &
@@ -1880,57 +1904,57 @@ subroutine SetServices ( GC, RC )
18801904
VERIFY_(STATUS)
18811905

18821906
call MAPL_AddExportSpec(GC, &
1883-
SHORT_NAME = 'FCLD' , &
1884-
LONG_NAME = 'cloud_fraction_for_radiation', &
1885-
UNITS = '1', &
1907+
SHORT_NAME = 'FCLD' , &
1908+
LONG_NAME = 'cloud_fraction_for_radiation', &
1909+
UNITS = '1', &
18861910
DIMS = MAPL_DimsHorzVert, &
18871911
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
18881912
VERIFY_(STATUS)
18891913

18901914
call MAPL_AddExportSpec(GC, &
1891-
SHORT_NAME ='QV', &
1915+
SHORT_NAME ='QV', &
18921916
LONG_NAME ='water_vapor_for_radiation', &
18931917
UNITS ='kg kg-1', &
18941918
DIMS = MAPL_DimsHorzVert, &
18951919
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
18961920
VERIFY_(STATUS)
18971921

18981922
call MAPL_AddExportSpec(GC, &
1899-
SHORT_NAME = 'QL', &
1900-
LONG_NAME = 'in_cloud_cloud_liquid_for_radiation', &
1901-
UNITS = 'kg kg-1', &
1923+
SHORT_NAME = 'QL', &
1924+
LONG_NAME = 'in_cloud_cloud_liquid_for_radiation', &
1925+
UNITS = 'kg kg-1', &
19021926
DIMS = MAPL_DimsHorzVert, &
19031927
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
19041928
VERIFY_(STATUS)
19051929

19061930
call MAPL_AddExportSpec(GC, &
1907-
SHORT_NAME = 'QI', &
1908-
LONG_NAME = 'in_cloud_cloud_ice_for_radiation', &
1909-
UNITS = 'kg kg-1', &
1931+
SHORT_NAME = 'QI', &
1932+
LONG_NAME = 'in_cloud_cloud_ice_for_radiation', &
1933+
UNITS = 'kg kg-1', &
19101934
DIMS = MAPL_DimsHorzVert, &
19111935
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
19121936
VERIFY_(STATUS)
19131937

19141938
call MAPL_AddExportSpec(GC, &
1915-
SHORT_NAME = 'QR', &
1916-
LONG_NAME = 'Falling_rain_for_radiation', &
1917-
UNITS = 'kg kg-1', &
1939+
SHORT_NAME = 'QR', &
1940+
LONG_NAME = 'in_cloud_ralling_rain_for_radiation', &
1941+
UNITS = 'kg kg-1', &
19181942
DIMS = MAPL_DimsHorzVert, &
19191943
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
19201944
VERIFY_(STATUS)
19211945

19221946
call MAPL_AddExportSpec(GC, &
1923-
SHORT_NAME = 'QS', &
1924-
LONG_NAME = 'Falling_snow_for_radiation', &
1925-
UNITS = 'kg kg-1', &
1947+
SHORT_NAME = 'QS', &
1948+
LONG_NAME = 'in_cloud_falling_snow_for_radiation', &
1949+
UNITS = 'kg kg-1', &
19261950
DIMS = MAPL_DimsHorzVert, &
19271951
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
19281952
VERIFY_(STATUS)
19291953

19301954
call MAPL_AddExportSpec(GC, &
1931-
SHORT_NAME = 'QG', &
1932-
LONG_NAME = 'Falling_graupel_for_radiation', &
1933-
UNITS = 'kg kg-1', &
1955+
SHORT_NAME = 'QG', &
1956+
LONG_NAME = 'in_cloud_falling_graupel_for_radiation', &
1957+
UNITS = 'kg kg-1', &
19341958
DIMS = MAPL_DimsHorzVert, &
19351959
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
19361960
VERIFY_(STATUS)

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_THOM_1M_InterfaceMod.F90‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,6 +1132,15 @@ subroutine THOM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
11321132

11331133
endif
11341134

1135+
call MAPL_GetPointer(EXPORT, PTR3D, 'QRTOT', RC=STATUS); VERIFY_(STATUS)
1136+
if (associated(PTR3D)) PTR3D = QRAIN
1137+
1138+
call MAPL_GetPointer(EXPORT, PTR3D, 'QSTOT', RC=STATUS); VERIFY_(STATUS)
1139+
if (associated(PTR3D)) PTR3D = QSNOW
1140+
1141+
call MAPL_GetPointer(EXPORT, PTR3D, 'QGTOT', RC=STATUS); VERIFY_(STATUS)
1142+
if (associated(PTR3D)) PTR3D = QGRAUPEL
1143+
11351144
call MAPL_TimerOff(MAPL,"--THOM_1M",RC=STATUS)
11361145

11371146
end subroutine THOM_1M_Run

0 commit comments

Comments
 (0)