Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature 2842 ugrid config #2875

Merged
merged 29 commits into from
May 1, 2024
Merged

Feature 2842 ugrid config #2875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
48b52e7
#2842 Removed UGrid related setting
Mar 27, 2024
9feae3d
#2842 Corrected vertical level for data_plane_array
Mar 27, 2024
01ae422
#2842 Do not allow the time range
Mar 27, 2024
1b43102
#2842 The UGridConfig file can be passed as ugrid_dataset
Mar 27, 2024
334b2a8
#2842 Changed -config option to -ugrid_config
Mar 27, 2024
b9ca329
#2842 Deleted UGrid configurations
Mar 28, 2024
7f25cf8
2842 Fix a compile error when UGrid is disabled
Apr 2, 2024
8293c53
#2842 Cleanup
Apr 2, 2024
816c12c
#2842 Added an unittest point_stat_ugrid_mpas_config
Apr 8, 2024
613035c
#2842 Added a PointStatConfig without UGrid dataset.
Apr 8, 2024
42f65bd
#2842 Corrected ty[po at the variable name
Apr 17, 2024
301a14b
Merge remote-tracking branch 'origin/develop' into feature_2842_ugrid…
Apr 17, 2024
0974159
Switched from time_centered to time_instant. I think time_centered is…
DanielAdriaansen Apr 18, 2024
7933a7e
#2842 Removed ugrid_max_distance_km and unused metadata names
Apr 19, 2024
faac20c
#2842 Restored time variable for LFric
Apr 19, 2024
a253d1e
#2842 Restored time variable time_instant for LFric
Apr 19, 2024
3c16852
#2842 Adjust lon between -180 and 180
Apr 23, 2024
2472b84
#2842 Adjust lon between -180 and 180
Apr 23, 2024
9dfc8bf
#2842 Adjust lon between -180 and 180
Apr 23, 2024
fd42640
#2842 Adjusted lon to between -180 to 180
Apr 23, 2024
50d6e4a
#2842 Changed variable names
Apr 23, 2024
f620206
Per #2842, switch from degrees east to west right when the longitudes…
JohnHalleyGotway Apr 24, 2024
f25dd19
#2842, switch from degrees east to west right when the longitudes are…
Apr 24, 2024
07e4209
#2842 Cleanup debug messages
Apr 25, 2024
4a35bc9
#2842 Disabled output types except STAT for sl1l2
Apr 30, 2024
2ad800a
#2842 Disabled output types except STAT for sl1l2 and MPR
Apr 30, 2024
c596483
#2842 Reduced output files for UGrid
Apr 30, 2024
12218d7
Merge remote-tracking branch 'origin/develop' into feature_2842_ugrid…
Apr 30, 2024
02cd000
Merfed with origin/develop
Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions internal/test_unit/config/GridStatConfig_ugrid_mpas
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading