Merge branch 'develop' into feature_2578_pcp_combine_missing_inputs

dtcenter · Jun 12, 2024 · c0365d6 · c0365d6
2 parents 48cf20c + c2f741a
commit c0365d6
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 130 deletions.
diff --git a/...es/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview.py b/...es/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview.py
@@ -37,8 +37,8 @@
 #  * Forecast dataset: FV3 3-D history file with physics and dynamics tendencies
 #  * Grid specification: FV3 2-D grid specification file with latitude and longitude of each grid point
 #
-#  **Location:** All of the input data required for this use case can be
-#  found in the met_test sample data tarball. Click here to the METplus
+#  **Location:** All the input data required for this use case can be
+#  found in the met_test sample data tarball. Click here to access the METplus
 #  releases page and download sample data for the appropriate release:
 #  https://github.com/dtcenter/METplus/releases
 #  The tarball should be unpacked into the directory that you will set
@@ -49,7 +49,8 @@
 ##############################################################################
 # External Dependencies 
 # ---------------------
-# You will need to use a versio of Python 3.86 that has the following packages
+# You will need to use a compatible version of Python (for this METplus
+# version) that has the following packages
 # installed:
 #
 #  * cartopy (0.20.3 only)
@@ -59,7 +60,6 @@
 #  * pandas
 #  * shapely
 #  * xarray
-#
 
 
 
@@ -75,7 +75,7 @@
 # ----------------
 # 
 # This use case does not loop but plots physics tendency data that has been
-# subsetted to one date: 2019-05-04.
+# subsetted to one date: 2019-06-15.
 
 ###################################################################################################
 # METplus Configuration

diff --git a/...lications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection.py b/...lications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection.py
@@ -70,7 +70,7 @@
 # ----------------
 #
 # This use case does not loop but plots physics tendency data that has been
-# subsetted to one date: 2019-05-04.
+# subsetted to one date: 2019-06-15.
 # 
 
 

diff --git a/...l_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile.py b/...l_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile.py
@@ -80,7 +80,7 @@
 #
 #
 # | This use case does not loop but plots physics tendency data that has been
-# | subsetted to one date: 2019-05-04.
+# | subsetted to one date: 2019-06-15.
 # |
 
 

