updating DVM module names to include ersem for FABM-PLUS

src/dvm_move.F90

@@ -11,7 +11,7 @@
 ! https://github.com/nansencenter/nersc
 ! -----------------------------------------------------------------------------
 
-module dvm_move
+module ersem_dvm_move
 
 use fabm_types
 use fabm_expressions
@@ -20,9 +20,9 @@ module dvm_move
 
 private 
 
-public type_move
+public type_ersem_dvm_move
 
-type, extends(type_base_model) :: type_move
+type, extends(type_base_model) :: type_ersem_dvm_move
     type (type_dependency_id)          :: id_weights
     type (type_dependency_id)          :: id_thickness
     type (type_state_variable_id)      :: id_target
@@ -39,7 +39,7 @@ module dvm_move
 
     subroutine initialize(self, configunit)
 
-        class (type_move), intent(inout), target :: self
+        class (type_ersem_dvm_move), intent(inout), target :: self
         integer,         intent(in)            :: configunit
 
         call self%register_state_dependency(self%id_target, 'target', '', 'variable to apply sources and sinks to')
@@ -54,7 +54,7 @@ subroutine initialize(self, configunit)
     end subroutine initialize
 
     subroutine do(self,_ARGUMENTS_DO_)
-       class (type_move), intent(in) :: self
+       class (type_ersem_dvm_move), intent(in) :: self
        _DECLARE_ARGUMENTS_DO_
 
         real(rk) :: integral_weights, weights, integral

src/dvm_upper_lower_boundaries.F90

@@ -11,7 +11,7 @@
 ! https://github.com/nansencenter/nersc
 ! -----------------------------------------------------------------------------
 
-module dvm_upper_lower_boundaries
+module ersem_dvm_upper_lower_boundaries
 
 use fabm_types
 use fabm_expressions
@@ -20,7 +20,7 @@ module dvm_upper_lower_boundaries
 
 private 
 
-type, extends(type_base_model), public :: type_upper_lower_boundaries
+type, extends(type_base_model), public :: type_ersem_dvm_upper_lower_boundaries
 
     type (type_dependency_id)                       :: id_par, id_parmean, id_depth 
     type (type_surface_dependency_id)               :: id_par0
@@ -41,7 +41,7 @@ module dvm_upper_lower_boundaries
 contains
 
     subroutine initialize(self, configunit)
-        class (type_upper_lower_boundaries), intent(inout), target :: self
+        class (type_ersem_dvm_upper_lower_boundaries), intent(inout), target :: self
         integer, intent(in)                                               :: configunit
         integer                                                           :: iprey
         character(len=16)                                                 :: index
@@ -70,7 +70,7 @@ end subroutine initialize
 
     subroutine do(self, _ARGUMENTS_DO_)
 
-        class (type_upper_lower_boundaries), intent(in) :: self
+        class (type_ersem_dvm_upper_lower_boundaries), intent(in) :: self
         _DECLARE_ARGUMENTS_DO_
 
         real(rk) :: par, par0, parmean

src/dvm_weight_distribution.F90

@@ -10,7 +10,7 @@
 ! https://github.com/nansencenter/nersc
 ! -----------------------------------------------------------------------------
 
-module dvm_weight_distribution
+module ersem_dvm_weight_distribution
 
 use fabm_types
 use fabm_expressions
@@ -19,7 +19,7 @@ module dvm_weight_distribution
 
 private 
 
-type, extends(type_base_model), public :: type_weight_distribution
+type, extends(type_base_model), public :: type_ersem_dvm_weight_distribution
     type (type_bottom_diagnostic_variable_id) :: id_integral
     type (type_bottom_diagnostic_variable_id) :: id_integral_weights
     type (type_diagnostic_variable_id)        :: id_weights
@@ -39,7 +39,7 @@ module dvm_weight_distribution
 contains
 
     subroutine initialize(self, configunit)
-        class (type_weight_distribution), intent(inout), target :: self
+        class (type_ersem_dvm_weight_distribution), intent(inout), target :: self
         integer,                     intent(in)            :: configunit
         call self%register_diagnostic_variable(self%id_integral_weights,'migrator_integral_weights','-','migrators distribution integral weights', missing_value=0.0_rk, &
             act_as_state_variable=.true., source=source_do_column)
@@ -58,7 +58,7 @@ subroutine initialize(self, configunit)
     end subroutine initialize
 
     subroutine do_column(self, _ARGUMENTS_DO_COLUMN_)
-        class (type_weight_distribution), intent(in) :: self
+        class (type_ersem_dvm_weight_distribution), intent(in) :: self
         _DECLARE_ARGUMENTS_DO_COLUMN_
 
         real(rk) :: thickness, integral_weights, present, weight, minimum_value

src/ersem_model_library.F90

@@ -30,9 +30,9 @@ module ersem_model_library
    use ersem_benthic_erosion
    use ersem_fluff
    use ersem_zenith_angle
-   use dvm_move
-   use dvm_upper_lower_boundaries
-   use dvm_weight_distribution
+   use ersem_dvm_move
+   use ersem_dvm_upper_lower_boundaries
+   use ersem_dvm_weight_distribution
 
    implicit none
 
@@ -86,9 +86,9 @@ subroutine create(self,name,model)
          case ('benthic_erosion');                         allocate(type_ersem_benthic_erosion::model)
          case ('fluff');                                   allocate(type_ersem_fluff::model)
          case ('zenith_angle');                            allocate(type_ersem_zenith_angle::model)
-         case ('dvm_move');                                allocate(type_move::model)
-         case ('dvm_upper_lower_boundaries');              allocate(type_upper_lower_boundaries::model)
-         case ('dvm_weight_distribution');                 allocate(type_weight_distribution::model)
+         case ('dvm_move');                                allocate(type_ersem_dvm_move::model)
+         case ('dvm_upper_lower_boundaries');              allocate(type_ersem_dvm_upper_lower_boundaries::model)
+         case ('dvm_weight_distribution');                 allocate(type_ersem_dvm_weight_distribution::model)
          ! Add new models here
          case default
             call self%type_base_model_factory%create(name,model)