Changeset 14118

Timestamp:

2020-12-07T11:31:48+01:00 (3 years ago)

Author:

techene

Message:

#2385 bug fixes for qco

Location:

NEMO/trunk/src

Files:

• OCE/DYN/dynhpg.F90 (modified) (1 diff)
• OCE/ICB/icbutl.F90 (modified) (2 diffs)
• OCE/nemogcm.F90 (modified) (1 diff)
• OCE/stpmlf.F90 (modified) (1 diff)
• TOP/trcais.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/DYN/dynhpg.F90

@@ -756 +756 @@
       ! 4. a) Upper half of top-most grid box, compute and store
       !-------------------------------------------------------------
-! *** AY note: ssh(ji,jj,Kmm) + gde3w(ji,jj,1) = e3w(ji,jj,1)
+! *** AY note: ssh(ji,jj,Kmm) + gde3w(ji,jj,1) = e3w(ji,jj,1,Kmm)
       DO_2D( 0, 1, 0, 1)
          z_rho_k(ji,jj,1) =  grav * ( ssh(ji,jj,Kmm) + gde3w(ji,jj,1) )                        & 

NEMO/trunk/src/OCE/ICB/icbutl.F90

@@ -57 +57 @@
    PUBLIC   icb_utl_heat          ! routine called in icbdia module
 
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -127 +129 @@
             CALL lbc_lnk_icb( 'icbutl', ztmp, 'V', -1._wp, 1, 1 )
             voce_e(:,:,jk) = ztmp(:,:)
+            !
+            e3t_e(1:jpi,1:jpj,jk) = e3t(:,:,jk,Kmm)
          END DO
-         toce_e(1:jpi,1:jpj,1:jpk) = ts(:,:,:,1,Kmm)
-         e3t_e (1:jpi,1:jpj,1:jpk) = e3t(:,:,:,Kmm)
+         toce_e(1:jpi,1:jpj,:) = ts(:,:,:,1,Kmm)
       END IF
       !

NEMO/trunk/src/OCE/nemogcm.F90

@@ -57 +57 @@
    USE diacfl         ! CFL diagnostics               (dia_cfl_init routine)
    USE diamlr         ! IOM context management for multiple-linear-regression analysis
-#if defined key_qco
-   USE stepMLF        ! NEMO time-stepping               (stp_MLF   routine)
-#else
-   USE step           ! NEMO time-stepping                 (stp     routine)
-#endif
    USE isfstp         ! ice shelf                     (isf_stp_init routine)
    USE icbini         ! handle bergs, initialisation

NEMO/trunk/src/OCE/stpmlf.F90

@@ -367 +367 @@
       IF( kstp == nitend .OR. indic < 0 ) THEN
                       CALL iom_context_finalize(      cxios_context          ) ! needed for XIOS+AGRIF
-         IF( lrxios ) CALL iom_context_finalize(      crxios_context          )
          IF( ln_crs ) CALL iom_context_finalize( trim(cxios_context)//"_crs" ) !
       ENDIF

NEMO/trunk/src/TOP/trcais.F90

@@ -38 +38 @@
    !! * Substitutions
 #  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/TOP 4.0 , NEMO Consortium (2018)