Skip to content

Commit b0cb412

Browse files
Add RRTMGP and surface coupling to convection-permitting suite (ESCOMP#422)
### Tag name None (Bit-for-bit) ### Originator(s) kuanchihwang ### Description (include the issue title, and the keyword ['closes', 'fixes', 'resolves'] followed by the issue number) This PR adds RRTMGP and surface coupling to the convection-permitting suite. It also applies a blanket fix to the inconsistent tendency handling across various MMM physics schemes. ### List all namelist files that have been modified None ### List all files eliminated and why None ### List all files added and what they do None ### List all existing files that have been modified, and describe the changes ``` M schemes/mmm/bl_gwdo_compat.meta * Fix inconsistent tendency behaviors in MMM physics schemes M schemes/mmm/bl_mynn_compat.meta M schemes/mmm/cu_ntiedtke_compat.meta M schemes/mmm/mmm_physics_compat.F90 * Update standard names and add interstitial for RRTMGP * Fix inconsistent tendency behaviors in MMM physics schemes M schemes/mmm/mmm_physics_compat.meta * Update standard names and add interstitial for RRTMGP * Fix metadata * Fix inconsistent tendency behaviors in MMM physics schemes M test/test_suites/suite_convection_permitting.xml * Add RRTMGP to convection-permitting suite * Update standard names and add interstitial for RRTMGP * Enable surface coupling * Fix inconsistent tendency behaviors in MMM physics schemes M test/unit-test/tests/mmm/mmm_physics_compat_tests.pf * Add unit tests ``` ### List all automated tests that failed, as well as an explanation for why they were not fixed All passed. ### Is this an answer-changing PR? If so, is it a new physics package, algorithm change, tuning change, etc? Yes, but only for the convection-permitting suite. ### If yes to the above question, describe how this code was validated with the new/modified features Configure, build, and run CAM-SIMA with the `MPASCP` compset. --------- Co-authored-by: Kuan-Chih Wang <kuanchihw@ucar.edu>
1 parent 702918e commit b0cb412

7 files changed

Lines changed: 1646 additions & 52 deletions

File tree

schemes/mmm/bl_gwdo_compat.meta

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@
9797
dimensions = (horizontal_loop_extent)
9898
intent = in
9999
[ rublten ]
100-
standard_name = tendency_of_eastward_wind_due_to_pbl_processes
100+
standard_name = pending_tendency_of_eastward_wind_due_to_pbl_processes
101101
units = m s-2
102102
type = real | kind = kind_phys
103103
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
104104
intent = inout
105105
[ rvblten ]
106-
standard_name = tendency_of_northward_wind_due_to_pbl_processes
106+
standard_name = pending_tendency_of_northward_wind_due_to_pbl_processes
107107
units = m s-2
108108
type = real | kind = kind_phys
109109
dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/mmm/bl_mynn_compat.meta

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
dimensions = ()
2525
intent = in
2626
[ rthratenlw ]
27-
standard_name = tendency_of_air_potential_temperature_due_to_longwave_heating
27+
standard_name = tendency_of_air_potential_temperature_due_to_longwave_radiation
2828
units = K s-1
2929
type = real | kind = kind_phys
3030
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
3131
intent = in
3232
[ rthratensw ]
33-
standard_name = tendency_of_air_potential_temperature_due_to_shortwave_heating
33+
standard_name = tendency_of_air_potential_temperature_due_to_shortwave_radiation
3434
units = K s-1
3535
type = real | kind = kind_phys
3636
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -156,7 +156,7 @@
156156
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
157157
intent = out
158158
[ rthraten ]
159-
standard_name = tendency_of_air_potential_temperature_due_to_radiative_heating
159+
standard_name = tendency_of_air_potential_temperature_due_to_radiation
160160
units = K s-1
161161
type = real | kind = kind_phys
162162
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -793,79 +793,79 @@
793793
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
794794
intent = inout
795795
[ rublten ]
796-
standard_name = tendency_of_eastward_wind_due_to_pbl_processes
796+
standard_name = pending_tendency_of_eastward_wind_due_to_pbl_processes
797797
units = m s-2
798798
type = real | kind = kind_phys
799799
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
800800
intent = inout
801801
[ rvblten ]
802-
standard_name = tendency_of_northward_wind_due_to_pbl_processes
802+
standard_name = pending_tendency_of_northward_wind_due_to_pbl_processes
803803
units = m s-2
804804
type = real | kind = kind_phys
805805
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
806806
intent = inout
807807
[ rthblten ]
808-
standard_name = tendency_of_air_potential_temperature_due_to_pbl_processes
808+
standard_name = pending_tendency_of_air_potential_temperature_due_to_pbl_processes
809809
units = K s-1
810810
type = real | kind = kind_phys
811811
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
812812
intent = inout
813813
[ rqvblten ]
814-
standard_name = tendency_of_water_vapor_mixing_ratio_wrt_dry_air_due_to_pbl_processes
814+
standard_name = pending_tendency_of_water_vapor_mixing_ratio_wrt_dry_air_due_to_pbl_processes
815815
units = kg kg-1 s-1
816816
type = real | kind = kind_phys
817817
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
818818
intent = inout
819819
[ rqcblten ]
820-
standard_name = tendency_of_cloud_liquid_water_mixing_ratio_wrt_dry_air_due_to_pbl_processes
820+
standard_name = pending_tendency_of_cloud_liquid_water_mixing_ratio_wrt_dry_air_due_to_pbl_processes
821821
units = kg kg-1 s-1
822822
type = real | kind = kind_phys
823823
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
824824
intent = inout
825825
[ rqiblten ]
826-
standard_name = tendency_of_cloud_ice_mixing_ratio_wrt_dry_air_due_to_pbl_processes
826+
standard_name = pending_tendency_of_cloud_ice_mixing_ratio_wrt_dry_air_due_to_pbl_processes
827827
units = kg kg-1 s-1
828828
type = real | kind = kind_phys
829829
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
830830
intent = inout
831831
[ rqsblten ]
832-
standard_name = tendency_of_snow_mixing_ratio_wrt_dry_air_due_to_pbl_processes
832+
standard_name = pending_tendency_of_snow_mixing_ratio_wrt_dry_air_due_to_pbl_processes
833833
units = kg kg-1 s-1
834834
type = real | kind = kind_phys
835835
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
836836
intent = inout
837837
[ rqncblten ]
838-
standard_name = tendency_of_mass_number_concentration_of_cloud_liquid_water_droplets_in_dry_air_due_to_pbl_processes
838+
standard_name = pending_tendency_of_mass_number_concentration_of_cloud_liquid_water_droplets_in_dry_air_due_to_pbl_processes
839839
units = kg-1 s-1
840840
type = real | kind = kind_phys
841841
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
842842
intent = inout
843843
[ rqniblten ]
844-
standard_name = tendency_of_mass_number_concentration_of_cloud_ice_water_crystals_in_dry_air_due_to_pbl_processes
844+
standard_name = pending_tendency_of_mass_number_concentration_of_cloud_ice_water_crystals_in_dry_air_due_to_pbl_processes
845845
units = kg-1 s-1
846846
type = real | kind = kind_phys
847847
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
848848
intent = inout
849849
[ rqnwfablten ]
850-
standard_name = tendency_of_mass_number_concentration_of_hygroscopic_aerosols_in_dry_air_due_to_pbl_processes
850+
standard_name = pending_tendency_of_mass_number_concentration_of_hygroscopic_aerosols_in_dry_air_due_to_pbl_processes
851851
units = kg-1 s-1
852852
type = real | kind = kind_phys
853853
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
854854
intent = inout
855855
[ rqnifablten ]
856-
standard_name = tendency_of_mass_number_concentration_of_nonhygroscopic_ice_nucleating_aerosols_in_dry_air_due_to_pbl_processes
856+
standard_name = pending_tendency_of_mass_number_concentration_of_nonhygroscopic_ice_nucleating_aerosols_in_dry_air_due_to_pbl_processes
857857
units = kg-1 s-1
858858
type = real | kind = kind_phys
859859
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
860860
intent = inout
861861
[ rqnbcablten ]
862-
standard_name = tendency_of_mass_number_concentration_of_hydrophobic_black_carbon_in_dry_air_due_to_pbl_processes
862+
standard_name = pending_tendency_of_mass_number_concentration_of_hydrophobic_black_carbon_in_dry_air_due_to_pbl_processes
863863
units = kg-1 s-1
864864
type = real | kind = kind_phys
865865
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
866866
intent = inout
867867
[ rqozblten ]
868-
standard_name = tendency_of_O3_due_to_pbl_processes
868+
standard_name = pending_tendency_of_O3_due_to_pbl_processes
869869
units = kg kg-1 s-1
870870
type = real | kind = kind_phys
871871
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -1201,7 +1201,7 @@
12011201
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
12021202
intent = in
12031203
[ rthraten ]
1204-
standard_name = tendency_of_air_potential_temperature_due_to_radiative_heating
1204+
standard_name = tendency_of_air_potential_temperature_due_to_radiation
12051205
units = K s-1
12061206
type = real | kind = kind_phys
12071207
dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/mmm/cu_ntiedtke_compat.meta

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
3131
intent = in
3232
[ rthratenlw ]
33-
standard_name = tendency_of_air_potential_temperature_due_to_longwave_heating
33+
standard_name = tendency_of_air_potential_temperature_due_to_longwave_radiation
3434
units = K s-1
3535
type = real | kind = kind_phys
3636
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
3737
intent = in
3838
[ rthratensw ]
39-
standard_name = tendency_of_air_potential_temperature_due_to_shortwave_heating
39+
standard_name = tendency_of_air_potential_temperature_due_to_shortwave_radiation
4040
units = K s-1
4141
type = real | kind = kind_phys
4242
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -295,37 +295,37 @@
295295
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
296296
intent = in
297297
[ rucuten ]
298-
standard_name = tendency_of_eastward_wind_due_to_convection
298+
standard_name = pending_tendency_of_eastward_wind_due_to_convection
299299
units = m s-2
300300
type = real | kind = kind_phys
301301
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
302302
intent = out
303303
[ rvcuten ]
304-
standard_name = tendency_of_northward_wind_due_to_convection
304+
standard_name = pending_tendency_of_northward_wind_due_to_convection
305305
units = m s-2
306306
type = real | kind = kind_phys
307307
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
308308
intent = out
309309
[ rthcuten ]
310-
standard_name = tendency_of_air_potential_temperature_due_to_convection
310+
standard_name = pending_tendency_of_air_potential_temperature_due_to_convection
311311
units = K s-1
312312
type = real | kind = kind_phys
313313
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
314314
intent = out
315315
[ rqvcuten ]
316-
standard_name = tendency_of_water_vapor_mixing_ratio_wrt_dry_air_due_to_convection
316+
standard_name = pending_tendency_of_water_vapor_mixing_ratio_wrt_dry_air_due_to_convection
317317
units = kg kg-1 s-1
318318
type = real | kind = kind_phys
319319
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
320320
intent = out
321321
[ rqccuten ]
322-
standard_name = tendency_of_cloud_liquid_water_mixing_ratio_wrt_dry_air_due_to_convection
322+
standard_name = pending_tendency_of_cloud_liquid_water_mixing_ratio_wrt_dry_air_due_to_convection
323323
units = kg kg-1 s-1
324324
type = real | kind = kind_phys
325325
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
326326
intent = out
327327
[ rqicuten ]
328-
standard_name = tendency_of_cloud_ice_mixing_ratio_wrt_dry_air_due_to_convection
328+
standard_name = pending_tendency_of_cloud_ice_mixing_ratio_wrt_dry_air_due_to_convection
329329
units = kg kg-1 s-1
330330
type = real | kind = kind_phys
331331
dimensions = (horizontal_loop_extent, vertical_layer_dimension)

0 commit comments

Comments
 (0)