Merge commit 'Fixed GPU compilation' from 'Floris_devbranch' of https…

…://github.com/Deltares/SFINCS
Deltares · Oct 31, 2023 · f26664c · f26664c
2 parents 2651b47 + 157f0fd
commit f26664c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/source/src/sfincs_continuity.f90 b/source/src/sfincs_continuity.f90
@@ -714,7 +714,7 @@ subroutine compute_store_variables(dt)
    !$omp parallel &
    !$omp private (nmd,nmu,ndm,num,quz,qvz,qz,uvz )
    !$omp do schedule ( dynamic, 256 )
-   !$acc kernels present( kcs, zs, zb, subgrid_z_zmin, q, z_flags_type)
+   !$acc kernels present( kcs, zs, zb, subgrid_z_zmin, q, z_flags_type, &
    !$acc                  z_index_uv_md1, z_index_uv_nd1, z_index_uv_mu1, z_index_uv_nu1), async(1)
    !$acc loop independent, private( nm )   
    do nm = 1, np

diff --git a/source/src/sfincs_domain.f90 b/source/src/sfincs_domain.f90
@@ -2244,7 +2244,11 @@ subroutine initialize_domain()
          open(unit = 501, file = trim(sefffile), form = 'unformatted', access = 'stream')
          read(501)scs_Se
          close(501)
-         !
+
+         ! Compute recovery                     ! Equation 4-36
+
+
+         if (ksfile /= 'none') then 
          ! Allocate Ks
          allocate(ksfield(np))
          ksfield = 0.0
@@ -2258,6 +2262,7 @@ subroutine initialize_domain()
          inf_kr = sqrt(ksfield/25.4) / 75       ! Note that we assume ksfield to be in mm/hr, convert it here to inch/hr (/25.4)
                                                 ! /75 is conversion to recovery rate (in days)
          !
+
          ! Allocate support variables
          allocate(scs_P1(np))
          scs_P1 = 0.0