Merge branch 'output' of git://git.code.sf.net/p/getm/code into fwf_int

src/3d/adaptive_coordinates.F90

@@ -175,8 +175,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

src/3d/m3d.F90

@@ -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[")

src/cmake/Modules/FindNetCDF.cmake

@@ -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

src/getm/register_all_variables.F90

@@ -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