Changeset 13258 for NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/OCE/nemogcm.F90

Timestamp:

2020-07-07T12:23:18+02:00 (4 years ago)

Author:

rblod

Message:

#2129 : merge branch CMEMS with trunk r13327

Location:

NEMO/branches/2020/dev_r12973_AGRIF_CMEMS

Files:

• . (modified) (1 prop)
• src/OCE/nemogcm.F90 (modified) (6 diffs)

NEMO/branches/2020/dev_r12973_AGRIF_CMEMS

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools_dev_r12970_AGRIF_CMEMS            tools
+^/utils/tools/@HEAD           tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools_dev_r12970_AGRIF_CMEMS            tools
+^/utils/tools/@HEAD           tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM

NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/OCE/nemogcm.F90

@@ -60 +60 @@
    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
@@ -178 +182 @@
       !
       DO WHILE( istp <= nitend .AND. nstop == 0 )
+#if defined key_qco
+         CALL stp_MLF
+#else
          CALL stp
+#endif
          istp = istp + 1
       END DO
@@ -195 +203 @@
             ENDIF
             
+#if defined key_qco
+            CALL stp_MLF      ( istp )
+#else
             CALL stp        ( istp ) 
+#endif
             istp = istp + 1
 
@@ -362 +374 @@
          WRITE(numout,*) "     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ "
          WRITE(numout,*)
+         
+         ! Print the working precision to ocean.output
+         IF (wp == dp) THEN
+            WRITE(numout,*) "Working precision = double-precision"
+         ELSE
+            WRITE(numout,*) "Working precision = single-precision"
+         ENDIF
+         WRITE(numout,*)
          !
          WRITE(numout,cform_aaa)                                        ! Flag AAAAAAA
@@ -418 +438 @@
 #endif
                            CALL     dom_init( Nbb, Nnn, Naa, "OPA") ! Domain
-
-
-
       IF( ln_crs       )   CALL     crs_init(      Nnn )       ! coarsened grid: domain initialization 
       IF( sn_cfctl%l_prtctl )   &
@@ -696 +713 @@
    !!======================================================================
 END MODULE nemogcm
-

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools_dev_r12970_AGRIF_CMEMS            tools
+^/utils/tools/@HEAD           tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM