Skip to content

Bugfix #3410 ugrid lead time develop #3425

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

Open
hsoh-u wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Bugfix #3410 ugrid lead time develop #3425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b14df7c
#3410 Added get_init_time(netCDF::NcVar *)
Jul 29, 2026
5a2c8c5
#3410 Added get_init_time(netCDF::NcVar *)
Jul 29, 2026
c0c8e41
#3410 Added init_time
Jul 29, 2026
e42205b
#3410 Support InitTime from the init_time configuration
Jul 29, 2026
bdc18f5
#3410 Cleanup
Jul 29, 2026
f44cf81
#3410 Initialisze result
Aug 4, 2026
9758540
#3410 Added const to DIM_KEYS and COORD_VAR_KEYS
Aug 4, 2026
80d0b35
#3410 Added const to init_time_var_name
Aug 4, 2026
f5ba8e2
#3410 Added init_hour 12 into putput filenames
Aug 17, 2026
d599213
#3410 Removed _time_var_info
Aug 18, 2026
a3e0c26
#3410 data type conversion to init_time
Aug 18, 2026
f0f0c1d
#3410 Type conversion for SonarQube findings
Aug 18, 2026
91deca9
#3410 Separated assignments
Aug 19, 2026
1644826
Update docs/Users_Guide/appendixH.rst
hsoh-u Aug 26, 2026
ddeff76
Update docs/Users_Guide/appendixH.rst
hsoh-u Aug 26, 2026
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
3 changes: 2 additions & 1 deletion data/config/UGridConfig_mpas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ ugrid_metadata_map = [
{ key = "lat_face"; val = "latCell"; },
{ key = "lon_face"; val = "lonCell"; },
{ key = "vert_face"; val = "zCell"; }, // optional
{ key = "time"; val = "xtime"; }
{ key = "time"; val = "xtime"; },
{ key = "init_time"; val = "initial_time"; } // optional
];

//
Expand Down
5 changes: 4 additions & 1 deletion docs/Users_Guide/appendixH.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ To correctly parse the UGRID topology, MET needs the following information that
- Dimension name for the time coordinate
- Required
* - time
- Coordinate variable for time
- Coordinate variable for valid time
- Required
* - init_time
- Coordinate variable for initialization time (used to compute the lead time)
- Optional
* - dim_vert
- Dimension name for the vertical coordinate, if present
- Optional
Expand Down
6 changes: 5 additions & 1 deletion internal/test_unit/python/unit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ def unit(test_xml, file_log=None, cmd_only=False, noexit=False, memchk=False, ca
ret_ok = (cmd_return.returncode == test['retval'])
if ret_ok:
out_ok = True
result = None

for filepath in test['out_pnc']:
result = subprocess.run([mpnc, '-v', filepath],
Expand Down Expand Up @@ -173,7 +174,10 @@ def unit(test_xml, file_log=None, cmd_only=False, noexit=False, memchk=False, ca
break
except FileNotFoundError:
cmd_outs += (f"\nERROR: stat file missing {filepath}\n")
logger.debug(result.stdout)
if result:
logger.debug(result.stdout)
else:
logger.debug(f"No result object, stat file missing {filepath}")
out_ok = False
break
# check stat file has non-header lines
Expand Down
14 changes: 7 additions & 7 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 @@ -35,8 +35,8 @@
-outdir &OUTPUT_DIR;/grid_stat_ugrid -v 1
</param>
<output>
<stat>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_OUT_TO_GRID_000000L_20120409_120000V.stat</stat>
<exist>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_OUT_TO_GRID_000000L_20120409_120000V_pairs.nc</exist>
<stat>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_OUT_TO_GRID_120000L_20120409_120000V.stat</stat>
<exist>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_OUT_TO_GRID_120000L_20120409_120000V_pairs.nc</exist>
</output>
</test>

Expand All @@ -53,8 +53,8 @@
-outdir &OUTPUT_DIR;/grid_stat_ugrid -v 1
</param>
<output>
<stat>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_DIAG_000000L_20120409_120000V.stat</stat>
<exist>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_DIAG_000000L_20120409_120000V_pairs.nc</exist>
<stat>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_DIAG_120000L_20120409_120000V.stat</stat>
<exist>&OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_DIAG_120000L_20120409_120000V_pairs.nc</exist>
</output>
</test>

Expand All @@ -79,7 +79,7 @@
-outdir &OUTPUT_DIR;/point_stat_ugrid -v 1
</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_120000L_20120409_120000V.stat</stat>
</output>
</test>

Expand All @@ -98,7 +98,7 @@
-outdir &OUTPUT_DIR;/point_stat_ugrid -v 1
</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_120000L_20120409_120000V.stat</stat>
</output>
</test>

Expand All @@ -118,7 +118,7 @@
-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>
<stat>&OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_CFG_OUT_TEMP_120000L_20120409_120000V.stat</stat>
</output>
</test>

Expand Down
Loading
Loading