Changeset 7761 for trunk/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90

Timestamp:

2017-03-06T18:58:35+01:00 (7 years ago)

Author:

clem

Message:

make AGRIF and LIM3 fully compatible

File:

• trunk/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/NST_SRC/agrif_lim3_update.F90

@@ -52 +52 @@
       !!----------------------------------------------------------------------
       !
-!      IF( ( MOD( kt-nit000, Agrif_irhot() * Agrif_Parent(nn_fsbc) ) /=0 ) .AND. (kt /= 0) ) THEN
-!         PRINT *, 'clem NOT udpate, kt=',kt,Agrif_NbStepint()
-!      ELSE
-!         PRINT *, 'clem     UPDATE, kt=',kt,Agrif_NbStepint()
-!      ENDIF
-
-      !! clem: I think the update should take place each time the ocean sees the surface forcings (but maybe I am wrong and we should update every rhot time steps) 
-      IF( ( MOD( kt-nit000, Agrif_irhot() * Agrif_Parent(nn_fsbc) ) /=0 ) .AND. (kt /= 0) ) RETURN ! do not update if nb of child time steps differ from time refinement
-                                                                                                   ! i.e. update only at the parent time step
-      !! clem: this condition is clearly wrong if nn_fsbc/=1 (==> Agrif_NbStepint /= (Agrif_irhot()-1) all the time)
-      !!IF( ( Agrif_NbStepint() .NE. (Agrif_irhot()-1) ) .AND. (kt /= 0) )  RETURN
-      
+      !! clem: I think the update should take place each time the ocean sees the surface forcings
+      !!       (but maybe I am wrong and we should update every rhot time steps) 
+      IF( ( MOD( (kt-nit000)/nn_fsbc + 1, Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) /=0 ) .AND. (kt /= 0) ) RETURN ! do not update if nb of child time steps differ from time refinement
+                                                                                                                           ! i.e. update only at the parent time step
       Agrif_UseSpecialValueInUpdate = .TRUE.
       Agrif_SpecialValueFineGrid = -9999.
@@ -98 +90 @@
       INTEGER  :: jk, jl, jm
       !!-----------------------------------------------------------------------
-      ! clem: it is ok not to multiply by e1 e2 since we conserve tracers here (cf ce qui est fait dans opa).
+      ! it is ok not to multiply by e1*e2 since we conserve tracers here (same as in the ocean).
       IF( before ) THEN
          jm = 1
@@ -135 +127 @@
          ENDDO
 
+         ! integrated values
+         vt_i (i1:i2,j1:j2) = SUM( v_i(i1:i2,j1:j2,:), dim=3 )
+         vt_s (i1:i2,j1:j2) = SUM( v_s(i1:i2,j1:j2,:), dim=3 )
+         at_i (i1:i2,j1:j2) = SUM( a_i(i1:i2,j1:j2,:), dim=3 )
+         et_s(i1:i2,j1:j2)  = SUM( SUM( e_s(i1:i2,j1:j2,:,:), dim=4 ), dim=3 )
+         et_i(i1:i2,j1:j2)  = SUM( SUM( e_i(i1:i2,j1:j2,:,:), dim=4 ), dim=3 )
+         
       ENDIF
       !