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

src/3d/variables_3d.F90

@@ -217,6 +217,10 @@
    idpdy=_ZERO_
 #endif
 
+!  must be nonzero for gotm_fabm in case of calc_temp=F
+   g1 = -9999*_ONE_
+   g2 = -9999*_ONE_
+
 #ifdef DEBUG
    write(debug,*) 'Leaving init_variables_3d()'
    write(debug,*)

src/getm/initialise.F90

@@ -206,7 +206,10 @@
 
    STDERR LINE
    STDERR 'getm: Started on  ',dstr,' ',tstr
-   STDERR LINE
+
+   call print_version()
+   call compilation_options()
+
    STDERR 'Initialising....'
    STDERR LINE
    LEVEL1 'the run id is: ',trim(runid)

src/getm/main.F90

@@ -48,8 +48,6 @@
 !-----------------------------------------------------------------------
 !BOC
    call cmdline
-   call print_version()
-   call compilation_options()
 
 #ifdef FORTRAN95
    call CPU_Time(t1)
@@ -110,7 +108,7 @@
    LEVEL1 'under the General Public License (GPL) - http://www.gnu.org '
    STDERR LINE
 
-   call compilation_options
+   !call compilation_options
 
    end program getm
 
@@ -266,6 +264,9 @@
 #ifdef MIN_VEL_DEPTH
    LEVEL1 'MIN_VEL_DEPTH'
 #endif
+#ifdef MUDFLAT
+   LEVEL1 'MUDFLAT'
+#endif
 #ifdef NEW_SS
    LEVEL1 'NEW_SS'
 #endif