Changeset 4288 for branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2013-11-20T16:02:06+01:00 (10 years ago)

Author:

cbricaud

Message:

correction for timesplitting

File:

• branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (5 diffs)

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -56 +56 @@
 
    ! Potential namelist parameters below to be read in dyn_spg_ts_init
-   LOGICAL,  PUBLIC,  PARAMETER :: ln_bt_fw=.true.        !: Forward integration of barotropic sub-stepping
+   LOGICAL,  PUBLIC,  PARAMETER :: ln_bt_fw=.TRUE.        !: Forward integration of barotropic sub-stepping
    LOGICAL,  PRIVATE, PARAMETER :: ln_bt_av=.TRUE.        !: Time averaging of barotropic variables
    LOGICAL,  PRIVATE, PARAMETER :: ln_bt_nn_auto=.FALSE.  !: Set number of iterations automatically
@@ -228 +228 @@
       IF ( kt == nit000 .OR. lk_vvl ) THEN
          IF ( ln_dynvor_een ) THEN
-            zht(:,:) = 0.
-            DO jk = 1, jpk
-               zht(:,:) = zht(:,:) + fse3t_n(:,:,jk) * tmask(:,:,jk)
-            END DO
+            ! JC: Simplification needed below: define ht_0 even when volume is fixed
+            IF (lk_vvl) THEN
+               zht(:,:) = (ht_0(:,:) + sshn(:,:)) * tmask(:,:,1) 
+            ELSE
+               zht(:,:) = 0.
+               DO jk = 1, jpkm1
+                  zht(:,:) = zht(:,:) + fse3t_n(:,:,jk) * tmask(:,:,jk)
+               END DO
+            ENDIF
+
             DO jj = 1, jpjm1
                DO ji = 1, jpim1
@@ -1049 +1055 @@
       INTEGER         , INTENT(in) ::   kt         ! ocean time-step
       !
-      INTEGER  :: ji ,jj
+      INTEGER  :: ji ,jj, jk
       REAL(wp) :: zxr2, zyr2, zcmax
-      REAL(wp), POINTER, DIMENSION(:,:) :: zcu
+      REAL(wp), POINTER, DIMENSION(:,:) :: zcu, zht
       !!
 !      NAMELIST/namsplit/ ln_bt_fw, ln_bt_av, ln_bt_nn_auto, &
@@ -1060 +1066 @@
       !         ! Max courant number for ext. grav. waves
       !
-      CALL wrk_alloc( jpi, jpj, zcu )
-      !
+      CALL wrk_alloc( jpi, jpj, zcu, zht )
+      !
+      ! JC: Simplification needed below: define ht_0 even when volume is fixed
+      IF (lk_vvl) THEN 
+         zht(:,:) = ht_0(:,:) * tmask(:,:,1)
+      ELSE
+         zht(:,:) = 0.
+         DO jk = 1, jpkm1
+            zht(:,:) = zht(:,:) + fse3t_n(:,:,jk) * tmask(:,:,jk)
+         END DO
+      ENDIF
+
       DO jj = 1, jpj
-         DO ji =1, jpi 
+         DO ji =1, jpi
             zxr2 = 1./(e1t(ji,jj)*e1t(ji,jj))
             zyr2 = 1./(e2t(ji,jj)*e2t(ji,jj))
-            zcu(ji,jj) = sqrt(grav*ht_0(ji,jj)*(zxr2 + zyr2) )
+            zcu(ji,jj) = sqrt(grav*zht(ji,jj)*(zxr2 + zyr2) )
          END DO
       END DO
@@ -1120 +1136 @@
       ENDIF
       !
-      CALL wrk_dealloc( jpi, jpj, zcu )
+      CALL wrk_dealloc( jpi, jpj, zcu, zht )
       !
    END SUBROUTINE dyn_spg_ts_init