Changeset 13678 for NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src

Timestamp:

2020-10-26T18:52:53+01:00 (4 years ago)

Author:

jchanut

Message:

#2385, qco with AGRIF

Location:

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src

Files:

• NST/agrif_oce_interp.F90 (modified) (1 diff)
• NST/agrif_oce_sponge.F90 (modified) (1 diff)
• NST/agrif_oce_update.F90 (modified) (9 diffs)
• NST/agrif_user.F90 (modified) (2 diffs)
• OCE/DYN/dynatf_qco.F90 (modified) (3 diffs)
• OCE/TRA/traatf_qco.F90 (modified) (4 diffs)
• OCE/nemogcm.F90 (modified) (1 diff)
• OCE/stpMLF.F90 (deleted)
• OCE/stpmlf.F90 (added)

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

@@ -50 +50 @@
    INTEGER ::   bdy_tinterp = 0
 
-   !!----------------------------------------------------------------------
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
    !! $Id$

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

@@ -32 +32 @@
 
    !! * Substitutions
+#  include "domzgr_substitute.h90"
 #  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------

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

@@ -27 +27 @@
    USE vremap         ! Vertical remapping
    USE lbclnk 
-
+#if defined key_qco
+   USE domqco
+#endif
    IMPLICIT NONE
    PRIVATE
@@ -34 +36 @@
    PUBLIC   Update_Scales
 
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/NST 4.0 , NEMO Consortium (2018)
@@ -191 +195 @@
    END SUBROUTINE Agrif_Update_Tke
 
-
    SUBROUTINE Agrif_Update_vvl( )
       !!---------------------------------------------
@@ -201 +204 @@
       IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Update e3 from grid Number',Agrif_Fixed(), 'Step', Agrif_Nb_Step()
       !
+#if ! defined key_qco
       Agrif_UseSpecialValueInUpdate = .TRUE.
       Agrif_SpecialValueFineGrid = 0.
@@ -213 +217 @@
       CALL dom_vvl_update_UVF
       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(:,:) ) 
+      CALL Agrif_ParentGrid_To_ChildGrid()
+#endif
       !
    END SUBROUTINE Agrif_Update_vvl
 
+#if ! defined key_qco
    SUBROUTINE dom_vvl_update_UVF
       !!---------------------------------------------
@@ -224 +236 @@
       REAL(wp):: zcoef
       !!---------------------------------------------
-
       IF (lwp.AND.lk_agrif_debug) Write(*,*) 'Finalize e3 on grid Number', &
                   & Agrif_Fixed(), 'Step', Agrif_Nb_Step()
@@ -290 +301 @@
       !
    END SUBROUTINE dom_vvl_update_UVF
+#endif
 
 #if defined key_vertical
@@ -1332 +1344 @@
    END SUBROUTINE updateAVM
 
+#if ! defined key_qco
    SUBROUTINE updatee3t(ptab_dum, i1, i2, j1, j2, k1, k2, before )
       !!---------------------------------------------
@@ -1443 +1456 @@
       !
    END SUBROUTINE updatee3t
+#endif
 
 #else

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

@@ -288 +288 @@
          CALL Agrif_Init_Variable(sshini_id, procname=agrif_initssh)
          CALL lbc_lnk( 'Agrif_Init_Domain', ssh(:,:,Kbb), 'T', 1. )
+#if ! defined key_qco
          DO jk = 1, jpk
                e3t(:,:,jk,Kbb) =  e3t_0(:,:,jk) * ( ht_0(:,:) + ssh(:,:,Kbb)  ) &
@@ -293 +294 @@
                         &              + e3t_0(:,:,jk) * ( 1._wp - tmask(:,:,jk) )
          END DO
+#endif
       ENDIF
 

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DYN/dynatf_qco.F90

@@ -1 @@
-MODULE dynatfqco
+MODULE dynatf_qco
    !!=========================================================================
-   !!                       ***  MODULE  dynatfqco  ***
+   !!                       ***  MODULE  dynatf_qco  ***
    !! Ocean dynamics: time filtering
    !!=========================================================================
@@ -50 +50 @@
    USE prtctl         ! Print control
    USE timing         ! Timing
-#if defined key_agrif
-   USE agrif_oce_interp
-#endif
 
    IMPLICIT NONE
@@ -235 +232 @@
 
    !!=========================================================================
-END MODULE dynatfqco
+END MODULE dynatf_qco

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/TRA/traatf_qco.F90

@@ -1 @@
-MODULE traatfqco
+MODULE traatf_qco
    !!======================================================================
-   !!                       ***  MODULE  traatfqco  ***
+   !!                       ***  MODULE  traatf_qco  ***
    !! Ocean active tracers:  Asselin time filtering for temperature and salinity
    !!======================================================================
@@ -45 +45 @@
    USE prtctl          ! Print control
    USE timing          ! Timing
-#if defined key_agrif
-   USE agrif_oce_interp
-#endif
 
    IMPLICIT NONE
@@ -149 +146 @@
          ENDIF
          !
-         CALL lbc_lnk_multi( 'traatfqco', pts(:,:,:,jp_tem,Kbb) , 'T', 1., pts(:,:,:,jp_sal,Kbb) , 'T', 1., &
-                  &                    pts(:,:,:,jp_tem,Kmm) , 'T', 1., pts(:,:,:,jp_sal,Kmm) , 'T', 1., &
-                  &                    pts(:,:,:,jp_tem,Kaa), 'T', 1., pts(:,:,:,jp_sal,Kaa), 'T', 1.  )
+         CALL lbc_lnk_multi( 'traatf_qco', pts(:,:,:,jp_tem,Kbb) , 'T', 1., pts(:,:,:,jp_sal,Kbb) , 'T', 1., &
+                  &                        pts(:,:,:,jp_tem,Kmm) , 'T', 1., pts(:,:,:,jp_sal,Kmm) , 'T', 1., &
+                  &                        pts(:,:,:,jp_tem,Kaa) , 'T', 1., pts(:,:,:,jp_sal,Kaa) , 'T', 1.  )
          !
       ENDIF
@@ -372 +369 @@
 
    !!======================================================================
-END MODULE traatfqco
+END MODULE traatf_qco

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

@@ -67 +67 @@
 #endif
 #if defined key_qco
-   USE stpMLF        ! NEMO time-stepping               (stp_MLF   routine)
+   USE stpmlf         ! NEMO time-stepping               (stp_MLF   routine)
 #else
    USE step           ! NEMO time-stepping                 (stp     routine)