Commit 4ce1f031 authored by Knut's avatar Knut

Merge branch 'coriolis' into curvilinear

parents 664322e3 7500983b
......@@ -171,8 +171,10 @@ STDERR 'adaptive_coordinates()'
if (rc /= 0) stop 'coordinates: Error allocating memory (zposo)'
allocate(work2(I3DFIELD),stat=rc) !
if (rc /= 0) stop 'coordinates: Error allocating memory (work2)'
work2 = _ZERO_
allocate(work3(I3DFIELD),stat=rc) !
if (rc /= 0) stop 'coordinates: Error allocating memory (work3)'
work3 = _ZERO_
allocate(be(0:kmax),stat=rc) ! working space
if (rc /= 0) STOP 'coordinates: Error allocating (be)'
allocate(NNloc(0:kmax),stat=rc) ! working space
......
......@@ -217,9 +217,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
......
......@@ -156,7 +156,7 @@
call fm%register_dimension(trim(yname),jmax-jmin+1,global_length=jextr,offset=joff,id=id_dim_lat)
#ifndef NO_3D
if (runtype .ge. 2) then
call fm%register_dimension(trim(zname),kmax+1,id=id_dim_z)
call fm%register_dimension(trim(zname),kmax+1,global_length=kmax,offset=-1,id=id_dim_z)
end if
#endif
......
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