Make HZG a default institute

src/CMakeLists.txt

@@ -16,6 +16,7 @@ set(DEFAULT_INSTITUTES
     bb           # Bolding & Bruggeman - formerly Bolding & Burchard
     examples     # Examples supplied with FABM itself
     gotm         # Models ported from original GOTM/BIO library
+    hzg          # Helmholtz-Zentrum Geesthacht, Germany
     jrc          # EC - Joint Research Centre - Ispra, Italy
     pclake       # The PCLake model - reference implementation
     pml          # Plymouth Marine Laboratory, United Kingdom
@@ -29,7 +30,6 @@ set(DEFAULT_INSTITUTES
 # this wiki and add your institute to the above FABM_INSTITUTES instead.
 set(FABM_INSTITUTES_OLD
     aed          # Aquatic Eco Dynamics, University of Western Australia
-    hzg          # Helmholtz-Zentrum Geesthacht, Germany
     iow          # Leibniz Institute for Baltic Sea Research, Germany
     klimacampus  # KlimaCampus Hamburg, Germany
     metu         # Middle East Technical University, Turkey

src/drivers/mossco/fabm_driver.h

 #define _FABM_DIMENSION_COUNT_ 3
 #define _FABM_DEPTH_DIMENSION_INDEX_ 3
+#define _FABM_VECTORIZED_DIMENSION_INDEX_ 1
 
-! Include FABM preprocessor definitions.
-! This *must* be done after the host-specific variables are defined (above),
-! because these are used in fabm.h.
-#include "fabm.h"
-
-! Taken from the General Ocean Turbulence Model:
-
-#define PATH_MAX	255
+#define _FABM_MASK_TYPE_ logical
+#define _FABM_UNMASKED_VALUE_ .false.
+#define _FABM_IS_UNMASKED_(maskvalue) maskvalue
 
-#define stderr		0
-#define stdout		6
+#define _FABM_VERTICAL_BOTTOM_TO_SURFACE_
+#define _FABM_BOTTOM_INDEX_ 0
 
-#define STDOUT write(stdout,*)
-#define STDERR write(stderr,*)
-#define LEVEL0 STDERR
-#define LEVEL1 STDERR '   ',
-#define LEVEL2 STDERR '       ',
-#define LEVEL3 STDERR '           ',
-#define LEVEL4 STDERR '               ',
-#define FATAL  STDERR 'FATAL ERROR: ',
-
-#define LINE "------------------------------------------------------------------------"
+#include "fabm.h"

src/fabm_library.F90.in

@@ -22,7 +22,6 @@
    use aed_models
    use fabm_metu_mnemiopsis
    use fabm_klimacampus_phy_feedback
-   use fabm_hzg_omexdia_p
    use fabm_msi_ergom1
    use iow_model_library
 
@@ -85,7 +84,6 @@ contains
       select case (name)
          case ('metu_mnemiopsis');           allocate(type_metu_mnemiopsis::model)
          case ('klimacampus_phy_feedback');  allocate(type_klimacampus_phy_feedback::model)
-         case ('hzg_omexdia_p');             allocate(type_hzg_omexdia_p::model)
          case ('msi_ergom1');                allocate(type_msi_ergom1::model)
          case default
             call self%type_base_model_factory%create(name,model)