Skip to content

Commit 22f8b57

Browse files
sdrabenhsdrabenh
authored
Merge branch 'develop' into feature/zhaobin74/merge-main-post650
2 parents b798b8f + db55c30 commit 22f8b57

File tree

5 files changed

+119
-59
lines changed

5 files changed

+119
-59
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: 83 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ subroutine SetServices ( GC, RC )
524524
SHORT_NAME = 'TAUOROX', &
525525
LONG_NAME = 'surface_eastward_orographic_gravity_wave_stress', &
526526
UNITS = 'N m-2', &
527-
RESTART = MAPL_RestartSkip, &
527+
RESTART = MAPL_RestartSkip, &
528528
DIMS = MAPL_DimsHorzOnly, &
529529
VLOCATION = MAPL_VLocationNone, RC=STATUS )
530530
VERIFY_(STATUS)
@@ -533,7 +533,7 @@ subroutine SetServices ( GC, RC )
533533
SHORT_NAME = 'TAUOROY', &
534534
LONG_NAME = 'surface_northward_orographic_gravity_wave_stress', &
535535
UNITS = 'N m-2', &
536-
RESTART = MAPL_RestartSkip, &
536+
RESTART = MAPL_RestartSkip, &
537537
DIMS = MAPL_DimsHorzOnly, &
538538
VLOCATION = MAPL_VLocationNone, RC=STATUS )
539539
VERIFY_(STATUS)
@@ -543,7 +543,7 @@ subroutine SetServices ( GC, RC )
543543
SHORT_NAME = 'OMEGA', &
544544
LONG_NAME = 'vertical_pressure_velocity', &
545545
UNITS = 'Pa s-1', &
546-
RESTART = MAPL_RestartSkip, &
546+
RESTART = MAPL_RestartSkip, &
547547
DIMS = MAPL_DimsHorzVert, &
548548
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
549549
VERIFY_(STATUS)
@@ -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', &
@@ -1122,18 +1146,18 @@ subroutine SetServices ( GC, RC )
11221146
RC=STATUS )
11231147
VERIFY_(STATUS)
11241148

