Changeset 8993 for branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90

Timestamp:

2017-12-12T16:42:29+01:00 (7 years ago)

Author:

timgraham

Message:

Merged Mercator branch in

File:

• branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90 (modified) (5 diffs)

branches/2017/dev_METO_MERCATOR_2017/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90

@@ -38 +38 @@
       !
 #if defined SPONGE
-      timecoeff = REAL(Agrif_NbStepint(),wp)/Agrif_rhot()
+!!      timecoeff = REAL(Agrif_NbStepint(),wp)/Agrif_rhot()
+!! Assume persistence:
+      timecoeff = REAL(Agrif_rhot()-1,wp)/REAL(Agrif_rhot())
 
       CALL Agrif_Sponge
@@ -61 +63 @@
 
 #if defined SPONGE
-      timecoeff = REAL(Agrif_NbStepint(),wp)/Agrif_rhot()
+!!      timecoeff = REAL(Agrif_NbStepint(),wp)/Agrif_rhot()
+!! Assume persistence:
+      timecoeff = REAL(Agrif_rhot()-1,wp)/REAL(Agrif_rhot())
 
       Agrif_SpecialValue=0.
@@ -207 +211 @@
       !
       IF( before ) THEN
-         tabres(i1:i2,j1:j2,k1:k2,n1:n2) = tsn(i1:i2,j1:j2,k1:k2,n1:n2)
+         tabres(i1:i2,j1:j2,k1:k2,n1:n2) = tsb(i1:i2,j1:j2,k1:k2,n1:n2)
       ELSE   
          !
@@ -276 +280 @@
       !
       IF( before ) THEN
-         tabres = un(i1:i2,j1:j2,:)
+         tabres = ub(i1:i2,j1:j2,:)
       ELSE
          ubdiff(i1:i2,j1:j2,:) = (ub(i1:i2,j1:j2,:) - tabres(:,:,:))*umask(i1:i2,j1:j2,:)
@@ -373 +377 @@
 
       IF( before ) THEN 
-         tabres = vn(i1:i2,j1:j2,:)
+         tabres = vb(i1:i2,j1:j2,:)
       ELSE
          !