Changeset 14822 for NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/NST/agrif_oce_update.F90

Timestamp:

2021-05-10T13:32:16+02:00 (3 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/trunk@14820 (ticket #2353)}

Location:

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

Files:

• . (modified) (1 prop)
• src/NST/agrif_oce_update.F90 (modified) (5 diffs)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/NST/agrif_oce_update.F90

@@ -6 +6 @@
    !!======================================================================
    !!                   ***  MODULE  agrif_oce_interp  ***
-   !! AGRIF: update package for the ocean dynamics (OPA)
+   !! AGRIF: update package for the ocean dynamics (OCE)
    !!======================================================================
    !! History :  2.0  !  2002-06  (L. Debreu)  Original code
@@ -192 +192 @@
       IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update e3 from grid Number',Agrif_Fixed(), 'Step', Agrif_Nb_Step()
       !
-#if ! defined key_qco
+#if defined key_qco
+      CALL Agrif_ChildGrid_To_ParentGrid()
+      CALL Agrif_Update_qco
+      CALL Agrif_ParentGrid_To_ChildGrid()
+#elif defined key_linssh
+      !
+#else
       Agrif_UseSpecialValueInUpdate = .TRUE.
       Agrif_SpecialValueFineGrid = 0.
@@ -204 +210 @@
       CALL Agrif_ChildGrid_To_ParentGrid()
       CALL dom_vvl_update_UVF
-      CALL Agrif_ParentGrid_To_ChildGrid()
-#else
-      CALL Agrif_ChildGrid_To_ParentGrid()
-      CALL Agrif_Update_qco
       CALL Agrif_ParentGrid_To_ChildGrid()
 #endif
@@ -232 +234 @@
 
 
-#if ! defined key_qco
+#if ! defined key_qco   &&   ! defined key_linssh
    SUBROUTINE dom_vvl_update_UVF
       !!---------------------------------------------
@@ -1163 +1165 @@
    END SUBROUTINE updateAVM
 
-#if ! defined key_qco
+#if ! defined key_qco   &&   ! defined key_linssh
    SUBROUTINE updatee3t(ptab_dum, i1, i2, j1, j2, k1, k2, before )
       !!---------------------------------------------

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette