Changeset 10817

Timestamp:

2019-03-29T18:23:45+01:00 (6 years ago)

Author:

smasson

Message:

trunk: report [10815] and [10816] from v4

Location:

NEMO/trunk/src

Files:

• OCE/IOM/in_out_manager.F90 (modified) (1 diff)
• OCE/IOM/iom.F90 (modified) (1 diff)
• OCE/LBC/lib_mpp.F90 (modified) (2 diffs)
• TOP/PISCES/trcini_pisces.F90 (modified) (1 diff)
• TOP/trcini.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/IOM/in_out_manager.F90

@@ -119 +119 @@
       INTEGER :: ptimincr  = 1        !: timestep increment to output (time.step and run.stat)
    END TYPE
-   TYPE(sn_ctl) :: sn_cfctl     !: run control structure for selective output
+   TYPE(sn_ctl), SAVE :: sn_cfctl     !: run control structure for selective output, must have SAVE for default init. of sn_ctl
    LOGICAL ::   ln_timing        !: run control for timing
    LOGICAL ::   ln_diacfl        !: flag whether to create CFL diagnostics

NEMO/trunk/src/OCE/IOM/iom.F90

@@ -222 +222 @@
 # endif
 #if defined key_top
-          CALL iom_set_axis_attr( "profsed", paxis = profsed )
+          IF( ALLOCATED(profsed) ) CALL iom_set_axis_attr( "profsed", paxis = profsed )
 #endif
           CALL iom_set_axis_attr( "icbcla", class_num )
-          CALL iom_set_axis_attr( "iax_20C", (/ REAL(20,wp) /) )
-          CALL iom_set_axis_attr( "iax_28C", (/ REAL(28,wp) /) )
+          CALL iom_set_axis_attr( "iax_20C", (/ REAL(20,wp) /) )   ! strange syntaxe and idea...
+          CALL iom_set_axis_attr( "iax_28C", (/ REAL(28,wp) /) )   ! strange syntaxe and idea...
       ENDIF
       !

NEMO/trunk/src/OCE/LBC/lib_mpp.F90

@@ -176 +176 @@
       COMPLEX(wp), POINTER, DIMENSION(:) ::  y1d => NULL()
    END TYPE DELAYARR
-   TYPE( DELAYARR ), DIMENSION(nbdelay), PUBLIC  ::   todelay              
-   INTEGER,          DIMENSION(nbdelay), PUBLIC  ::   ndelayid = -1     !: mpi request id of the delayed operations
+   TYPE( DELAYARR ), DIMENSION(nbdelay), PUBLIC, SAVE  ::   todelay         !: must have SAVE for default initialization of DELAYARR
+   INTEGER,          DIMENSION(nbdelay), PUBLIC        ::   ndelayid = -1   !: mpi request id of the delayed operations
 
    ! timing summary report
@@ -918 +918 @@
          CALL mpi_finalize( info )
       ENDIF
-      IF( .NOT. llfinal ) STOP 123456
+      IF( .NOT. llfinal ) STOP 123
       !
    END SUBROUTINE mppstop

NEMO/trunk/src/TOP/PISCES/trcini_pisces.F90

@@ -275 +275 @@
 
       ! Initialization of the sediment model
-      IF( ln_sediment) THEN
-         CALL sed_init
-      ELSE
-         ALLOCATE( profsed(2) )
-      ENDIF
+      IF( ln_sediment)   CALL sed_init
 
       IF(lwp) WRITE(numout,*) 

NEMO/trunk/src/TOP/trcini.F90

@@ -181 +181 @@
       IF( ln_c14         )   CALL trc_ini_c14        !  C14 model
       IF( ln_age         )   CALL trc_ini_age        !  AGE
-      IF( .NOT.ln_pisces ) ALLOCATE( profsed(2) )
       !
       IF(lwp) THEN                   ! control print