Commit 8086f337 authored by Knut's avatar Knut

Merge remote-tracking branch 'origin/master' into output

parents d98c5100 e2d231d4
......@@ -216,9 +216,9 @@
if (bdy3d_tmrlx_min<_ZERO_ .or. bdy3d_tmrlx_min>_ONE_) &
call getm_error("init_3d()", &
"bdy3d_tmrlx_min is out of valid range [0:1]")
if (bdy3d_tmrlx_max<bdy3d_tmrlx_min .or. bdy3d_tmrlx_min>_ONE_) &
if (bdy3d_tmrlx_max<bdy3d_tmrlx_min .or. bdy3d_tmrlx_max>_ONE_) &
call getm_error("init_3d()", &
"bdy3d_tmrlx_max is out of valid range [bdy3d_tmrlx_max:1]")
"bdy3d_tmrlx_max is out of valid range [bdy3d_tmrlx_min:1]")
if (bdy3d_tmrlx_ucut<_ZERO_) &
call getm_error("init_3d()", &
"bdy3d_tmrlx_max is out of valid range [0:inf[")
......
......@@ -49,7 +49,7 @@ else()
set(flibs "-lnetcdf")
endif()
if(DEFINED ENV{NETCDFLIBDIR})
set(flibs "${flibs} -L$ENV{NETCDFLIBDIR}")
set(flibs "-L$ENV{NETCDFLIBDIR} ${flibs}")
endif()
set(NetCDF_LIBRARIES ${flibs} CACHE STRING "NetCDF linking flags")
find_path(NetCDF_INCLUDE_DIRS netcdf.mod
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment