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.

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

Feature 2231 unstructured grid #2723

Merged
merged 118 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
c10a740
#2231 Added vx_data2d_ugrid
Sep 12, 2023
256ef42
#2231 Added MET_ATLAS and MET_ECKIT
Sep 12, 2023
8ebb8d4
#2231 Added MET_ATLAS and MET_ECKIT
Sep 12, 2023
e3322d4
#2231 Added MET_ATLAS and MET_ECKIT
Sep 12, 2023
df81425
#2231 Added MET_ATLAS and MET_ECKIT
Sep 12, 2023
8922f73
#2231 Added FileType_UGrid
Sep 12, 2023
c4c64c5
#2231 Added MET_ATLAS, MET_ECKIT, and vx_data2d_ugrid
Sep 12, 2023
586a793
#2231 Cleanup for sonarqube
Sep 12, 2023
aeefa27
Added UnstructuredData
Sep 12, 2023
70da6bb
#2231 Added MET_ATLAS, MET_ECKIT and more files
Sep 12, 2023
9043e99
#231 Added parse_time_string to support the characrter type date
Sep 12, 2023
6a3710f
#2231 Support unstructured grid
Sep 12, 2023
8fc9140
Initial release
Sep 12, 2023
3d50857
#2231 Initial release
Sep 12, 2023
721825b
#2231 Added vx_data2d_ugrid
Sep 12, 2023
a8cc6e5
#2231 Added vx_data2d_ugrid to AC_CONFIG_FILES
Sep 12, 2023
e0a648f
#2231 Corrected comments
Sep 12, 2023
4331688
#2231 Added src/libcode/vx_data2d_ugrid/Makefile
Sep 18, 2023
6ded51e
#2231 Added NETCDF_UGRID
Sep 18, 2023
f5b76fd
#2231 Added MET_ATLAS and MET_ECKIT
Sep 18, 2023
0218ae2
#2231 Added checksum for unstructured grid
Sep 18, 2023
8818d62
#2231 Renamed to metadata_map to ugrid_metadata_map. Allow to overrid…
Sep 18, 2023
d33c387
#2231 Removed command line option for unstructured grid and make is c…
Sep 18, 2023
5a05eaa
#2231 Added ugrid_max_distance_km
Sep 20, 2023
e9e09c9
#2231 Exit if user defined metadata maiing configuration file does no…
Sep 22, 2023
e77b033
#2231 Exit if user defined metadata maiing configuration file does no…
Sep 22, 2023
fd905d1
2231 Changed metadat_map to ugrid_metadata_map
Oct 4, 2023
f49ffcf
#2231 Added UGridConfig_default
Oct 4, 2023
034bbdb
2231 Changed metadat_map to ugrid_metadata_map
Oct 4, 2023
7b244a5
#2231 Restored dimension array
Oct 7, 2023
c9101c1
#2231 Changed tab to spaces
Oct 7, 2023
3904784
#2231 Cleanup
Oct 7, 2023
94d993c
#2231 Process vertical level string
Oct 7, 2023
a8ec014
#2574 Added --enable-ugrid
Oct 10, 2023
254b70e
#2574 Excluded Atlas and ecKit libraries at LDFLAGS
Oct 10, 2023
c07ae28
#2574 Added --enable-ugrid
Oct 10, 2023
ab20cf6
#2574 Made conditional build for the unstructured grid
Oct 10, 2023
9cc351d
#2574 Added UGRID_LIBS
Oct 10, 2023
a15c14d
#2574 Added UGRID_LINBS
Oct 10, 2023
7e0aace
#2574 Added UGRID_LIBS
Oct 10, 2023
11bed9a
#2574 Made vx_data2d_ugrid conditional
Oct 10, 2023
c72837a
#2474 Added UGRID_LIBS
Oct 10, 2023
4298f54
#2574 Replaced libraries with UGRID_LIBS
Oct 10, 2023
478a5b8
#2574 Replaced libraries with UGRID_LIBS
Oct 10, 2023
8a8ffe8
#2231 Added find_nc_vinfo_list
Oct 30, 2023
09ac51a
#2231 Support L and P notations for the level string
Oct 30, 2023
1e55bbb
#2231 Support L and P notation for the level string
Oct 30, 2023
3a78fb6
Merge remote-tracking branch 'origin/develop' into feature_2231_unstr…
Oct 30, 2023
bcf7d4a
#2231 Allow an ugrid data as observation
Nov 1, 2023
c8edf90
#2231 Removed _xCoordVar and _yCoordVar
Nov 1, 2023
3af48c1
#2231 cleanup
Nov 1, 2023
4720b30
#2231 Initial release
Nov 1, 2023
1da9fa2
#2231 Added unit_ugrid.xml
Nov 1, 2023
d9c29b2
#2231 Added unit_ugrid.xml
Nov 1, 2023
af99457
#2231 Switched the grid_nc tag to the exists tag
Nov 3, 2023
adc9828
Rename UGridConfig_default to UGridConfig_default_mpas
hsoh-u Nov 6, 2023
b745912
Rename UGridConfig_default_mpas to UGridConfig_mpas
hsoh-u Nov 6, 2023
66a0e9d
#2231 Disable the ugrid test target
Nov 6, 2023
d613beb
#2231 Added ugrid_dataset and renamed ugrid_user_map_config to ugrid_…
Nov 7, 2023
9d58784
#2231 Support ugrid_dataset
Nov 7, 2023
23cc52f
#2231 Support optiolnal -config option and ugrid_dataset
Nov 7, 2023
a25309c
Merge branch 'feature_2231_unstructured_grid' of github.com:dtcenter/…
Nov 7, 2023
76a7006
#2231 Cleanup: 0 to nullptr
Nov 7, 2023
d39dcf1
#2231 Check if ugrid_dataset is missing
Nov 7, 2023
afba3a1
#2231 Initial release
Nov 7, 2023
8a9e05d
#2231 Added ugrid_dataset = mpas
Nov 7, 2023
ba85639
#2231 Added ugrid_max_distance_km
Nov 7, 2023
65190bf
#2231 Removed UGridConfig_default and added UGridConfig_lfric and UGr…
Nov 7, 2023
4b08529
Cleanup
Nov 8, 2023
a840ccf
#2231 cleanup
Nov 9, 2023
abebd9b
#2231 Removed settings for LFric
Nov 9, 2023
18a44d9
#2231 Corercted delete statement for tmp_buf
Nov 9, 2023
9e60a39
#2231 Initialize ut
Nov 9, 2023
2561ae1
#2231 Added ugrid_compile_error
Nov 9, 2023
ab756f5
#2231 Replaced the error message by calling ugrid_compile_error
Nov 9, 2023
ae86727
#2231 Added a missing double quation mark
Nov 10, 2023
11070b6
#2231 Corrected bad syntax to release a memory
Nov 10, 2023
51b4f6c
#2231 Added parse_add_conf_key_values_map and parse_add_conf_ugrid_me…
Nov 10, 2023
467d9d9
#2231 Combined three APIs to set_ugrid_configs
Nov 10, 2023
588c1b8
#2231 Removed the second argument do_override at read_config and set_…
Nov 10, 2023
bf90445
#2231 Check log condition first
Nov 10, 2023
f9a0f9e
#2231 Check ugrid_dataset in order to set ugrid configurations
Nov 10, 2023
c32e7d7
Merge remote-tracking branch 'origin/develop' into feature_2231_unstr…
Nov 10, 2023
3bb3c9a
#2231 Added ugrid settings
Nov 10, 2023
8a0fa67
#2231 Removed file_type (enabled auto-detection for MPAS data
Nov 14, 2023
8ae6c44
#2231 Removed sl1l2 and sal1l2 output which have no data line
Nov 14, 2023
a80db9e
#2231 Added is_ugrid_file to detect UGrid dfata by looking at the glo…
Nov 14, 2023
c8fd9cd
#2231 Set the magic string for L and P notation at the level
Nov 14, 2023
d8e2852
#2231 Removed max_distance_km at the log message
Nov 14, 2023
d6fcfd6
#2231 Added log message with failure on reading fcst/obs
Nov 14, 2023
66c504e
#2231 Added log message
Nov 14, 2023
2681986
#2231 Restore variable name when the data_plane array is built from m…
Nov 14, 2023
9d70e3e
#2231 Corretced data read dimension
Nov 14, 2023
e1086ce
Merge remote-tracking branch 'origin/develop' into feature_2231_unstr…
JohnHalleyGotway Nov 15, 2023
3a81f41
Merge remote-tracking branch 'origin/develop' into feature_2231_unstr…
Nov 15, 2023
d8d879e
#2231 Added MPAS at Conventions as ugrid
Nov 15, 2023
859393a
#2231 Detect UGrid data and gives a proper error message
Nov 15, 2023
a639b4f
Per #2231, this branch has been upgraded to using dtcenter/met-base:v…
JohnHalleyGotway Nov 15, 2023
eefd203
#2231 Added the namespace std to map and vector
Nov 15, 2023
86dd4c3
#2231 Added the namespace std to map and vector
Nov 15, 2023
444b753
#2231 Added is_in_distance
Nov 15, 2023
15f65b1
Per #2231, add --enable-ugrid to the build_met_docker.sh script.
Nov 15, 2023
94a5ae8
#2231 Initialize Nnode and Nedge
Nov 15, 2023
7965805
#2231 Give a warning if multiple levels are selected
Nov 15, 2023
47b3513
diff
Nov 15, 2023
dc66e27
#2231 Check the face dimension between data file and metadata file
Nov 15, 2023
e78688e
Merge branch 'feature_2231_unstructured_grid' of github.com:dtcenter/…
Nov 15, 2023
796c290
Per #2231, update configure.ac, configure, and all the Makefile.am an…
JohnHalleyGotway Nov 15, 2023
373885e
Merge branch 'feature_2231_unstructured_grid' of https://github.com/d…
JohnHalleyGotway Nov 15, 2023
75cf04a
Per #2231, more changes to library linking in Makefile to get a succe…
JohnHalleyGotway Nov 15, 2023
7edab89
Per #2231, add unit_ugrid.xml to the unit tests run by Unit 2a in the…
JohnHalleyGotway Nov 15, 2023
d8418bd
#2231 Changed a warning to an error with multiple vertical levels
Nov 16, 2023
f64df42
#2231 Changed error message (metadata file to coordinates file)
Nov 16, 2023
0fad884
Merge branch 'feature_2231_unstructured_grid' of github.com:dtcenter/…
Nov 16, 2023
4fbad94
#2231 Select only 1 vertical level (disabled multiptle levels)
Nov 16, 2023
70fb75e
#2231 Merged develop branch
Nov 16, 2023
ec30e0a
Merge remote-tracking branch 'origin/develop' into feature_2231_unstr…
Nov 16, 2023
ed37524
#2231 Initialize n at get_max_n_cov_thresh
Nov 16, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ jobs:
- 'grid_stat stat_analysis_gs'
- 'wavelet_stat stat_analysis_ws'
- 'ensemble_stat stat_analysis_es'
- 'ugrid'
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ sub-directory, or the MET Online Tutorial:
Enable compilation of lidar2nc
Requires $MET_HDF

