Changeset 14053 for NEMO/trunk/src/OFF

Timestamp:

2020-12-03T14:48:38+01:00 (4 years ago)

Author:

techene

Message:

#2385 added to the trunk

Location:

NEMO/trunk/src/OFF

Files:

• dtadyn.F90 (modified) (4 diffs)
• nemogcm.F90 (modified) (3 diffs)

NEMO/trunk/src/OFF/dtadyn.F90

@@ -23 +23 @@
    USE c1d             ! 1D configuration: lk_c1d
    USE dom_oce         ! ocean domain: variables
-#if ! defined key_qco 
-   USE domvvl          ! variable volume
+#if defined key_qco 
+   USE domqco          ! variable volume
 #else
-   USE domqco
+   USE domvvl
 #endif
    USE zdf_oce         ! ocean vertical physics: variables
@@ -97 +97 @@
    !! * Substitutions
 #  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
+   
    !!----------------------------------------------------------------------
    !! NEMO/OFF 4.0 , NEMO Consortium (2018)
@@ -388 +390 @@
         gdepw(:,:,:,Kbb) = gdepw(:,:,:,Kmm)
         !
-      ENDIF
 #endif
+      ENDIF
       !
       IF( ln_dynrnf .AND. ln_dynrnf_depth ) THEN       ! read depht over which runoffs are distributed
@@ -412 +414 @@
             ENDIF
          END_2D
+         !
          DO_2D( 1, 1, 1, 1 )                           ! set the associated depth
             h_rnf(ji,jj) = 0._wp

NEMO/trunk/src/OFF/nemogcm.F90

@@ -64 +64 @@
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
    USE lbcnfd  , ONLY : isendto, nsndto   ! Setup of north fold exchanges
-   USE step, ONLY : Nbb, Nnn, Naa, Nrhs   ! time level indices
+#if defined key_qco
+   USE stpmlf , ONLY : Nbb, Nnn, Naa, Nrhs   ! time level indices
+#else
+   USE step    , ONLY : Nbb, Nnn, Naa, Nrhs   ! time level indices
+#endif
    USE halo_mng
 
@@ -143 +147 @@
                                 CALL dta_dyn_atf( istp, Nbb, Nnn, Naa )       ! time filter of sea  surface height and vertical scale factors
 # if defined key_qco
-                                CALL dom_qco_r3c( ssh(:,:,Kmm), r3t_f, r3u_f, r3v_f )
+                                CALL dom_qco_r3c( ssh(:,:,Nnn), r3t_f, r3u_f, r3v_f )
 # endif
          ENDIF
                                 CALL trc_stp    ( istp, Nbb, Nnn, Nrhs, Naa ) ! time-stepping
 # if defined key_qco
-                                !r3t(:,:,Kmm) = r3t_f(:,:)                     ! update ssh to h0 ratio
-                                !r3u(:,:,Kmm) = r3u_f(:,:)
-                                !r3v(:,:,Kmm) = r3v_f(:,:)
+                                !r3t(:,:,Nnn) = r3t_f(:,:)                     ! update ssh to h0 ratio
+                                !r3u(:,:,Nnn) = r3u_f(:,:)
+                                !r3v(:,:,Nnn) = r3v_f(:,:)
 # endif
 #endif
@@ -160 +164 @@
          !
 #if ! defined key_qco
-#if ! defined key_sed_off
+# if ! defined key_sed_off
          IF( .NOT.ln_linssh )   CALL dta_dyn_sf_interp( istp, Nnn )  ! calculate now grid parameters
-#endif
+# endif
 #endif         
          CALL stp_ctl    ( istp )             ! Time loop: control and print