Changeset 12917

Timestamp:

2020-05-13T09:56:41+02:00 (3 years ago)

Author:

davestorkey

Message:

UKMO/NEMO_4.0.1_biharmonic_GM : remove redundant code (which breaks reproducibility).

Location:

NEMO/branches/UKMO/NEMO_4.0.1_biharmonic_GM/src/OCE

Files:

• DYN/dynldf_lap_blp.F90 (modified) (2 diffs)
• LDF/ldfdyn.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_biharmonic_GM/src/OCE/DYN/dynldf_lap_blp.F90

@@ -174 +174 @@
 
 !CW: set boundary conditions: d/dz(del^2 u) = 0 at top and bottom, so that eddy-induced velocity, w*=0
+!DS: note that w*=0 next to topography is already set because of the use of wumask and wvmask above.
 !     Surface
       zulapdz(:,:,1)   = 0._wp   ;   zvlapdz(:,:,1)   = 0._wp 
 !     Flat bottom case
       zulapdz(:,:,jpk) = 0._wp   ;   zvlapdz(:,:,jpk) = 0._wp
-!     Variable bathymetry case, including z-partial steps, as in dynhpg.F90, subroutine hpg_zps
-        DO jj = 2, jpjm1
-            DO ji = 2, jpim1
-                iku = mbku(ji,jj)+1
-                ikv = mbkv(ji,jj)+1
-                zulapdz(:,:,iku) = 0._wp
-                zvlapdz(:,:,ikv) = 0._wp
-            ENDDO
-        ENDDO
 
 !!    calculate d/dz(-bhm * d/dz(del^2 u))
@@ -199 +191 @@
          ENDDO
       ENDDO
-
-      ! -----
-
    
    END SUBROUTINE dyn_ldf_bgm

NEMO/branches/UKMO/NEMO_4.0.1_biharmonic_GM/src/OCE/LDF/ldfdyn.F90

@@ -380 +380 @@
             ENDDO
 
-            !     Surface BC : set to zero
-            bhm(:,:,1)   = 0._wp
-            !     Flat bottom BC : set to zero
-            bhm(:,:,jpk) = 0._wp 
-            !     Variable bathymetry case: diffusive fluxes masked in dyn_ldf_bgm
-
             !CW Test criterion for two grid-length mode for BGM scheme with leapfrog timestepping
             ! \frac{{\kappa \Delta t}{(\Delta z)^2 (\Delta x)^2}< 1/32 
@@ -460 +454 @@
             ENDDO
 
-            !     Surface BC : set to zero
-            bhm(:,:,1)   = 0._wp 
-            !     Flat bottom BC : set to zero
-            bhm(:,:,jpk) = 0._wp 
-            !     Variable bathymetry case: diffusive fluxes masked in dyn_ldf_bgm
-
             !--------------------------------
          CASE(  13  )      !==  fixed profile: steady profile of the form bhm0 X dx^2 X dz^2 in interior, zero at bottom and top  ==!
@@ -488 +476 @@
                ENDDO
             ENDDO
-
-            !     Surface BC : set to zero
-            bhm(:,:,1)   = 0._wp 
-            !     Flat bottom BC : set to zero
-            bhm(:,:,jpk) = 0._wp 
-            !     Variable bathymetry case: diffusive fluxes masked in dyn_ldf_bgm
 
             !--------------------------------