Changeset 11542 for NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST/agrif_all_update.F90

Timestamp:

2019-09-13T15:27:41+02:00 (5 years ago)

Author:

jchanut

Message:

#2199: 1) Replace TWO_WAY cpp key by namelist flag ln_agrif_2way. 2) Clean agrif_user module. At this stage, code is reproducible in one way mode down to jpi/jpj=3. Issues for small subdomain sizes (e.g. aprox < 7x7) remain in update (i.e. in 2 way mode). Masking of sponge in unconnected areas has to be implemented.
-Cette ligne, et les suivantes ci-dessous, seront ignorées--

M src/NST/agrif_all_update.F90
M src/NST/agrif_user.F90
M src/NST/agrif_oce_sponge.F90
M src/NST/agrif_ice_update.F90
M src/NST/agrif_top_update.F90
M src/NST/agrif_oce.F90
M src/NST/agrif_oce_update.F90
M cfgs/SHARED/namelist_ref

File:

• NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST/agrif_all_update.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/NST/agrif_all_update.F90

@@ -1 @@
-#define TWO_WAY
-
- MODULE agrif_all_update
+MODULE agrif_all_update
    !!======================================================================
    !!                   ***  MODULE  agrif_all_update  ***
@@ -41 +39 @@
       !!               Order of update matters here !
       !!----------------------------------------------------------------------
-# if defined TWO_WAY
-      IF (Agrif_Root()) RETURN
+      IF (( .NOT.ln_agrif_2way ).OR.(Agrif_Root())) RETURN
       !
       IF (lwp.AND.lk_agrif_debug) Write(*,*) ' --> START AGRIF UPDATE from grid Number',Agrif_Fixed()
@@ -67 +64 @@
       !
       Agrif_UseSpecialValueInUpdate = .FALSE.
-#endif
     END SUBROUTINE agrif_Update_All