Merge branch 'hvel' into save_fluxes

doc/getm_pub.bib

@@ -25,26 +25,6 @@
    Doi     = {10.1007/s10236-015-0914-y},
 }
 
-@article{graewe_etal_accepted,
-   author  = {Gr\"awe, Ulf and Burchard, Hans and Naumann, M. and Mohrholz, Volker},
-   title   = {Anatomizing one of the largest saltwater inflows in the Baltic Sea in December 2014},
-   journal = JGR,
-   volume  = {},
-   pages   = {},
-   year    = {2015},
-   note    = {accepted},
-}
-
-@article{burchard_and_badewien_accepted,
-   author  = {Burchard, Hans and Badewien, T. H.},
-   title   = {Thermohaline residual circulation of the Wadden Sea},
-   journal = {Ocean Dynamics},
-   volume  = {},
-   pages   = {},
-   year    = {2015},
-   note    = {accepted},
-}
-
 @Article{schwemmer_etal_2016,
    Author  = {Schwemmer, P. and G\"upner, F. and Adler, S. and Klingbeil, K. and Garthe, S.},
    Title   = {{Modelling small-scale foraging habitat use in breeding Eurasian oystercatchers (\textit{Haematopus ostralegus}) in relation to prey distribution and environmental predictors}},
@@ -57,6 +37,97 @@
    Url     = {http://dx.doi.org/10.1016/j.ecolmodel.2015.10.023},
 }
 
+@article{burchard_and_badewien_2015,
+   author  = {Burchard, Hans and Badewien, T. H.},
+   title   = {{Thermohaline residual circulation of the Wadden Sea}},
+   journal = {Ocean Dynamics},
+   volume  = {65},
+   pages   = {1717--1730},
+   year    = {2015},
+   Doi     = {10.1007/s10236-015-0895-x}
+}
+
+@article{duran_and_gerkema_2015,
+   author  = {Duran-Matute, Matias and Gerkema, Theo},
+   title   = {Calculating residual flows through a multiple-inlet system: the conundrum of the tidal period},
+   journal = {Ocean Dynamics},
+   volume  = {65},
+   pages   = {1461--1475},
+   year    = {2015},
+   publisher = {Springer},
+   doi     = {10.1007/s10236-015-0875-1},
+}
+
+@article{graewe_etal_2015b,
+   author  = {Gr\"awe, Ulf and Burchard, Hans and Naumann, M. and Mohrholz, Volker},
+   title   = {{Anatomizing one of the largest saltwater inflows into the Baltic Sea in December 2014}},
+   journal = {Journal of Geophysical Research: Oceans},
+   volume  = {120},
+   pages   = {7676--7697},
+   year    = {2015},
+   Doi     = {10.1002/2015JC011269}
+}
+
+@article{graewe_etal_2015,
+   author  = {Ulf Gr{\"a}we and Peter Holtermann and Knut Klingbeil and Hans Burchard},
+   title   = {Advantages of vertically adaptive coordinates in numerical models of stratified shelf seas},
+   journal = {Ocean Modelling},
+   volume  = {92},
+   pages   = {56--68},
+   year    = {2015},
+   doi     = {10.1016/j.ocemod.2015.05.008},
+}
+
+@article{hetzel_etal_2015,
+   author  = {Yasha Hetzel and Charitha Pattiaratchi and Ryan Lowe and Richard Hofmeister},
+   title   = {Wind and tidal mixing controls on stratification and dense water outflows in a large hypersaline bay},
+   journal = {Journal of Geophysical Research: Oceans},
+   volume  = {120},
+   pages   = {6034--6056},
+   year    = {2015},
+   Doi     = {10.1002/2015JC010733},
+}
+
+@article{macias_etal_2015,
+   author  = {Diego Macias and Elisa Garcia-Gorriz and Adolf Stips},
+   title   = {Productivity changes in the Mediterranean Sea for the twenty-first 
+              century in response to changes in the regional atmospheric forcing.
+             },
+   journal = {Frontiers in Marine Science},
+   volume  = {2}, 
+   year    = {2015},
+   doi     = {10.3389/fmars.2015.00079},
+}
+
+@article{mohammadi_etal_2015,
+   author  = {Mahdi Mohammadi-Aragh and Knut Klingbeil and Nils Br{\"u}ggemann and Carsten Eden and Hans Burchard},
+   title   = {The impact of advection schemes on lateral shear and baroclinic instabilities},
+   journal = {Ocean Modelling},
+   volume  = {94},
+   pages   = {112--127},
+   year    = {2015},
+   doi     = {10.1016/j.ocemod.2015.07.021},
+}
+
+@article{mohrholz_etal_2015,
+   author  = {V. Mohrholz and M. Naumann and G. Nausch and S. Kr{\"u}ger and U. Gr{\"a}we},
+   title   = {Fresh oxygen for the Baltic Sea --- An exceptional saline inflow after a decade of stagnation},
+   journal = {Journal of Marine Systems},
+   volume  = {148},
+   pages   = {152--166},
+   year    = {2015},
+   doi     = {10.1016/j.jmarsys.2015.03.005},
+}
+
+@article{purkiani_etal_2015,
+   author  = {K. Purkiani and J. Becherer and G. Fl\"osser and U. Gr{\"a}we and V. Mohrholz and H. M. Schuttelaars and H. Burchard},
+   title   = {Numerical analysis of stratification and de-stratification processes in a tidally energetic inlet with an ebb tidal delta},
+   journal = {Journal of Geophysical Research: Oceans},
+   volume  = {120},
+   pages   = {225--243},
+   year    = {2015},
+   doi     = {10.1002/2014JC010325},
+}
 
 @article{sassi_etal_2015,
    author   = {Sassi, M. G. and Duran-Matute, Matias and van Kessel, T. and Gerkema, Theo},
@@ -68,15 +139,14 @@
    doi      = {10.1007/s10236-015-0866-2}
 }
 
-@article{duran_and_gerkema_2015,
-   author  = {Duran-Matute, Matias and Gerkema, Theo},
-   title   = {Calculating residual flows through a multiple-inlet system: the conundrum of the tidal period},
-   journal = {Ocean Dynamics},
-   volume  = {65},
-   pages   = {1461--1475},
+@article{schulz_etal_2015,
+   author  = {E. Schulz and H. M. Schuttelaars and U. Gr{\"a}we and H. Burchard},
+   title   = {Impact of the depth-to-width ratio of a tidally energetic estuary on the residual along-channel circulation},
+   journal = JPO,
+   volume  = {45},
+   pages   = {2048--2069},
    year    = {2015},
-   publisher = {Springer},
-   doi     = {10.1007/s10236-015-0875-1},
+   doi     = {10.1175/JPO-D-14-0084.1},
 }
 
 @article{tett_etal_2013,
@@ -119,26 +189,6 @@
    year    = {2014},
 }
 
-@article{mohrholz_etal_2015,
-   author  = {V. Mohrholz and M. Naumann and G. Nausch and S. Kr{\"u}ger and U. Gr{\"a}we},
-   title   = {Fresh oxygen for the Baltic Sea — An exceptional saline inflow after a decade of stagnation},
-   journal = {Journal of Marine Systems},
-   volume  = {148},
-   pages   = {152--166},
-   year    = {2015},
-   doi     = {10.1016/j.jmarsys.2015.03.005},
-}
-
-@article{schulz_etal_2015,
-   author  = {E. Schulz and H. M. Schuttelaars and U. Gr{\"a}we and H. Burchard},
-   title   = {Impact of the depth-to-width ratio of a tidally energetic estuary on the residual along-channel circulation},
-   journal = JPO,
-   volume  = {45},
-   pages   = {2048--2069},
-   year    = {2015},
-   doi     = {10.1175/JPO-D-14-0084.1},
-}
-
 @article{burchard_etal_2014a,
    author  = {H. Burchard and E. Schulz and H. M. Schuttelaars},
    title   = {Impact of estuarine convergence on residual circulation in tidally energetic estuaries and inlets},
@@ -149,48 +199,6 @@
    doi     = {10.1002/2013GL058494},
 }
 
-@article{purkiani_etal_2015,
-   author  = {K. Purkiani and J. Becherer and G. Fl\"osser and U. Gr{\"a}we and V. Mohrholz and H. M. Schuttelaars and H. Burchard},
-   title   = {Numerical analysis of stratification and de-stratification processes in a tidally energetic inlet with an ebb tidal delta},
-   journal = {Journal of Geophysical Research: Oceans},
-   volume  = {120},
-   pages   = {225--243},
-   year    = {2015},
-   doi     = {10.1002/2014JC010325},
-}
-
-@article{mohammadi_etal_2015,
-   author  = {Mahdi Mohammadi-Aragh and Knut Klingbeil and Nils Br{\"u}ggemann and Carsten Eden and Hans Burchard},
-   title   = {The impact of advection schemes on lateral shear and baroclinic instabilities},
-   journal = {Ocean Modelling},
-   volume  = {94},
-   pages   = {112--127},
-   year    = {2015},
-   doi     = {10.1016/j.ocemod.2015.07.021},
-}
-
-@article{graewe_etal_2015,
-   author  = {Ulf Gr{\"a}we and Peter Holtermann and Knut Klingbeil and Hans Burchard},
-   title   = {Advantages of vertically adaptive coordinates in numerical models of stratified shelf seas},
-   journal = {Ocean Modelling},
-   volume  = {92},
-   pages   = {56--68},
-   year    = {2015},
-   doi     = {10.1016/j.ocemod.2015.05.008},
-}
-
-@article{macias_etal_2015,
-   author  = {Diego Macias and Elisa Garcia-Gorriz and Adolf Stips},
-   title   = {Productivity changes in the Mediterranean Sea for the twenty-first 
-              century in response to changes in the regional atmospheric forcing.
-             },
-   journal = {Frontiers in Marine Science},
-   year    = {2015},
-   doi     = {10.3389/fmars.2015.00079},
-}
-%   volume  = {10}, 
-%   pages   = {897--907}, 
-
 @article{lessing_etal_2014b,
    author  = {Gennadi Lessin and Urmas Raudsepp and Ilja Maljutenkoa and
               Jaan Laanemetsa and Jelena Passenkoa and Andres Jaanusc},

doc/make_pub_list

@@ -3,6 +3,7 @@
 #bibtex2html -s siam -r -d getm_pub.bib 
 bibtex2html -nodoc -noheader -s ieeetr -r -d getm_pub.bib 
 #bibtex2html -nodoc -noheader -s ieeetr -a getm_pub.bib 
-scp getm_pub.html getm_pub_bib.html  getm.eu:/srv/www/htdocs/doc/
+scp getm_pub.html getm.eu:/srv/www/htdocs/doc/
+scp getm_pub_bib.html  getm.eu:/srv/www/htdocs/
 rm getm_pub.html getm_pub_bib.html
 

getm_configure.sh

@@ -5,7 +5,7 @@ GETM_BASE=${GETM_BASE:=~/GETM/code}
 GOTM_BASE=${GOTM_BASE:=~/GOTM/code}
 FABM_BASE=${FABM_BASE:=~/FABM/code}
 
-# default Fortran compiler is gfortran - overide by setting compuiler like:
+# default Fortran compiler is gfortran - overide by setting compiler like:
 # export compiler=ifort
 compiler=${compiler:=gfortran}
 
@@ -15,6 +15,12 @@ compiler=${compiler:=gfortran}
 # export coordinates=Spherical
 coordinate=${coordinate:=Cartesian}
 
+# configurable installation prefix
+# override by e.g.:
+# export install_prefix=/tmp
+# note that $compiler will be appended
+install_prefix=${install_prefix:=~/local/getm}
+
 # NetCDF
 # nf-config must be in the path and correpsond to the value of compiler
 # try:
@@ -24,11 +30,12 @@ coordinate=${coordinate:=Cartesian}
 mkdir -p $compiler
 cd $compiler
 cmake $GETM_BASE/src \
+      -DGETM_EMBED_VERSION=on \
       -DGOTM_BASE=$GOTM_BASE \
       -DGETM_USE_FABM=on \
       -DFABM_BASE=$FABM_BASE/ \
       -DCMAKE_Fortran_COMPILER=$compiler \
       -DGETM_USE_PARALLEL=off \
       -DGETM_COORDINATE_TYPE=$coordinate \
-      -DCMAKE_INSTALL_PREFIX=~/local/getm/$compiler
+      -DCMAKE_INSTALL_PREFIX=$install_prefix/$compiler
 cd ..

include/cppdefs.h

@@ -3,10 +3,6 @@
 ! in a correct format.
 ! KBK 990615
 
-#include "version.h"
-#include "git_revision.h"
-#include "fortran_version.h"
-
 #define DXC dxc(i,j)
 #define DXCIP1 dxc(i+1,j)
 #define DXCIM1 dxc(i-1,j)

include/fortran_version.h.in

-#define FORTRAN_VERSION "${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}"

include/git_revision.h.in

-#define GIT_REVISION "${GIT_REVISION}"

include/version.h.in

-#define RELEASE "${getm_VERSION}"

src/2d/bottom_friction.F90

@@ -123,7 +123,7 @@
 
 !$OMP DO SCHEDULE(RUNTIME)
    do j=jmin-HALO,jmax+HALO
-      do i=imin-HALO,imax+HALO
+      do i=imin-HALO,imax+HALO-1
          if (au(i,j) .gt. 0) then
             uloc(i,j) = U(i,j)/DU(i,j)
             HH(i,j)=max(min_depth,DU(i,j))
@@ -149,7 +149,7 @@
    if (runtype .eq. 1) then
 !$OMP DO SCHEDULE(RUNTIME)
       do j=jmin-HALO,jmax+HALO
-         do i=imin-HALO,imax+HALO
+         do i=imin-HALO,imax+HALO-1
             if (au(i,j) .gt. 0) then
                fricvel(i,j)=sqrt(ruu(i,j)*(uloc(i,j)**2+vloc(i,j)**2))
                zub(i,j)=min(HH(i,j),zub0(i,j)+_TENTH_*avmmol/max(avmmol,fricvel(i,j)))
@@ -163,7 +163,7 @@
    else
 !$OMP DO SCHEDULE(RUNTIME)
       do j=jmin-HALO,jmax+HALO
-         do i=imin-HALO,imax+HALO
+         do i=imin-HALO,imax+HALO-1
             if (au(i,j) .gt. 0) then
                ru(i,j)=ruu(i,j)*sqrt(uloc(i,j)**2+vloc(i,j)**2)
             end if
@@ -189,7 +189,7 @@
 !$OMP END DO NOWAIT
 
 !$OMP DO SCHEDULE(RUNTIME)
-   do j=jmin-HALO,jmax+HALO
+   do j=jmin-HALO,jmax+HALO-1
       do i=imin-HALO,imax+HALO
          if (av(i,j) .gt. 0) then
             vloc(i,j)=V(i,j)/DV(i,j)
@@ -215,7 +215,7 @@
 
    if (runtype .eq. 1) then
 !$OMP DO SCHEDULE(RUNTIME)
-      do j=jmin-HALO,jmax+HALO
+      do j=jmin-HALO,jmax+HALO-1
          do i=imin-HALO,imax+HALO
             if (av(i,j) .gt. 0) then
                fricvel(i,j)=sqrt(rvv(i,j)*(uloc(i,j)**2+vloc(i,j)**2))
@@ -229,7 +229,7 @@
 !$OMP END DO
    else
 !$OMP DO SCHEDULE(RUNTIME)
-      do j=jmin-HALO,jmax+HALO
+      do j=jmin-HALO,jmax+HALO-1
          do i=imin-HALO,imax+HALO
             if (av(i,j) .gt. 0) then
                rv(i,j)=rvv(i,j)*sqrt(uloc(i,j)**2+vloc(i,j)**2)

src/2d/depth_update.F90

@@ -63,10 +63,12 @@
 !$OMP DO SCHEDULE(RUNTIME)
    do j=jmin-HALO,jmax+HALO
       do i=imin-HALO,imax+HALO
+         if (az(i,j) .gt. 0) then
          ! TODO/BJB: Is it enough to do this on az?
          D(i,j) = z(i,j)+H(i,j)
          zvel(i,j) = _HALF_ * ( zo(i,j) + z(i,j) )
          Dvel(i,j) = zvel(i,j) + H(i,j)
+         end if
       end do
    end do
 !$OMP END DO

src/2d/m2d.F90

@@ -189,7 +189,7 @@
       select case (elev_method)
          case(1)
             LEVEL2 'setting initial surface elevation to ',real(elev_const)
-            z = elev_const
+            where ( az.gt.0 ) z = elev_const
          case(2)
             LEVEL2 'getting initial surface elevation from ',trim(elev_file)
             call get_2d_field(trim(elev_file),"elev",ilg,ihg,jlg,jhg,.true.,z(ill:ihl,jll:jhl))
@@ -200,7 +200,7 @@
             stop 'init_2d(): invalid elev_method'
       end select
 
-      where ( z .lt. -H+min_depth)
+      where ( az.gt.0 .and. z.lt.-H+min_depth)
          z = -H+min_depth
       end where
       zo = z
@@ -403,8 +403,8 @@
          end where
 !        This is probably not absolutely necessary:
          where (az .eq. 0)
-            z  = _ZERO_
-            zo = _ZERO_
+            z  = -9999.
+            zo = -9999.
          end where
       end if
 

src/2d/variables_2d.F90

@@ -118,7 +118,7 @@
    break_stat = 0
 #endif
 
-   z  = _ZERO_; zo =_ZERO_
+   z  = -9999.0; zo =_ZERO_
 
    zub=_ZERO_ ; zub0=_ZERO_
    zvb=_ZERO_ ; zvb0=_ZERO_

src/3d/getm_fabm.F90

@@ -292,10 +292,24 @@ end interface
 
 !     Update halos with biogeochemical variable values (distribute initial values).
       do n=1,size(model%state_variables)
+         fabm_pel(:,:,0,n) = model%state_variables(n)%missing_value
+         forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) &
+            fabm_pel(i,j,:,n) = model%state_variables(n)%missing_value
          call update_3d_halo(fabm_pel(:,:,:,n),fabm_pel(:,:,:,n),az, &
                              imin,jmin,imax,jmax,kmax,D_TAG)
          call wait_halo(D_TAG)
       end do
+      do n=1,size(model%bottom_state_variables)
+         where ( az.eq.0 ) fabm_ben(:,:,n) = model%bottom_state_variables(n)%missing_value
+      end do
+      do n=1,size(model%diagnostic_variables)
+         fabm_diag(:,:,0,n) = model%diagnostic_variables(n)%missing_value
+         forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) &
+            fabm_diag(i,j,:,n) = model%diagnostic_variables(n)%missing_value
+      end do
+      do n=1,size(model%horizontal_diagnostic_variables)
+         where ( az.eq.0 ) fabm_diag_hz(:,:,n) = model%horizontal_diagnostic_variables(n)%missing_value
+      end do
 
 #ifdef DEBUG
    write(debug,*) 'Leaving init_getm_fabm_fields()'

src/3d/salinity.F90

@@ -198,6 +198,9 @@
          stop 'init_salinity'
    end select
 
+   S(:,:,0) = -9999.0
+   forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) S(i,j,:) = -9999.0
+
    call update_3d_halo(S,S,az,imin,jmin,imax,jmax,kmax,D_TAG)
    call wait_halo(D_TAG)
    call mirror_bdy_3d(S,D_TAG)

src/3d/temperature.F90

@@ -275,6 +275,9 @@ end interface
          stop 'init_temperature'
    end select
 
+   T(:,:,0) = -9999.0
+   forall(i=imin:imax,j=jmin:jmax, az(i,j).eq.0) T(i,j,:) = -9999.0
+
    call update_3d_halo(T,T,az,imin,jmin,imax,jmax,kmax,D_TAG)
    call wait_halo(D_TAG)
    call mirror_bdy_3d(T,D_TAG)

src/CMakeLists.txt

@@ -15,26 +15,23 @@ if(GETM_FLAGS)
    add_definitions(${GETM_FLAGS})
 endif(GETM_FLAGS)
 
-find_package(Git)
-if(GIT_FOUND)
-  #add_custom_command(OUTPUT git_revision.h
-  #                   COMMAND ${GIT_EXECUTABLE} log -1 "--format=#define GIT_REVISION \"%H\"" > ${CMAKE_CURRENT_BINARY_DIR}/git_revision.h
-  #                   DEPENDS SOME_GIT_FILE
-  #                   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-  #                   VERBATIM
-  #                  )
-  execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%H
-                  OUTPUT_VARIABLE GIT_REVISION
-                  OUTPUT_STRIP_TRAILING_WHITESPACE
-                  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-else()
-  set(GIT_REVISION "unknown")
+set(GIT_COMMIT_ID ${getm_VERSION})
+configure_file("${PROJECT_SOURCE_DIR}/futils/getm_version.F90.in" getm_version.F90)
+option(GETM_EMBED_VERSION "Embed GETM version information" OFF)
+if(GETM_EMBED_VERSION)
+  add_custom_target(getm_version
+    ${CMAKE_COMMAND} -DINFILE=${PROJECT_SOURCE_DIR}/futils/getm_version.F90.in -DOUTFILE=${CMAKE_BINARY_DIR}/getm_version.F90 -P "${PROJECT_SOURCE_DIR}/cmake/Modules/GetGitInfo.cmake"
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    COMMENT "Retrieving description of last GETM commit..."
+    SOURCES ${PROJECT_SOURCE_DIR}/futils/getm_version.F90.in "${PROJECT_SOURCE_DIR}/cmake/Modules/GetGitInfo.cmake"
+    VERBATIM
+  )
 endif()
 
 # Generate include file with version information.
-configure_file(../include/version.h.in version.h)
-configure_file(../include/fortran_version.h.in fortran_version.h)
-configure_file(../include/git_revision.h.in git_revision.h)
+#configure_file(../include/version.h.in version.h)
+#configure_file(../include/fortran_version.h.in fortran_version.h)
+#configure_file(../include/git_revision.h.in git_revision.h)
 
 # Use solution folders in IDEs
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -78,6 +75,8 @@ option(GETM_USE_FABM "Include support for Framework for Aquatic Biogeochemical M
 if(GETM_USE_FABM)
    add_definitions(-D_FABM_)
    set (GETM_FABM 3d/getm_fabm.F90)
+   set(FABM_EMBED_VERSION ${GETM_EMBED_VERSION} CACHE BOOL "Embed FABM version information" FORCE)
+
 endif(GETM_USE_FABM)
 
 include(CMakeDependentOption)
@@ -284,13 +283,18 @@ add_library(futils OBJECT
             futils/to_w.F90
             futils/tridiagonal.F90
             futils/ver_interpol.F90
+            ${CMAKE_BINARY_DIR}/getm_version.F90
            )
+if(GETM_EMBED_VERSION)
+  add_dependencies(futils getm_version)
+endif()
 
 add_library(getm OBJECT
             getm/cleanup.F90
             getm/initialise.F90
             getm/integration.F90
             getm/register_all_variables.F90
+            getm/print_version.F90
            )
 
 add_library(input OBJECT
@@ -381,6 +385,7 @@ set_property(TARGET futils ncdf input APPEND PROPERTY INCLUDE_DIRECTORIES "${Net
 add_definitions(-DNETCDF_FMT -DREAL_4B=real\(4\))
 
 # Use GOTM_PREFIX to locate include and lib directories
+set(GOTM_EMBED_VERSION ${GETM_EMBED_VERSION} CACHE BOOL "Embed GOTM version information" FORCE)
 find_path(GOTM_BASE src/gotm/gotm.F90 DOC "Path to GOTM source directory.")
 if(GOTM_BASE)
   set(GOTM_BUILD_LIBRARIES_ONLY ON)
@@ -394,7 +399,7 @@ if(GOTM_BASE)
   endif()
   if(GETM_USE_FABM)
     set(GOTM_LIBRARIES ${GOTM_LIBRARIES} gotm_fabm)
-    set_property(TARGET 3d APPEND PROPERTY INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gotm_fabm,INTERFACE_INCLUDE_DIRECTORIES>)
+    set_property(TARGET 3d getm APPEND PROPERTY INCLUDE_DIRECTORIES $<TARGET_PROPERTY:gotm_fabm,INTERFACE_INCLUDE_DIRECTORIES>)
   endif()
   mark_as_advanced(GOTM_PREFIX GOTM_USE_FABM)
 #KB  add_dependencies(output ${GOTM_LIBRARIES})
@@ -405,7 +410,7 @@ else()
   # Use FABM_PREFIX to locate include and lib directories
   if(GETM_USE_FABM)
     find_package(FABM REQUIRED)
-    set_property(TARGET 3d APPEND PROPERTY INCLUDE_DIRECTORIES "${FABM_INCLUDE_DIRS}")
+    set_property(TARGET 3d getm APPEND PROPERTY INCLUDE_DIRECTORIES "${FABM_INCLUDE_DIRS}")
   endif()
 endif()
 set_property(TARGET 2d APPEND PROPERTY INCLUDE_DIRECTORIES "${GOTM_INCLUDE_DIRS}")

src/cmake/Modules/GetGitInfo.cmake

+find_package(Git QUIET)
+if(GIT_FOUND)
+  message(STATUS "Git found")
+  execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --dirty
+                  OUTPUT_VARIABLE GIT_COMMIT_ID
+                  OUTPUT_STRIP_TRAILING_WHITESPACE
+                  ERROR_QUIET
+                 )
+  execute_process(COMMAND ${GIT_EXECUTABLE} name-rev --name-only HEAD
+                  OUTPUT_VARIABLE GIT_BRANCH_NAME
+                  OUTPUT_STRIP_TRAILING_WHITESPACE
+                  ERROR_QUIET
+                 )
+endif()
+message(STATUS "On branch ${GIT_BRANCH_NAME} with commit id ${GIT_COMMIT_ID}")
+configure_file("${INFILE}" "${OUTFILE}")

src/futils/Makefile

@@ -19,7 +19,9 @@ LIBSRC	= ver_interpol.F90 kbk_interpol.F90 tridiagonal.F90 pos.F90 \
 
 SRC	= $(MODSRC) $(LIBSRC)
 
-MOD = ${LIB}(getm_timers.o)
+MOD = \
+${LIB}(getm_version.o) \
+${LIB}(getm_timers.o)
 ifeq ($(GETM_PARALLEL),true)
 MOD += \
 ${LIB}(halo_mpi.o)	\

src/futils/getm_version.F90

+module getm_version
+   character(len=*),parameter :: git_commit_id = "2.5.0"
+   character(len=*),parameter :: git_branch_name = "master"
+end module

src/futils/getm_version.F90.in

+module getm_version
+   character(len=*),parameter :: git_commit_id = "@GIT_COMMIT_ID@"
+   character(len=*),parameter :: git_branch_name = "@GIT_BRANCH_NAME@"
+end module

src/futils/time.F90

@@ -345,8 +345,6 @@
 !  22Nov Author name Initial code
 !
 ! !LOCAL VARIABLES:
-   character                 :: c1,c2,c3,c4
-   integer                   :: yy,mm,dd,hh,min,ss
    integer                   :: i
    character(len=3)          :: set='/:-'
 !EOP
@@ -357,13 +355,9 @@
       FATAL "Can't read valid time in: ", trim(str)
       stop 'string_to_julsecs'
    end if
-   read(str(i-4:),'(i4,a1,i2,a1,i2,1x,i2,a1,i2,a1,i2)')  &
-                          yy,c1,mm,c2,dd,hh,c3,min,c4,ss
-   call JulDay(yy,mm,dd,jul)
-   secs = 3600*hh + 60*min + ss
-#ifdef DEBUG_TIME
-   STDERR 'string_to_julsecs" ',yy,mm,dd,hh,min,ss
-#endif
+
+   call String2JulSecs(str(i-4:),jul,secs)
+
    return
    end subroutine string_to_julsecs
 !EOC
@@ -392,12 +386,17 @@
 ! !LOCAL VARIABLES:
    character                 :: c1,c2,c3,c4
    integer                   :: yy,mm,dd,hh,min,ss
+   integer                   :: rc
 !EOP
 !-----------------------------------------------------------------------
 !BOC
 
-   READ(timestr,'(i4,a1,i2,a1,i2,1x,i2,a1,i2,a1,i2)')  &
+   READ(timestr,'(i4,a1,i2,a1,i2,1x,i2,a1,i2,a1,i2)',iostat=rc)  &