Changeset 13680

Timestamp:

2020-10-26T23:02:27+01:00 (4 years ago)

Author:

jchanut

Message:

#2385, effectively add VORTEX ssh initialization and key_qco. Save first guess (prior update) r3x arrays: Restored correct value of surface w.

Location:

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3

Files:

• src/NST/agrif_oce_update.F90 (modified) (1 diff)
• src/OCE/DOM/domqco.F90 (modified) (1 diff)
• tests/VORTEX/MY_SRC/domqco.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/NST/agrif_oce_update.F90

@@ -218 +218 @@
       CALL Agrif_ParentGrid_To_ChildGrid()
 #else
-!! JC: should be something like that: 
       CALL Agrif_ChildGrid_To_ParentGrid()
-      CALL dom_qco_r3c( ssh(:,:,Kbb_a), r3t(:,:,Kbb_a), r3u(:,:,Kbb_a), r3v(:,:,Kbb_a) )
-      CALL dom_qco_r3c( ssh(:,:,Kmm_a), r3t(:,:,Kmm_a), r3u(:,:,Kmm_a), r3v(:,:,Kmm_a), r3f(:,:) ) 
+         r3t(:,:,Krhs_a) = r3t(:,:,Kmm_a)
+         r3u(:,:,Krhs_a) = r3u(:,:,Kmm_a)
+         r3v(:,:,Krhs_a) = r3v(:,:,Kmm_a)
+         CALL dom_qco_zgr( Kbb_a, Kmm_a, Krhs_a )
       CALL Agrif_ParentGrid_To_ChildGrid()
 #endif

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/domqco.F90

@@ -125 +125 @@
 #if defined key_agrif
       ! We need to define r3[tuv](Kaa) for AGRIF initialisation (should not be a problem for the restartability...)
-      r3t(:,:,Kaa) = r3t(:,:,Kmm)
-      r3u(:,:,Kaa) = r3u(:,:,Kmm)
-      r3v(:,:,Kaa) = r3v(:,:,Kmm)
+!      r3t(:,:,Kaa) = r3t(:,:,Kmm)
+!      r3u(:,:,Kaa) = r3u(:,:,Kmm)
+!      r3v(:,:,Kaa) = r3v(:,:,Kmm)
 #endif
       !

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/VORTEX/MY_SRC/domqco.F90

@@ -125 +125 @@
 #if defined key_agrif
       ! We need to define r3[tuv](Kaa) for AGRIF initialisation (should not be a problem for the restartability...)
-      r3t(:,:,Kaa) = r3t(:,:,Kmm)
-      r3u(:,:,Kaa) = r3u(:,:,Kmm)
-      r3v(:,:,Kaa) = r3v(:,:,Kmm)
+!      r3t(:,:,Kaa) = r3t(:,:,Kmm)
+!      r3u(:,:,Kaa) = r3u(:,:,Kmm)
+!      r3v(:,:,Kaa) = r3v(:,:,Kmm)
 #endif
       !
@@ -302 +302 @@
             ! Just to read set ssh in fact, called latter once vertical grid
             ! is set up:
-!           CALL usr_def_istate( gdept_0, tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb)  )
-!           !
-            ssh(:,:,:) = 0._wp
+            CALL usr_def_istate( gdept_0, tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb)  )
+            !
+            ssh(:,:,Kmm) = ssh(:,:,Kbb) 
             !
          ENDIF           ! end of ll_wd edits