Bugfix #2106 develop gcc (#2135)

Co-authored-by: Julie Prestopnik <[email protected]> Co-authored-by: johnhg <[email protected]> Co-authored-by: Seth Linden <[email protected]> Co-authored-by: John Halley Gotway <[email protected]> Co-authored-by: j-opatz <[email protected]> Co-authored-by: Howard Soh <[email protected]> Co-authored-by: John Halley Gotway <[email protected]> Co-authored-by: jprestop <[email protected]> Co-authored-by: Howard Soh <[email protected]> Co-authored-by: Randy Bullock <[email protected]> Co-authored-by: davidfillmore <[email protected]> Co-authored-by: rgbullock <[email protected]> Co-authored-by: Seth Linden <[email protected]> Co-authored-by: hsoh-u <[email protected]> Co-authored-by: George McCabe <[email protected]> Co-authored-by: John Halley Gotway <[email protected]> Co-authored-by: MET Tools Test Account <[email protected]> Co-authored-by: mo-mglover <[email protected]> Co-authored-by: davidalbo <[email protected]> Co-authored-by: lisagoodrich <[email protected]> Co-authored-by: Dan Adriaansen <[email protected]>
dtcenter · Apr 11, 2022 · cdcc01d · cdcc01d
1 parent 2e53ff7
commit cdcc01d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 7 deletions.
diff --git a/met/src/basic/vx_util/data_plane_util.cc b/met/src/basic/vx_util/data_plane_util.cc
@@ -30,7 +30,6 @@ using namespace std;
 
 #include "GridTemplate.h"
 
-
 ////////////////////////////////////////////////////////////////////////
 //
 // Utility functions operating on a DataPlane
@@ -206,7 +205,7 @@ DataPlane smooth_field(const DataPlane &dp,
 ////////////////////////////////////////////////////////////////////////
 
 void fractional_coverage(const DataPlane &dp, DataPlane &frac_dp,
-        int width, const GridTemplateFactory::GridTemplates shape,
+        int width, GridTemplateFactory::GridTemplates shape,
         bool wrap_lon, SingleThresh t,
         const DataPlane *cmn, const DataPlane *csd, double vld_t) {
    GridPoint *gp = NULL;
@@ -251,9 +250,9 @@ void fractional_coverage(const DataPlane &dp, DataPlane &frac_dp,
       }
    }
 
-#pragma omp parallel default(none)                 \
-   shared(mlog, dp, frac_dp, width, wrap_lon, t)   \
-   shared(use_climo, cmn, csd, vld_t, bad)         \
+#pragma omp parallel default(none)                      \
+   shared(mlog, dp, frac_dp, shape, width, wrap_lon, t) \
+   shared(use_climo, cmn, csd, vld_t, bad)              \
    private(x, y, n_vld, n_thr, gp, v)
    {
 

diff --git a/met/src/basic/vx_util/data_plane_util.h b/met/src/basic/vx_util/data_plane_util.h
@@ -51,7 +51,7 @@ extern DataPlane smooth_field(const DataPlane &dp,
                     bool wrap_lon, double t, const GaussianInfo &gaussian);
 
 extern void fractional_coverage(const DataPlane &dp, DataPlane &frac_dp,
-               int width, const GridTemplateFactory::GridTemplates shape,
+               int width, GridTemplateFactory::GridTemplates shape,
                bool wrap_lon, SingleThresh t,
                const DataPlane *cmn, const DataPlane *csd, double vld_t);
 

diff --git a/met/src/tools/other/plot_point_obs/Makefile.am b/met/src/tools/other/plot_point_obs/Makefile.am
@@ -44,7 +44,7 @@ plot_point_obs_LDADD = -lvx_statistics \
 	-lvx_cal \
 	-lvx_log \
 	$(PYTHON_LIBS) \
-	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
+	-lm -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
 EXTRA_DIST = plot_point_obs.h \
 	plot_point_obs_conf_info.h
 
diff --git a/scripts/environment/development.docker b/scripts/environment/development.docker
@@ -0,0 +1,44 @@
+# Define the development environment for NCAR project machine seneca
+# Based on settings in /usr/local/src/met/README.snat
+
+# Top-level MET project directory
+MET_PROJ_DIR=`ls -1d /met/MET*`
+
+# Variables required to build MET
+export MET_DEVELOPMENT=true
+
+export MET_NETCDF=/usr/local
+export MET_HDF5INC=/usr/include
+export MET_HDF5LIB=/usr/lib64
+export MET_HDF=/usr/local/hdf
+export MET_HDFEOS=/usr/local/hdfeos
+export MET_BUFR=/usr/local
+export MET_GRIB2CINC=/usr/include
+export MET_GRIB2CLIB=/usr/lib64
+export MET_GSLINC=/usr/include/gsl
+export MET_GSLLIB=/usr/lib64
+export MET_CAIROINC=/usr/include/cairo
+export MET_CAIROLIB=/usr/lib64 
+export MET_FREETYPEINC=/usr/include/freetype2
+export MET_FREETYPELIB=/usr/lib64
+export MET_JASPERLIB=/usr/lib64
+
+export MET_PYTHON=/usr/bin/python3
+export MET_PYTHON_CC="-I/usr/include/python3.6m -I/usr/include/python3.6m"
+export MET_PYTHON_LD="-L/usr/lib64 -lpython3.6m -lpthread -ldl -lutil -lm"
+
+# -D__64BIT__ is required because we've compiled libgrib2c.a with that flag
+export CFLAGS="-DUNDERSCORE -fPIC -D__64BIT__ -g"
+export CXXFLAGS=${CFLAGS}
+
+# Set LDFLAGS to include -rpath settings when compiling MET
+export LDFLAGS="-Wl,--disable-new-dtags"
+export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/local/lib:/usr/lib64:${MET_HDF}/lib:${MET_HDFEOS}/lib"
+
+# Variables required to run MET
+export MET_TEST_INPUT=${MET_PROJ_DIR}/MET_test_data/unit_test
+export MET_FONT_DIR=${MET_TEST_INPUT}/fonts
+
+# Define Rscript to use a version with the ncdf4 package 1.17 or later 
+export MET_TEST_RSCRIPT=/usr/bin/Rscript
+