1125-
call MAPL_AddExportSpec(GC, &
1149+
call MAPL_AddExportSpec(GC, &
11261150
SHORT_NAME = 'UMF_DC', &
1127-
LONG_NAME = 'Deep_updraft_mass_flux_at_interfaces', &
1151+
LONG_NAME = 'Deep_updraft_mass_flux_at_interfaces', &
11281152
UNITS = 'kg m-2 s-1', &
11291153
DIMS = MAPL_DimsHorzVert, &
11301154
VLOCATION = MAPL_VLocationEdge, &
11311155
RC=STATUS )
11321156
VERIFY_(STATUS)
1133-
1134-
call MAPL_AddExportSpec(GC, &
1157+
1158+
call MAPL_AddExportSpec(GC, &
11351159
SHORT_NAME = 'MFD_DC', &
1136-
LONG_NAME = 'Deep_updraft_detrained_mass_flux', &
1160+
LONG_NAME = 'Deep_updraft_detrained_mass_flux', &
11371161
UNITS = 'kg m-2 s-1', &
11381162
DIMS = MAPL_DimsHorzVert, &
11391163
VLOCATION = MAPL_VLocationCenter, &
@@ -1168,7 +1192,7 @@ subroutine SetServices ( GC, RC )
11681192
VERIFY_(STATUS)
11691193

11701194
call MAPL_AddExportSpec(GC, &
1171-
SHORT_NAME = 'CNV_TOPP_DP', &
1195+
SHORT_NAME = 'CNV_TOPP_DP', &
11721196
LONG_NAME = 'pressure_at_deep_convective_cloud_top', &
11731197
UNITS = 'Pa', &
11741198
DIMS = MAPL_DimsHorzOnly, &
@@ -1177,7 +1201,7 @@ subroutine SetServices ( GC, RC )
11771201
VERIFY_(STATUS)
11781202

11791203
call MAPL_AddExportSpec(GC, &
1180-
SHORT_NAME = 'CNV_TOPP_MD', &
1204+
SHORT_NAME = 'CNV_TOPP_MD', &
11811205
LONG_NAME = 'pressure_at_congestus_convective_cloud_top', &
11821206
UNITS = 'Pa', &
11831207
DIMS = MAPL_DimsHorzOnly, &
@@ -1186,7 +1210,7 @@ subroutine SetServices ( GC, RC )
11861210
VERIFY_(STATUS)
11871211

11881212
call MAPL_AddExportSpec(GC, &
1189-
SHORT_NAME = 'CNV_TOPP_SH', &
1213+
SHORT_NAME = 'CNV_TOPP_SH', &
11901214
LONG_NAME = 'pressure_at_shallow_convective_cloud_top', &
11911215
UNITS = 'Pa', &
11921216
DIMS = MAPL_DimsHorzOnly, &
@@ -1216,23 +1240,23 @@ subroutine SetServices ( GC, RC )
12161240

12171241
call MAPL_AddExportSpec(GC, &
12181242
SHORT_NAME = 'ENTR_MD', &
1219-
LONG_NAME = 'Lateral_entrainment_rate_in_gf_mid_convection_updraft', &
1243+
LONG_NAME = 'Lateral_entrainment_rate_in_gf_mid_convection_updraft', &
12201244
UNITS = 'm-1', &
12211245
DIMS = MAPL_DimsHorzVert, &
1222-
VLOCATION = MAPL_VLocationCenter, &
1246+
VLOCATION = MAPL_VLocationCenter, &
12231247
RC=STATUS )
1224-
1225-
VERIFY_(STATUS)
1248+
1249+
VERIFY_(STATUS)
12261250

12271251
call MAPL_AddExportSpec(GC, &
12281252
SHORT_NAME = 'ENTR_SH', &
1229-
LONG_NAME = 'Lateral_entrainment_rate_in_gf_shallow_convection_updraft', &
1253+
LONG_NAME = 'Lateral_entrainment_rate_in_gf_shallow_convection_updraft', &
12301254
UNITS = 'm-1', &
12311255
DIMS = MAPL_DimsHorzVert, &
1232-
VLOCATION = MAPL_VLocationCenter, &
1256+
VLOCATION = MAPL_VLocationCenter, &
12331257
RC=STATUS )
1234-
1235-
VERIFY_(STATUS)
1258+
1259+
VERIFY_(STATUS)
12361260

12371261
call MAPL_AddExportSpec(GC, &
12381262
SHORT_NAME = 'CNV_UPDF', &
@@ -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_falling_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)
@@ -2007,13 +2031,13 @@ subroutine SetServices ( GC, RC )
20072031
VLOCATION = MAPL_VLocationNone, RC=STATUS )
20082032
VERIFY_(STATUS)
20092033

2010-
call MAPL_AddExportSpec(GC, &
2034+
call MAPL_AddExportSpec(GC, &
20112035
SHORT_NAME = 'SNOW_RATIO', &
20122036
LONG_NAME = 'ratio_of_snow_to_total_precip',&
20132037
UNITS = '1', &
20142038
DIMS = MAPL_DimsHorzOnly, &
20152039
VLOCATION = MAPL_VLocationNone, RC=STATUS )
2016-
VERIFY_(STATUS)
2040+
VERIFY_(STATUS)
20172041

20182042
call MAPL_AddExportSpec(GC, &
20192043
SHORT_NAME ='LS_PRCP', &
@@ -2547,13 +2571,13 @@ subroutine SetServices ( GC, RC )
25472571
VLOCATION = MAPL_VLocationNone, RC=STATUS )
25482572
VERIFY_(STATUS)
25492573

2550-
call MAPL_AddExportSpec(GC, &
2574+
call MAPL_AddExportSpec(GC, &
25512575
SHORT_NAME='RKFRE', &
2552-
LONG_NAME ='fraction_of_tke_associated_with_vertical_velocity', &
2553-
UNITS ='' , &
2576+
LONG_NAME ='fraction_of_tke_associated_with_vertical_velocity', &
2577+
UNITS ='' , &
25542578
DIMS = MAPL_DimsHorzOnly, &
25552579
VLOCATION = MAPL_VLocationNone, RC=STATUS )
2556-
VERIFY_(STATUS)
2580+
VERIFY_(STATUS)
25572581

25582582
call MAPL_AddExportSpec(GC, &
25592583
SHORT_NAME='STOCH_CNV', &
@@ -5365,19 +5389,19 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
53655389
! Trajectory for the moist TLM/ADJ
53665390
!---------------------------------------------------------
53675391
call MAPL_GetPointer(EXPORT, PTR3D, 'TH_moist' , RC=STATUS); VERIFY_(STATUS)
5368-
if (associated(PTR3D)) PTR3D = T/PK
5392+
if (associated(PTR3D)) PTR3D = T/PK
53695393
call MAPL_GetPointer(EXPORT, PTR3D, 'Q_moist' , RC=STATUS); VERIFY_(STATUS)
53705394
if (associated(PTR3D)) PTR3D = Q
53715395
call MAPL_GetPointer(EXPORT, PTR2D, 'TS_moist' , RC=STATUS); VERIFY_(STATUS)
5372-
if (associated(PTR2D)) PTR2D = TS
5396+
if (associated(PTR2D)) PTR2D = TS
53735397
call MAPL_GetPointer(EXPORT, PTR2D, 'KHu_moist', RC=STATUS); VERIFY_(STATUS)
53745398
if (associated(PTR2D)) then
5375-
PTR2D = -1
5399+
PTR2D = -1
53765400
do l = 0,LM
53775401
where( (PTR2D == -1) .AND. (KH(:,:,l) > 2.0) )
53785402
PTR2D = l * 1.0
53795403
end where
5380-
enddo
5404+
enddo
53815405
endif
53825406
call MAPL_GetPointer(EXPORT, PTR2D, 'KHl_moist', RC=STATUS); VERIFY_(STATUS)
53835407
if (associated(PTR2D)) then
@@ -5403,7 +5427,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
54035427
endif
54045428
PTR2D(I,J) = MAX( PTR2D(I,J), KCBLMIN )
54055429
enddo
5406-
enddo
5430+
enddo
54075431
endif
54085432

54095433
! These may be used by children

‎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)