diff --git a/.../model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview.conf b/.../model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview.conf
@@ -40,7 +40,7 @@ USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE
 FV3_HISTORY_FILE = {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/fv3_history.nc
 GRID_SPEC_FILE = {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/grid_spec.nc
 PRESSURE_LEVEL = 500
-USER_SCRIPT_COMMAND = {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview/planview_plot.py {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview/physics_tendency_planview.yaml {FV3_HISTORY_FILE} {GRID_SPEC_FILE} tmp pbl -p {PRESSURE_LEVEL} -t 1 -v 20190504T14 -o {OUTPUT_BASE}/plots/short_range-physics_tendency_planview.png --nofineprint
+USER_SCRIPT_COMMAND = {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview/planview_plot.py {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview/physics_tendency_planview.yaml {FV3_HISTORY_FILE} {GRID_SPEC_FILE} tmp pbl -p {PRESSURE_LEVEL} -t 1 -v 20190615T20 -o {OUTPUT_BASE}/plots/short_range-physics_tendency_planview.png --nofineprint
 
 [user_env_vars]
 

diff --git a/...range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview/physics_tendency_planview.yaml b/...range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_Planview/physics_tendency_planview.yaml
@@ -2,47 +2,40 @@
 # Each type of tendency (moisture, temperature, wind component) has its own set of variables.
 tendency_varnames:
     spfh:
-    - dq3dt_deepcnv
-    - dq3dt_mp
-    - dq3dt_pbl
-    - dq3dt_shalcnv
-    - dq3dt_nophys
+    - dtend_qv_pbl
+    - dtend_qv_deepcnv
+    - dtend_qv_shalcnv
+    - dtend_qv_mp
+    - dtend_qv_phys
+    - dtend_qv_nophys
     tmp:
-    - dt3dt_congwd
-    - dt3dt_deepcnv
-    - dt3dt_lw
-    - dt3dt_mp
-    - dt3dt_orogwd
-    - dt3dt_pbl
-    - dt3dt_rdamp
-    - dt3dt_shalcnv
-    - dt3dt_sw
-    - dt3dt_nophys
+    - dtend_temp_lw
+    - dtend_temp_sw
+    - dtend_temp_pbl
+    - dtend_temp_deepcnv
+    - dtend_temp_shalcnv
+    - dtend_temp_mp
+    - dtend_temp_orogwd
+    - dtend_temp_cnvgwd
+    - dtend_temp_phys
+    - dtend_temp_nophys
     ugrd:
-    - du3dt_congwd
-    - du3dt_deepcnv
-    - du3dt_mp
-    - du3dt_orogwd
-    - du3dt_pbl
-    - du3dt_rdamp
-    - du3dt_shalcnv
-    - du3dt_nophys
+    - dtend_u_pbl
+    - dtend_u_orogwd
+    - dtend_u_deepcnv
+    - dtend_u_cnvgwd
+    - dtend_u_shalcnv
+    - dtend_u_phys
+    - dtend_u_nophys
     vgrd:
-    - dv3dt_congwd
-    - dv3dt_deepcnv
-    - dv3dt_mp
-    - dv3dt_orogwd
-    - dv3dt_pbl
-    - dv3dt_rdamp
-    - dv3dt_shalcnv
-    - dv3dt_nophys
+    - dtend_v_pbl
+    - dtend_v_orogwd
+    - dtend_v_deepcnv
+    - dtend_v_cnvgwd
+    - dtend_v_shalcnv
+    - dtend_v_phys
+    - dtend_v_nophys
 
-# Name of variables in history file that contain the temperature, moisture, wind at time zero (initialization time).
-time0_varname:
-    tmp :  tmp_i
-    spfh:   qv_i
-    ugrd: ugrd_i
-    vgrd: vgrd_i
 
 
 # Name of the longitude and latitude variables in the grid specification file.
@@ -65,7 +58,5 @@ standard_parallel : 38.139
 cmap : "Spectral_r"
 
 # resolution (dots per inch) of output
-dpi : 150
-
-
+dpi : 100
 
diff --git a/...cations/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection.conf b/...cations/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection.conf
@@ -39,7 +39,7 @@ USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE
 
 FV3_HISTORY_FILE = {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/fv3_history.nc
 GRID_SPEC_FILE = {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/grid_spec.nc
-USER_SCRIPT_COMMAND = {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection/vertical_cross_section_plot.py {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection/physics_tendency_vertical_cross_section.yaml {FV3_HISTORY_FILE} {GRID_SPEC_FILE} tmp -t 2 -v 20190504T14 -s 32 -115 -e 34 -82 -o {OUTPUT_BASE}/plots/short_range-physics_tendency_vertical_cross_section.png --nofineprint
+USER_SCRIPT_COMMAND = {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection/vertical_cross_section_plot.py {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalCrossSection/physics_tendency_vertical_cross_section.yaml {FV3_HISTORY_FILE} {GRID_SPEC_FILE} tmp -t 1 -v 20190615T20 -s 32 -115 -e 34 -82 -o {OUTPUT_BASE}/plots/short_range-physics_tendency_vertical_cross_section.png --nofineprint
 
 [user_env_vars]
 

diff --git a/...cstOnly_PhysicsTendency_VerticalCrossSection/physics_tendency_vertical_cross_section.yaml b/...cstOnly_PhysicsTendency_VerticalCrossSection/physics_tendency_vertical_cross_section.yaml
@@ -2,47 +2,40 @@
 # Each type of tendency (moisture, temperature, wind component) has its own set of variables.
 tendency_varnames:
     spfh:
-    - dq3dt_deepcnv
-    - dq3dt_mp
-    - dq3dt_pbl
-    - dq3dt_shalcnv
-    - dq3dt_nophys
+    - dtend_qv_pbl
+    - dtend_qv_deepcnv
+    - dtend_qv_shalcnv
+    - dtend_qv_mp
+    - dtend_qv_phys
+    - dtend_qv_nophys
     tmp:
-    - dt3dt_congwd
-    - dt3dt_deepcnv
-    - dt3dt_lw
-    - dt3dt_mp
-    - dt3dt_orogwd
-    - dt3dt_pbl
-    - dt3dt_rdamp
-    - dt3dt_shalcnv
-    - dt3dt_sw
-    - dt3dt_nophys
+    - dtend_temp_lw
+    - dtend_temp_sw
+    - dtend_temp_pbl
+    - dtend_temp_deepcnv
+    - dtend_temp_shalcnv
+    - dtend_temp_mp
+    - dtend_temp_orogwd
+    - dtend_temp_cnvgwd
+    - dtend_temp_phys
+    - dtend_temp_nophys
     ugrd:
-    - du3dt_congwd
-    - du3dt_deepcnv
-    - du3dt_mp
-    - du3dt_orogwd
-    - du3dt_pbl
-    - du3dt_rdamp
-    - du3dt_shalcnv
-    - du3dt_nophys
+    - dtend_u_pbl
+    - dtend_u_orogwd
+    - dtend_u_deepcnv
+    - dtend_u_cnvgwd
+    - dtend_u_shalcnv
+    - dtend_u_phys
+    - dtend_u_nophys
     vgrd:
-    - dv3dt_congwd
-    - dv3dt_deepcnv
-    - dv3dt_mp
-    - dv3dt_orogwd
-    - dv3dt_pbl
-    - dv3dt_rdamp
-    - dv3dt_shalcnv
-    - dv3dt_nophys
+    - dtend_v_pbl
+    - dtend_v_orogwd
+    - dtend_v_deepcnv
+    - dtend_v_cnvgwd
+    - dtend_v_shalcnv
+    - dtend_v_phys
+    - dtend_v_nophys
 
-# Name of variables in history file that contain the temperature, moisture, wind at time zero (initialization time).
-time0_varname:
-    tmp :  tmp_i
-    spfh:   qv_i
-    ugrd: ugrd_i
-    vgrd: vgrd_i
 
 
 # Name of the longitude and latitude variables in the grid specification file.
@@ -65,7 +58,5 @@ standard_parallel : 38.139
 cmap : "Spectral_r"
 
 # resolution (dots per inch) of output
-dpi : 150
-
-
+dpi : 100
 
diff --git a/...applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile.conf b/...applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile.conf
@@ -39,7 +39,7 @@ USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE
 
 FV3_HISTORY_FILE = {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/fv3_history.nc
 GRID_SPEC_FILE = {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/grid_spec.nc
-USER_SCRIPT_COMMAND = {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile/vertical_profile_plot.py {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile/physics_tendency_vertical_profile.yaml {FV3_HISTORY_FILE} {GRID_SPEC_FILE} tmp -t 2 -v 20190504T14 -o {OUTPUT_BASE}/plots/short_range-physics_tendency_vertical_profile.png -s {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/shapefiles/MID_CONUS --nofineprint
+USER_SCRIPT_COMMAND = {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile/vertical_profile_plot.py {PARM_BASE}/use_cases/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile/physics_tendency_vertical_profile.yaml {FV3_HISTORY_FILE} {GRID_SPEC_FILE} tmp -t 1 -v 20190615T20 -o {OUTPUT_BASE}/plots/short_range-physics_tendency_vertical_profile.png -s {INPUT_BASE}/model_applications/short_range/UserScript_fcstFV3_fcstOnly_PhysicsTendency/shapefiles/MID_CONUS --nofineprint
 
 
 [user_env_vars]

diff --git a/...t_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile/physics_tendency_vertical_profile.yaml b/...t_fcstFV3_fcstOnly_PhysicsTendency_VerticalProfile/physics_tendency_vertical_profile.yaml
@@ -2,47 +2,40 @@
 # Each type of tendency (moisture, temperature, wind component) has its own set of variables.
 tendency_varnames:
     spfh:
-    - dq3dt_deepcnv
-    - dq3dt_mp
-    - dq3dt_pbl
-    - dq3dt_shalcnv
-    - dq3dt_nophys
+    - dtend_qv_pbl
+    - dtend_qv_deepcnv
+    - dtend_qv_shalcnv
+    - dtend_qv_mp
+    - dtend_qv_phys
+    - dtend_qv_nophys
     tmp:
-    - dt3dt_congwd
-    - dt3dt_deepcnv
-    - dt3dt_lw
-    - dt3dt_mp
-    - dt3dt_orogwd
-    - dt3dt_pbl
-    - dt3dt_rdamp
-    - dt3dt_shalcnv
-    - dt3dt_sw
-    - dt3dt_nophys
+    - dtend_temp_lw
+    - dtend_temp_sw
+    - dtend_temp_pbl
+    - dtend_temp_deepcnv
+    - dtend_temp_shalcnv
+    - dtend_temp_mp
+    - dtend_temp_orogwd
+    - dtend_temp_cnvgwd
+    - dtend_temp_phys
+    - dtend_temp_nophys
     ugrd:
-    - du3dt_congwd
-    - du3dt_deepcnv
-    - du3dt_mp
-    - du3dt_orogwd
-    - du3dt_pbl
-    - du3dt_rdamp
-    - du3dt_shalcnv
-    - du3dt_nophys
+    - dtend_u_pbl
+    - dtend_u_orogwd
+    - dtend_u_deepcnv
+    - dtend_u_cnvgwd
+    - dtend_u_shalcnv
+    - dtend_u_phys
+    - dtend_u_nophys
     vgrd:
-    - dv3dt_congwd
-    - dv3dt_deepcnv
-    - dv3dt_mp
-    - dv3dt_orogwd
-    - dv3dt_pbl
-    - dv3dt_rdamp
-    - dv3dt_shalcnv
-    - dv3dt_nophys
+    - dtend_v_pbl
+    - dtend_v_orogwd
+    - dtend_v_deepcnv
+    - dtend_v_cnvgwd
+    - dtend_v_shalcnv
+    - dtend_v_phys
+    - dtend_v_nophys
 
-# Name of variables in history file that contain the temperature, moisture, wind at time zero (initialization time).
-time0_varname:
-    tmp :  tmp_i
-    spfh:   qv_i
-    ugrd: ugrd_i
-    vgrd: vgrd_i
 
 
 # Name of the longitude and latitude variables in the grid specification file.
@@ -65,7 +58,5 @@ standard_parallel : 38.139
 cmap : "Spectral_r"
 
 # resolution (dots per inch) of output
-dpi : 150
-
-
+dpi : 100