Consistently use integer mask (MASKED_VALUE=1)

Author: platipodium

src/drivers/fabm_pelagic_driver.F90

@@ -2,8 +2,8 @@
 !> @brief 3D generic driver for the Framework for Aquatic Biogeochemical Models (FABM)
 !>
 !> This computer program is part of MOSSCO.
-!> @copyright Copyright 2021-2022 Helmholtz-Zentrum Hereon
-!> @copyright Copyright 2013-2021 Helmholtz-Zentrum Geesthacht
+!> @copyright Copyright 2021-2025 Helmholtz-Zentrum hereon GmbH
+!> @copyright Copyright 2013-2021 Helmholtz-Zentrum Geesthacht GmbH
 !> @author Richard Hofmeister
 !> @author Carsten Lemmen <carsten.lemmen@hereon.de
 !
@@ -217,8 +217,8 @@ subroutine initialize_domain(pf,inum,jnum,knum,dt,mask)
     class(type_mossco_fabm_pelagic) :: pf
     integer  :: inum,jnum,knum
     real(rk) :: dt
-    logical, dimension(1:inum,1:jnum,1:knum), optional :: mask
-    logical, dimension(1:inum,1:jnum), target :: mask_hz
+    integer, dimension(1:inum,1:jnum,1:knum), optional :: mask
+    integer, dimension(1:inum,1:jnum), target :: mask_hz
 
     type(export_state_type), pointer :: export_state
     integer :: n
@@ -240,9 +240,9 @@ subroutine initialize_domain(pf,inum,jnum,knum,dt,mask)
     if (present(mask)) then
       pf%mask=mask
     else
-      pf%mask(:,:,:) = .false.
+      pf%mask(:,:,:) = 0
     end if
-    mask_hz = any(pf%mask, dim=3)
+    mask_hz = maxval(pf%mask, dim=3)
 
     call fabm_set_mask(pf%model, pf%mask, mask_hz)
 
@@ -369,7 +369,7 @@ subroutine update_grid(pf)
     do i=1,pf%inum
       do j=1,pf%jnum
         do k=1,pf%knum
-          if (.not.pf%mask(i,j,k)) &
+          if (pf%mask(i,j,k) == 0) &
             pf%layer_height(i,j,k) = pf%zi(i,j,k0+k) - pf%zi(i,j,k0+k-1)
         end do
       end do
@@ -402,7 +402,7 @@ subroutine get_rhs(rhs_driver,rhs)
       do i=1,rhs_driver%inum
         rhs(i,j,rhs_driver%knum,:) = rhs(i,j,rhs_driver%knum,:)/rhs_driver%layer_height(i,j,rhs_driver%knum)
       end do
-      !if (.not.rhs_driver%mask(i,j,1)) then
+      !if (rhs_driver%mask(i,j,1) == 0) then
       !  call fabm_do_bottom()
       !end if
     end do
@@ -803,7 +803,7 @@ subroutine light(pf)
 
      do i=1,pf%inum
        do j=1,pf%jnum
-!         if (.not.pf%mask(i,j,1)) then
+!         if (pf%mask(i,j,1) == 0) then
 if ( pf%I_0(i,j) /= pf%I_0(i,j) ) write(0,*) 'ERROR: fabm_pelagic_driver#800 pf%I_0 = ',i,j,pf%I_0(i,j)
 if ( pf%albedo(i,j) /= pf%albedo(i,j) ) write(0,*) 'ERROR: fabm_pelagic_driver#809 pf%albedo = ',i,j,pf%albedo(i,j)
 if ( any(pf%par(i,j,:) /= pf%par(i,j,:)) ) write(0,*) 'ERROR: fabm_pelagic_driver#810 pf%par = ',i,j,pf%par(i,j,:)

src/utilities/solver_library.F90

@@ -3,8 +3,8 @@
 !!
 !! @author Richard Hofmeister
 !! @author Carsten Lemmen <carsten.lemmen@hereon.de
-!! @copyright 2021-2022 Helmholtz-Zentrum Hereon
-!! @copyright 2013-2021 Helmholtz-Zentrum Geesthacht
+!! @copyright 2021-2025 Helmholtz-Zentrum Hereon GmbH
+!! @copyright 2013-2021 Helmholtz-Zentrum Geesthacht GmbH
 !
 ! MOSSCO is free software: you can redistribute it and/or modify it under the
 ! terms of the GNU General Public License v3+.  MOSSCO is distributed in the
@@ -40,7 +40,7 @@ module solver_library
    real(selected_real_kind(13)) :: dt_min=1.d-9 ! minimum timestep
    real(selected_real_kind(13)) :: relative_change_min=-0.9d0 ! minimum relative change
    real(selected_real_kind(13)),dimension(:,:,:,:),pointer :: conc=>null()
-   logical, dimension(:,:,:), pointer :: mask=>null()
+   integer, dimension(:,:,:), pointer :: mask=>null()
    real(selected_real_kind(13)) :: last_min_dt=1.e20
    integer                      :: last_min_dt_grid_cell(4)=(/-99,-99,-99,-99/)
    logical                      :: adaptive_solver_diagnostics=.false.