Skip to content

Commit

Permalink
Feature 2231 unstructured grid (#2723)
Browse files Browse the repository at this point in the history
Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu>
Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: root <root@83062d57c5dd>
  • Loading branch information
4 people authored Nov 17, 2023
1 parent 3dab2dd commit 9c33f83
Show file tree
Hide file tree
Showing 253 changed files with 11,242 additions and 2,909 deletions.
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

0 comments on commit 9c33f83

Please sign in to comment.