Skip to content

Commit

Permalink
Merge branch 'develop' into release/MAPL-v3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathomp4
mathomp4 committed May 6, 2024
2 parents 024d65e + db55c30 commit 9ac4bf6
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 59 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
142 changes: 83 additions & 59 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'TAUOROX', &
LONG_NAME = 'surface_eastward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -533,7 +533,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'TAUOROY', &
LONG_NAME = 'surface_northward_orographic_gravity_wave_stress', &
UNITS = 'N m-2', &
RESTART = MAPL_RestartSkip, &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)
Expand All @@ -543,7 +543,7 @@ subroutine SetServices ( GC, RC )
SHORT_NAME = 'OMEGA', &
LONG_NAME = 'vertical_pressure_velocity', &
UNITS = 'Pa s-1', &
RESTART = MAPL_RestartSkip, &
RESTART = MAPL_RestartSkip, &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)
Expand Down 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 @@ -1122,18 +1146,18 @@ subroutine SetServices ( GC, RC )
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'UMF_DC', &
LONG_NAME = 'Deep_updraft_mass_flux_at_interfaces', &
LONG_NAME = 'Deep_updraft_mass_flux_at_interfaces', &
UNITS = 'kg m-2 s-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationEdge, &
RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec(GC, &

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'MFD_DC', &
LONG_NAME = 'Deep_updraft_detrained_mass_flux', &
LONG_NAME = 'Deep_updraft_detrained_mass_flux', &
UNITS = 'kg m-2 s-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, &
Expand Down Expand Up @@ -1168,7 +1192,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'CNV_TOPP_DP', &
SHORT_NAME = 'CNV_TOPP_DP', &
LONG_NAME = 'pressure_at_deep_convective_cloud_top', &
UNITS = 'Pa', &
DIMS = MAPL_DimsHorzOnly, &
Expand All @@ -1177,7 +1201,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'CNV_TOPP_MD', &
SHORT_NAME = 'CNV_TOPP_MD', &
LONG_NAME = 'pressure_at_congestus_convective_cloud_top', &
UNITS = 'Pa', &
DIMS = MAPL_DimsHorzOnly, &
Expand All @@ -1186,7 +1210,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'CNV_TOPP_SH', &
SHORT_NAME = 'CNV_TOPP_SH', &
LONG_NAME = 'pressure_at_shallow_convective_cloud_top', &
UNITS = 'Pa', &
DIMS = MAPL_DimsHorzOnly, &
Expand Down Expand Up @@ -1216,23 +1240,23 @@ subroutine SetServices ( GC, RC )

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'ENTR_MD', &
LONG_NAME = 'Lateral_entrainment_rate_in_gf_mid_convection_updraft', &
LONG_NAME = 'Lateral_entrainment_rate_in_gf_mid_convection_updraft', &
UNITS = 'm-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, &
VLOCATION = MAPL_VLocationCenter, &
RC=STATUS )
VERIFY_(STATUS)

VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'ENTR_SH', &
LONG_NAME = 'Lateral_entrainment_rate_in_gf_shallow_convection_updraft', &
LONG_NAME = 'Lateral_entrainment_rate_in_gf_shallow_convection_updraft', &
UNITS = 'm-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, &
VLOCATION = MAPL_VLocationCenter, &
RC=STATUS )
VERIFY_(STATUS)

VERIFY_(STATUS)

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

call MAPL_AddExportSpec(GC, &
call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'SNOW_RATIO', &
LONG_NAME = 'ratio_of_snow_to_total_precip',&
UNITS = '1', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME ='LS_PRCP', &
Expand Down Expand Up @@ -2547,13 +2571,13 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
call MAPL_AddExportSpec(GC, &
SHORT_NAME='RKFRE', &
LONG_NAME ='fraction_of_tke_associated_with_vertical_velocity', &
UNITS ='' , &
LONG_NAME ='fraction_of_tke_associated_with_vertical_velocity', &
UNITS ='' , &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, RC=STATUS )
VERIFY_(STATUS)
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME='STOCH_CNV', &
Expand Down Expand Up @@ -5365,19 +5389,19 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
! Trajectory for the moist TLM/ADJ
!---------------------------------------------------------
call MAPL_GetPointer(EXPORT, PTR3D, 'TH_moist' , RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = T/PK
if (associated(PTR3D)) PTR3D = T/PK
call MAPL_GetPointer(EXPORT, PTR3D, 'Q_moist' , RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) PTR3D = Q
call MAPL_GetPointer(EXPORT, PTR2D, 'TS_moist' , RC=STATUS); VERIFY_(STATUS)
if (associated(PTR2D)) PTR2D = TS
if (associated(PTR2D)) PTR2D = TS
call MAPL_GetPointer(EXPORT, PTR2D, 'KHu_moist', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR2D)) then
PTR2D = -1
PTR2D = -1
do l = 0,LM
where( (PTR2D == -1) .AND. (KH(:,:,l) > 2.0) )
PTR2D = l * 1.0
end where
enddo
enddo
endif
call MAPL_GetPointer(EXPORT, PTR2D, 'KHl_moist', RC=STATUS); VERIFY_(STATUS)
if (associated(PTR2D)) then
Expand All @@ -5403,7 +5427,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
endif
PTR2D(I,J) = MAX( PTR2D(I,J), KCBLMIN )
enddo
enddo
enddo
endif

! These may be used by children
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 9ac4bf6

Please sign in to comment.