Changeset 7973 for branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

Timestamp:

2017-04-26T13:57:57+02:00 (7 years ago)

Author:

jchanut

Message:

Allow centred barotropic integration with AGRIF

File:

• branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) (5 diffs)

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -487 +487 @@
       INTEGER :: ji, jj
       LOGICAL :: ll_int_cons
-      REAL(wp) :: zrhot, zt
       !!----------------------------------------------------------------------  
 
@@ -495 +494 @@
       ! the forward case only
 
-      zrhot = Agrif_rhot()
-
-      ! "Central" time index for interpolation:
-      IF (ln_bt_fw) THEN
-         zt = REAL(Agrif_NbStepint()+0.5_wp,wp) / zrhot
-      ELSE
-         zt = REAL(Agrif_NbStepint(),wp) / zrhot
-      ENDIF
+      ! Enforce volume conservation if no time refinement: 
+      IF ( Agrif_rhot()==1 ) ll_int_cons=.TRUE. 
 
       ! Interpolate barotropic fluxes
@@ -524 +517 @@
          ubdy_n(:) = 0.e0 ; vbdy_n(:) = 0.e0 
          ubdy_s(:) = 0.e0 ; vbdy_s(:) = 0.e0 
-         CALL Agrif_Bc_variable(unb_id,calledweight=zt, procname=interpunb)
-         CALL Agrif_Bc_variable(vnb_id,calledweight=zt, procname=interpvnb)
+         CALL Agrif_Bc_variable(unb_id, procname=interpunb)
+         CALL Agrif_Bc_variable(vnb_id, procname=interpvnb)
       ENDIF
       Agrif_UseSpecialValue = .FALSE.
@@ -1099 +1092 @@
       !!----------------------------------------------------------------------  
       IF( before ) THEN
-         DO jj=j1,j2
-            DO ji=i1,i2
-               ptab(ji,jj) = ub2_b(ji,jj) * e2u(ji,jj)
-            END DO
-         END DO
+         IF ( ln_bt_fw ) THEN
+            DO jj=j1,j2
+               DO ji=i1,i2
+                  ptab(ji,jj) = ub2_b(ji,jj) * e2u(ji,jj)
+               END DO
+            END DO
+         ELSE
+            DO jj=j1,j2
+               DO ji=i1,i2
+                  ptab(ji,jj) = un_adv(ji,jj) * e2u(ji,jj)
+               END DO
+            END DO
+         ENDIF
       ELSE
          western_side  = (nb == 1).AND.(ndir == 1)
@@ -1140 +1141 @@
       !
       IF( before ) THEN
-         DO jj=j1,j2
-            DO ji=i1,i2
-               ptab(ji,jj) = vb2_b(ji,jj) * e1v(ji,jj)
-            END DO
-         END DO
+         IF ( ln_bt_fw ) THEN
+            DO jj=j1,j2
+               DO ji=i1,i2
+                  ptab(ji,jj) = vb2_b(ji,jj) * e1v(ji,jj)
+               END DO
+            END DO
+         ELSE
+            DO jj=j1,j2
+               DO ji=i1,i2
+                  ptab(ji,jj) = vn_adv(ji,jj) * e1v(ji,jj)
+               END DO
+            END DO
+         ENDIF
       ELSE      
          western_side  = (nb == 1).AND.(ndir == 1)