Changeset 13362 for NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/DYN

Timestamp:

2020-07-30T17:01:13+02:00 (4 years ago)

Author:

techene

Message:

horizontal surface pressure gradient is now added systematically (linear and non-linear case) to rhs when explicit time scheme, it is not removed in the non linear case when time splitting

File:

• NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/DYN/dynspg_exp.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/DYN/dynspg_exp.F90

@@ -60 +60 @@
       !!
       INTEGER ::   ji, jj, jk   ! dummy loop indices
+      REAL(wp), DIMENSION(jpi,jpj) ::   zpgu, zpgv   ! 2D workspace
       !!----------------------------------------------------------------------
       !
@@ -67 +68 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   (explicit free surface)'
          !
-         spgu(:,:) = 0._wp   ;   spgv(:,:) = 0._wp
+         zpgu(:,:) = 0._wp   ;   zpgv(:,:) = 0._wp
          !
          IF( .NOT.ln_linssh .AND. lwp ) WRITE(numout,*) '      non linear free surface: spg is included in dynhpg'
       ENDIF
-
-      IF( ln_linssh ) THEN          !* linear free surface : add the surface pressure gradient trend
-         !
-         DO_2D( 0, 0, 0, 0 )
-            spgu(ji,jj) = - grav * ( ssh(ji+1,jj,Kmm) - ssh(ji,jj,Kmm) ) * r1_e1u(ji,jj)
-            spgv(ji,jj) = - grav * ( ssh(ji,jj+1,Kmm) - ssh(ji,jj,Kmm) ) * r1_e2v(ji,jj)
-         END_2D
-         !
-         DO_3D( 0, 0, 0, 0, 1, jpkm1 )
-            puu(ji,jj,jk,Krhs) = puu(ji,jj,jk,Krhs) + spgu(ji,jj)
-            pvv(ji,jj,jk,Krhs) = pvv(ji,jj,jk,Krhs) + spgv(ji,jj)
-         END_3D
-         !
-      ENDIF
+      !
+      DO_2D( 0, 0, 0, 0 )
+         zpgu(ji,jj) = - grav * ( ssh(ji+1,jj,Kmm) - ssh(ji,jj,Kmm) ) * r1_e1u(ji,jj)
+         zpgv(ji,jj) = - grav * ( ssh(ji,jj+1,Kmm) - ssh(ji,jj,Kmm) ) * r1_e2v(ji,jj)
+      END_2D
+      !
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )
+         puu(ji,jj,jk,Krhs) = puu(ji,jj,jk,Krhs) + zpgu(ji,jj)
+         pvv(ji,jj,jk,Krhs) = pvv(ji,jj,jk,Krhs) + zpgv(ji,jj)
+      END_3D
       !
    END SUBROUTINE dyn_spg_exp