Changeset 15029

Timestamp:

2021-06-21T09:21:01+02:00 (3 years ago)

Author:

jchanut

Message:

#2698, fixes passive tracers repro/restart & remove euler time stepping in top namelists (not supported with AGRIF)

Location:

NEMO/trunk

Files:

• cfgs/AGRIF_DEMO/EXPREF/1_namelist_top_cfg (modified) (1 diff)
• cfgs/AGRIF_DEMO/EXPREF/2_namelist_top_cfg (modified) (1 diff)
• cfgs/AGRIF_DEMO/EXPREF/3_namelist_top_cfg (modified) (1 diff)
• cfgs/AGRIF_DEMO/EXPREF/namelist_top_cfg (modified) (1 diff)
• src/NST/agrif_user.F90 (modified) (4 diffs)

NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/1_namelist_top_cfg

@@ -2 +2 @@
 &namtrc_run      !   run information
 !-----------------------------------------------------------------------
-   ln_top_euler = .true.
 /
 !-----------------------------------------------------------------------

NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/2_namelist_top_cfg

@@ -2 +2 @@
 &namtrc_run      !   run information
 !-----------------------------------------------------------------------
-   ln_top_euler = .true.
 /
 !-----------------------------------------------------------------------

NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/3_namelist_top_cfg

@@ -2 +2 @@
 &namtrc_run      !   run information
 !-----------------------------------------------------------------------
-   ln_top_euler = .true.
 /
 !-----------------------------------------------------------------------

NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/namelist_top_cfg

@@ -2 +2 @@
 &namtrc_run      !   run information
 !-----------------------------------------------------------------------
-   ln_top_euler = .true.
 /
 !-----------------------------------------------------------------------

NEMO/trunk/src/NST/agrif_user.F90

@@ -317 +317 @@
       Agrif_UseSpecialValue = .TRUE.
       l_vremap              = ln_vert_remap
-
       CALL Agrif_Bc_variable(ts_interp_id,calledweight=1.,procname=interptsn)
       CALL Agrif_Sponge
@@ -689 +688 @@
       !!----------------------------------------------------------------------
       USE Agrif_Util
+      USE agrif_oce
       USE oce 
       USE dom_oce
@@ -715 +715 @@
       Agrif_SpecialValue=0._wp
       Agrif_UseSpecialValue = .TRUE.
+      l_vremap              = ln_vert_remap
       CALL Agrif_Bc_variable(trn_id,calledweight=1.,procname=interptrn)
-      Agrif_UseSpecialValue = .FALSE.
       CALL Agrif_Sponge
       tabspongedone_trn = .FALSE.
       CALL Agrif_Bc_variable(trn_sponge_id,calledweight=1.,procname=interptrn_sponge)
+      Agrif_UseSpecialValue = .FALSE.
+      l_vremap              = .FALSE.
       ! reset tsa to zero
       tr(:,:,:,:,Krhs_a) = 0._wp
@@ -751 +753 @@
             nitend =  Agrif_Parent(nitend)   *Agrif_IRhot()
          ENDIF
+      
+         !
+         IF (Agrif_Parent(ln_top_euler).OR.ln_top_euler) THEN
+            CALL ctl_stop( 'AGRIF and ln_top_euler=T not implemented')
+         ENDIF 
       ENDIF
       !