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

Timestamp:

2020-11-30T11:58:34+01:00 (3 years ago)

Author:

techene

Message:

#2574 cosmetics, cleanning and proper display of ocean.output (sette OK)

File:

• NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/nemogcm.F90 (modified) (6 diffs)

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

@@ -328 +328 @@
       IF(lwp) THEN                      ! open listing units
          !
-         IF( .NOT. lwm )   &            ! alreay opened for narea == 1
+         IF( .NOT.lwm )   &            ! alreay opened for narea == 1
             &            CALL ctl_opn( numout, 'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE., narea )
          !
@@ -335 +335 @@
          WRITE(numout,*) '                       NEMO team'
          WRITE(numout,*) '            Ocean General Circulation Model'
-         WRITE(numout,*) '                NEMO version 4.0  (2019) '
+         WRITE(numout,*) '                NEMO version 4.0  (2020) '
          WRITE(numout,*)
          WRITE(numout,*) "           ._      ._      ._      ._      ._    "
@@ -351 +351 @@
          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"
+         !
+         WRITE(numout,cform_aaa)    ! Flag AAAAAAA
+         !
+         !                          ! Control print of the working precision
+         WRITE(numout,*)
+         IF( wp == dp ) THEN   ;   WRITE(numout,*) "par_kind : wp = Working precision = dp = double-precision"
+         ELSE                  ;   WRITE(numout,*) "par_kind : wp = Working precision = sp = single-precision"
          ENDIF
-         WRITE(numout,*)
-         !
-         WRITE(numout,cform_aaa)                                        ! Flag AAAAAAA
+                                   WRITE(numout,*) "~~~~~~~~                                 ****************"
+                                   WRITE(numout,*)
          !
       ENDIF
@@ -401 +401 @@
       !                             !-------------------------------!
 
-      CALL nemo_ctl                          ! Control prints
+      CALL nemo_ctl                          ! Control prints of namctl and namcfg
       !
       !                                      ! General initialization
@@ -415 +415 @@
      CALL Agrif_Declare_Var_ini   !  "      "   "   "      "  DOM
 #endif
-                           CALL     dom_init( Nbb, Nnn, Naa, "OCE") ! Domain
-      IF( ln_crs       )   CALL     crs_init(      Nnn )       ! coarsened grid: domain initialization 
+                           CALL     dom_init( Nbb, Nnn, Naa, "OCE")   ! Domain
+      IF( ln_crs       )   CALL     crs_init(      Nnn            )   ! coarsened grid: domain initialization 
       IF( sn_cfctl%l_prtctl )   &
          &                 CALL prt_ctl_init        ! Print control
@@ -500 +500 @@
       IF( lk_asminc    )   CALL asm_inc_init( Nbb, Nnn, Nrhs )   ! Initialize assimilation increments
       !
-!!st move iom_close(numror) at the end of nemo_init ==> KO
-!!st      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!!st      ! File manipulation at the end of the first time step
-!!st      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<                         
-!!st                                        CALL iom_close( numror )   ! close input  ocean restart file
-!!st         IF(lwm)                        CALL FLUSH    ( numond )   ! flush output namelist oce
-!!st         IF(lwm .AND. numoni /= -1 )    CALL FLUSH    ( numoni )   ! flush output namelist ice (if exist)
-!!st end
-
       IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA
       !