Changeset 12633

Timestamp:

2020-03-31T17:46:17+02:00 (4 years ago)

Author:

smasson

Message:

trunk: compile SAS without key_iomput, see #2426

Location:

NEMO/trunk/src

Files:

• ICE/iceistate.F90 (modified) (1 diff)
• SAS/diawri.F90 (modified) (7 diffs)
• SAS/step.F90 (modified) (1 diff)

NEMO/trunk/src/ICE/iceistate.F90

@@ -436 +436 @@
 !!clem: output of initial state should be written here but it is impossible because
 !!      the ocean and ice are in the same file
-!!      CALL dia_wri_state( 'output.init' )
+!!      CALL dia_wri_state( Kmm, 'output.init' )
       !
    END SUBROUTINE ice_istate

NEMO/trunk/src/SAS/diawri.F90

@@ -99 +99 @@
       ! Output the initial state and forcings
       IF( ninist == 1 ) THEN
-         CALL dia_wri_state( 'output.init', Kmm )
+         CALL dia_wri_state( Kmm, 'output.init' )
          ninist = 0
       ENDIF
@@ -126 +126 @@
    END FUNCTION dia_wri_alloc_abl
   
-   SUBROUTINE dia_wri( kt )
+   SUBROUTINE dia_wri( kt, Kmm )
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE dia_wri  ***
@@ -140 +140 @@
       !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
+      INTEGER, INTENT( in ) ::   Kmm  ! ocean time level index
       !!
       LOGICAL ::   ll_print = .FALSE.                        ! =T print and flush numout
@@ -154 +155 @@
       ! Output the initial state and forcings
       IF( ninist == 1 ) THEN                       
-         CALL dia_wri_state( 'output.init' )
+         CALL dia_wri_state( Kmm, 'output.init' )
          ninist = 0
       ENDIF
@@ -257 +258 @@
          IF( ln_abl ) THEN 
          ! Define the ABL grid FILE ( nid_A )
-            CALL dia_nam( clhstnam, nwrite, 'grid_ABL' )
+            CALL dia_nam( clhstnam, nn_write, 'grid_ABL' )
             IF(lwp) WRITE(numout,*) " Name of NETCDF file ", clhstnam    ! filename
             CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,           &  ! Horizontal grid: glamt and gphit
@@ -414 +415 @@
 #endif
 
-   SUBROUTINE dia_wri_state( cdfile_name, Kmm )
+   SUBROUTINE dia_wri_state( Kmm, cdfile_name )
       !!---------------------------------------------------------------------
       !!                 ***  ROUTINE dia_wri_state  ***
@@ -427 +428 @@
       !!      File 'output.abort.nc' is created in case of abnormal job end
       !!----------------------------------------------------------------------
+      INTEGER           , INTENT( in ) ::   Kmm              ! ocean time levelindex
       CHARACTER (len=* ), INTENT( in ) ::   cdfile_name      ! name of the file created
-      INTEGER           , INTENT( in ) ::   Kmm              ! ocean time levelindex
       !!
       INTEGER :: inum

NEMO/trunk/src/SAS/step.F90

@@ -126 +126 @@
       IF( indic < 0  )  THEN
                              CALL ctl_stop( 'step: indic < 0' )
-                             CALL dia_wri_state( 'output.abort', Nnn )
+                             CALL dia_wri_state( Nnn, 'output.abort' )
       ENDIF
       IF( kstp == nit000   ) CALL iom_close( numror )           ! close input  ocean restart file