Changeset 8010 for branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2017-05-09T17:36:25+02:00 (7 years ago)

Author:

jchanut

Message:

AGRIF vvl add on

Location:

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/divcur.F90 (modified) (1 diff)
• DYN/dynspg_ts.F90 (modified) (2 diffs)
• DYN/sshwzv.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)
• step_oce.F90 (modified) (1 diff)

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90

@@ -323 +323 @@
             END DO
          END DO
+
+         IF( .NOT. AGRIF_Root() ) THEN
+            IF ((nbondi ==  1).OR.(nbondi == 2)) rotn(nlci-1 , :     ,jk) = 0.e0      ! east
+            IF ((nbondi == -1).OR.(nbondi == 2)) rotn(1      , :     ,jk) = 0.e0      ! west
+            IF ((nbondj ==  1).OR.(nbondj == 2)) rotn(:      ,nlcj-1 ,jk) = 0.e0      ! north
+            IF ((nbondj == -1).OR.(nbondj == 2)) rotn(:      ,1      ,jk) = 0.e0      ! south
+         ENDIF
          !                                             ! ===============
       END DO                                           !   End of slab

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -576 +576 @@
          ! Set fluxes during predictor step to ensure 
          ! volume conservation
-         IF( (.NOT.Agrif_Root()).AND.ln_bt_fw ) THEN
+         IF (.NOT.Agrif_Root().AND.ln_bt_fw) THEN
             IF((nbondi == -1).OR.(nbondi == 2)) THEN
                DO jj=1,jpj
@@ -1139 +1139 @@
          IF(lwp) WRITE(numout,*) '     ln_bt_fw =.false.=> Centred integration of barotropic variables '
       ENDIF
-      !
-#if defined key_agrif
-      ! Restrict the use of Agrif to the forward case only
-      IF ((.NOT.ln_bt_fw ).AND.(.NOT.Agrif_Root())) CALL ctl_stop( 'AGRIF not implemented if ln_bt_fw=.FALSE.' )
-#endif
       !
       IF(lwp) WRITE(numout,*)    '     Time filter choice, nn_bt_flt: ', nn_bt_flt

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -223 +223 @@
       ENDIF
 #endif
+#if defined key_agrif
+      IF( .NOT. AGRIF_Root() ) THEN
+         IF ((nbondi ==  1).OR.(nbondi == 2)) wn(nlci-1 , :     ,:) = 0.e0      ! east
+         IF ((nbondi == -1).OR.(nbondi == 2)) wn(2      , :     ,:) = 0.e0      ! west
+         IF ((nbondj ==  1).OR.(nbondj == 2)) wn(:      ,nlcj-1 ,:) = 0.e0      ! north
+         IF ((nbondj == -1).OR.(nbondj == 2)) wn(:      ,2      ,:) = 0.e0      ! south
+      ENDIF
+#endif
       !
       IF( nn_timing == 1 )  CALL timing_stop('wzv')

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -353 +353 @@
                                CALL Agrif_Update_Tra()      ! Update active tracers
                                CALL Agrif_Update_Dyn()      ! Update momentum
+#if defined key_top
+                               CALL Agrif_Update_Trc()      ! Update passive tracers
+#endif
       ENDIF
 #endif

branches/2017/dev_r7963_nemo_v3_6_AGRIF-3_AGRIFVVL/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -114 +114 @@
    USE agrif_opa_sponge ! Momemtum and tracers sponges
    USE agrif_opa_update ! Update (2-way nesting)
+#if defined key_top
+   USE agrif_top_update ! Update (2-way nesting)
+#endif
 #endif
 #if defined key_top