Merge pull request #701 from FESOM/cavity_bugfix

Cavity bugfix: from linfs to rigid lid

Author: JanStreffing

setups/test_pi_cavity/setup.yml

@@ -60,12 +60,12 @@ namelist.io:
                 prec: 8
 
 fcheck:
-    a_ice: 0.17871151405988808
-    salt: 22.37927476279744
-    sst: 12.544066495030401
-    temp: 1.8319437672008856
-    u: -0.0017562313316165064
-    v: -0.00017630627103706065
+    a_ice: 0.17871151410285582
+    salt: 22.37927480878272
+    sst: 12.544074978023154
+    temp: 1.8319439470825187
+    u: -0.001756233171353315
+    v: -0.00017630433400062892
 
 
 

src/oce_ale.F90

@@ -1928,7 +1928,6 @@ subroutine compute_ssh_rhs_ale(dynamics, partit, mesh)
     else
 !$OMP DO
         do n=1,myDim_nod2D
-            if (ulevels_nod2D(n)>1) cycle ! --> in case of cavity 
             ssh_rhs(n)=ssh_rhs(n)+(1.0_WP-alpha)*ssh_rhs_old(n)
         end do
 !$OMP END DO
@@ -2054,6 +2053,7 @@ subroutine compute_hbar_ale(dynamics, partit, mesh)
     if (.not. trim(which_ALE)=='linfs') then
 !$OMP PARALLEL DO
         do n=1,myDim_nod2D
+            if (ulevels_nod2D(n)>1) cycle
             ssh_rhs_old(n)=ssh_rhs_old(n)-water_flux(n)*areasvol(ulevels_nod2D(n),n)
         end do
 !$OMP END PARALLEL DO
@@ -2070,6 +2070,7 @@ subroutine compute_hbar_ale(dynamics, partit, mesh)
 
 !$OMP PARALLEL DO
     do n=1,myDim_nod2D
+        if (ulevels_nod2D(n) > 1) cycle ! --> if cavity node hbar == hbar_old
         hbar(n)=hbar_old(n)+ssh_rhs_old(n)*dt/areasvol(ulevels_nod2D(n),n)
     end do
 !$OMP END PARALLEL DO
@@ -3656,7 +3657,7 @@ subroutine oce_timestep_ale(n, ice, dynamics, tracers, partit, mesh)
         !   rigid lid.
 !$OMP PARALLEL DO
         do node=1, myDim_nod2D+eDim_nod2D
-            eta_n(node)=alpha*hbar(node)+(1.0_WP-alpha)*hbar_old(node)
+            if (ulevels_nod2D(node)==1) eta_n(node)=alpha*hbar(node)+(1.0_WP-alpha)*hbar_old(node)
         end do
 !$OMP END PARALLEL DO
         ! --> eta_(n)