Skip to content

Commit

Permalink
Feature 2842 ugrid config (#2875)
Browse files Browse the repository at this point in the history 
* #2842 Removed UGrid related setting

* #2842 Corrected vertical level for data_plane_array

* #2842 Do not allow the time range

* #2842 The UGridConfig file can be passed as ugrid_dataset

* #2842 Changed -config option to -ugrid_config

* #2842 Deleted UGrid configurations

* 2842 Fix a compile error when UGrid is disabled

* #2842 Cleanup

* #2842 Added an unittest point_stat_ugrid_mpas_config

* #2842 Added a PointStatConfig without UGrid dataset.

* #2842 Corrected ty[po at the variable name

* Switched from time_centered to time_instant. I think time_centered is the center of the forecast lead window and time_instant is the time the forecast is valid (end of forecast window).

* #2842 Removed ugrid_max_distance_km and unused metadata names

* #2842 Restored time variable time_instant for LFric

* #2842 Adjust lon between -180 and 180

* #2842 Adjust lon between -180 and 180

* #2842 Adjust lon between -180 and 180

* #2842 Adjusted lon to between -180 to 180

* #2842 Changed variable names

* Per #2842, switch from degrees east to west right when the longitudes are read.

* #2842, switch from degrees east to west right when the longitudes are read

* #2842 Cleanup debug messages

* #2842 Disabled output types except STAT for sl1l2

* #2842 Disabled output types except STAT for sl1l2 and MPR

* #2842 Reduced output files for UGrid

---------

Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
  • Loading branch information
@hsoh-u @DanielAdriaansen @JohnHalleyGotway
4 people committed May 1, 2024
1 parent ccd1061 commit 7f9bf9c
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 46 deletions.
10 changes: 5 additions & 5 deletions internal/test_unit/config/GridStatConfig_ugrid_mpas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ output_flag = {
cts = NONE;
mctc = NONE;
mcts = NONE;
cnt = STAT;
cnt = NONE;
sl1l2 = STAT;
sal1l2 = STAT;
vl1l2 = STAT;
val1l2 = STAT;
vcnt = STAT;
sal1l2 = NONE;
vl1l2 = NONE;
val1l2 = NONE;
vcnt = NONE;
pct = NONE;
pstd = NONE;
pjc = NONE;
Expand Down
10 changes: 5 additions & 5 deletions internal/test_unit/config/GridStatConfig_ugrid_mpas_diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ output_flag = {
cts = NONE;
mctc = NONE;
mcts = NONE;
cnt = STAT;
cnt = NONE;
sl1l2 = STAT;
sal1l2 = STAT;
vl1l2 = STAT;
val1l2 = STAT;
vcnt = STAT;
sal1l2 = NONE;
vl1l2 = NONE;
val1l2 = NONE;
vcnt = NONE;
pct = NONE;
pstd = NONE;
pjc = NONE;
Expand Down
16 changes: 8 additions & 8 deletions internal/test_unit/config/PointStatConfig_ugrid_mpas_diag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,26 @@ hira = {
////////////////////////////////////////////////////////////////////////////////

output_flag = {
fho = BOTH;
ctc = BOTH;
cts = BOTH;
fho = STAT;
ctc = STAT;
cts = STAT;
mctc = NONE;
mcts = NONE;
cnt = BOTH;
sl1l2 = NONE;
cnt = NONE;
sl1l2 = STAT;
sal1l2 = NONE;
vl1l2 = NONE;
val1l2 = NONE;
vcnt = BOTH;
vcnt = NONE;
pct = NONE;
pstd = NONE;
pjc = NONE;
prc = NONE;
ecnt = NONE;
orank = NONE;
rps = NONE;
eclv = BOTH;
mpr = BOTH;
eclv = NONE;
mpr = STAT;
seeps = NONE;
seeps_mpr = NONE;
}
Expand Down
16 changes: 8 additions & 8 deletions internal/test_unit/config/PointStatConfig_ugrid_mpas_out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,26 @@ hira = {
////////////////////////////////////////////////////////////////////////////////

output_flag = {
fho = BOTH;
ctc = BOTH;
cts = BOTH;
fho = STAT;
ctc = STAT;
cts = STAT;
mctc = NONE;
mcts = NONE;
cnt = BOTH;
sl1l2 = NONE;
cnt = NONE;
sl1l2 = STAT;
sal1l2 = NONE;
vl1l2 = NONE;
val1l2 = NONE;
vcnt = BOTH;
vcnt = NONE;
pct = NONE;
pstd = NONE;
pjc = NONE;
prc = NONE;
ecnt = NONE;
orank = NONE;
rps = NONE;
eclv = BOTH;
mpr = BOTH;
eclv = NONE;
mpr = STAT;
seeps = NONE;
seeps_mpr = NONE;
}
Expand Down
16 changes: 8 additions & 8 deletions internal/test_unit/config/PointStatConfig_ugrid_no_dataset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,26 +119,26 @@ hira = {
////////////////////////////////////////////////////////////////////////////////

output_flag = {
fho = BOTH;
ctc = BOTH;
cts = BOTH;
fho = NONE;
ctc = NONE;
cts = NONE;
mctc = NONE;
mcts = NONE;
cnt = BOTH;
sl1l2 = NONE;
cnt = NONE;
sl1l2 = STAT;
sal1l2 = NONE;
vl1l2 = NONE;
val1l2 = NONE;
vcnt = BOTH;
vcnt = NONE;
pct = NONE;
pstd = NONE;
pjc = NONE;
prc = NONE;
ecnt = NONE;
orank = NONE;
rps = NONE;
eclv = BOTH;
mpr = BOTH;
eclv = NONE;
mpr = STAT;
seeps = NONE;
seeps_mpr = NONE;
}
Expand Down
32 changes: 20 additions & 12 deletions internal/test_unit/xml/unit_ugrid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@
</param>
<output>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_fho.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_ctc.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_eclv.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_mpr.txt</stat>
</output>
</test>

Expand All @@ -102,12 +96,26 @@
</param>
<output>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V.stat</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_fho.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_ctc.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_cts.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_cnt.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_eclv.txt</stat>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_mpr.txt</stat>
</output>
</test>

<test name="point_stat_ugrid_mpas_config">
<exec>&MET_BIN;/point_stat</exec>
<env>
<pair><name>BEG_DS</name> <value>-1800</value></pair>
<pair><name>END_DS</name> <value>1800</value></pair>
<pair><name>OUTPUT_PREFIX</name> <value>UGRID_MPAS_CFG_OUT_TEMP</value></pair>
<pair><name>CONFIG_DIR</name> <value>&CONFIG_DIR;</value></pair>
</env>
<param> \
&DATA_DIR_UGRID;/mpas/mpasout.2012-04-09_12.00.00_reduced.nc \
&OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \
&CONFIG_DIR;/PointStatConfig_ugrid_no_dataset \
-ugrid_config ${MET_BASE}/config/UGridConfig_mpas \
-outdir &OUTPUT_DIR;/point_stat_ugrid -v 1
</param>
<output>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_000000L_20120409_120000V.stat</stat>
</output>
</test>

Expand Down

0 comments on commit 7f9bf9c

Please sign in to comment.