--enable-ugrid
Enable compilation of unstructured grid
Requires $MET_ATLAS and $MET_ECKIT

To configure MET to install all of the available tools in the "bin"
subdirectory of your current directory, you would use the following command:

Expand Down
2 changes: 2 additions & 0 deletions Make-include
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ MET_CPPFLAGS = -I${top_builddir}/src/basic/vx_cal \
-I${top_builddir}/src/libcode/vx_data2d_nc_met \
-I${top_builddir}/src/libcode/vx_data2d_nc_pinterp \
-I${top_builddir}/src/libcode/vx_data2d_python \
-I${top_builddir}/src/libcode/vx_data2d_ugrid \
-I${top_builddir}/src/libcode/vx_python3_utils \
-I${top_builddir}/src/libcode/vx_geodesy \
-I${top_builddir}/src/libcode/vx_gis \
Expand Down Expand Up @@ -61,6 +62,7 @@ MET_LDFLAGS = -L${top_builddir}/src/basic/vx_cal \
-L${top_builddir}/src/libcode/vx_data2d_nc_met \
-L${top_builddir}/src/libcode/vx_data2d_nc_pinterp \
-L${top_builddir}/src/libcode/vx_data2d_python \
-L${top_builddir}/src/libcode/vx_data2d_ugrid \
-L${top_builddir}/src/libcode/vx_python3_utils \
-L${top_builddir}/src/libcode/vx_geodesy \
-L${top_builddir}/src/libcode/vx_gis \
Expand Down
14 changes: 12 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ FFLAGS = @FFLAGS@
FLIBS = @FLIBS@
GREP = @GREP@
GRIB2CLIB_NAME = @GRIB2CLIB_NAME@
GRIB2_LIBS = @GRIB2_LIBS@
GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@
GRIB2_MET_LIBS = @GRIB2_MET_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Expand All @@ -248,11 +249,17 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MET_ATLAS = @MET_ATLAS@
MET_ATLASINC = @MET_ATLASINC@
MET_ATLASLIB = @MET_ATLASLIB@
MET_BUFR = @MET_BUFR@
MET_BUFRLIB = @MET_BUFRLIB@
MET_CAIRO = @MET_CAIRO@
MET_CAIROINC = @MET_CAIROINC@
MET_CAIROLIB = @MET_CAIROLIB@
MET_ECKIT = @MET_ECKIT@
MET_ECKITINC = @MET_ECKITINC@
MET_ECKITLIB = @MET_ECKITLIB@
MET_FREETYPE = @MET_FREETYPE@
MET_FREETYPEINC = @MET_FREETYPEINC@
MET_FREETYPELIB = @MET_FREETYPELIB@
Expand Down Expand Up @@ -291,11 +298,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@
PYTHON_MET_LIBS = @PYTHON_MET_LIBS@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
UGRID_DEP_LIBS = @UGRID_DEP_LIBS@
UGRID_MET_LIBS = @UGRID_MET_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
Expand Down
6 changes: 3 additions & 3 deletions compile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

scriptversion=2018-03-07.03; # UTC

# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -53,7 +53,7 @@ func_file_conv ()
MINGW*)
file_conv=mingw
;;
CYGWIN*)
CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
Expand All @@ -67,7 +67,7 @@ func_file_conv ()
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
Expand Down
Loading
Loading