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

Bugfix #2106 develop gcc #2135

Merged
merged 4 commits into from
Apr 11, 2022
Merged

Bugfix #2106 develop gcc #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbceb95
Per #2106, port the bugfix for this over from main_v10.1 to the devel…
JohnHalleyGotway Apr 9, 2022
e1dd076
Per #2106, fix the location of hdfeos library.
JohnHalleyGotway Apr 11, 2022
8712ee2
Update develop-ref after #2133 (#2137)
JohnHalleyGotway Apr 11, 2022
f7818f9
Merge remote-tracking branch 'origin/develop' into bugfix_2106_develo…
JohnHalleyGotway Apr 11, 2022
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
9 changes: 4 additions & 5 deletions met/src/basic/vx_util/data_plane_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ using namespace std;

#include "GridTemplate.h"


////////////////////////////////////////////////////////////////////////
//
// Utility functions operating on a DataPlane
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{

Expand Down
2 changes: 1 addition & 1 deletion met/src/basic/vx_util/data_plane_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion met/src/tools/other/plot_point_obs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

44 changes: 44 additions & 0 deletions scripts/environment/development.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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