Changeset 12649 for NEMO/trunk/src/SAS

Timestamp:

2020-04-03T09:11:57+02:00 (4 years ago)

Author:

smasson

Message:

trunk: clean and unique 3rd dimension in iom_rstput, see #2432

File:

• NEMO/trunk/src/SAS/diawri.F90 (modified) (2 diffs)

NEMO/trunk/src/SAS/diawri.F90

@@ -438 +438 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~   and forcing fields file created '
       IF(lwp) WRITE(numout,*) '                and named :', cdfile_name, '...nc'
-
-#if defined key_si3
-     CALL iom_open( TRIM(cdfile_name), inum, ldwrt = .TRUE., kdlev = jpl )
-#else
-     CALL iom_open( TRIM(cdfile_name), inum, ldwrt = .TRUE. )
-#endif
-
+      !
+      CALL iom_open( TRIM(cdfile_name), inum, ldwrt = .TRUE. )
+      !
       CALL iom_rstput( 0, 0, inum, 'votemper', ts (:,:,:,jp_tem,Kmm) )    ! now temperature
       CALL iom_rstput( 0, 0, inum, 'vosaline', ts (:,:,:,jp_sal,Kmm) )    ! now salinity
@@ -457 +453 @@
       CALL iom_rstput( 0, 0, inum, 'sozotaux', utau                  )    ! i-wind stress
       CALL iom_rstput( 0, 0, inum, 'sometauy', vtau                  )    ! j-wind stress
- 
+      !
+      CALL iom_close( inum )
+      !
 #if defined key_si3
       IF( nn_ice == 2 ) THEN   ! condition needed in case agrif + ice-model but no-ice in child grid
+         CALL iom_open( TRIM(cdfile_name)//'_ice', inum, ldwrt = .TRUE., kdlev = jpl, cdcomp = 'ICE' )
          CALL ice_wri_state( inum )
-      ENDIF
-#endif
-      !
-      CALL iom_close( inum )
-      !
+         CALL iom_close( inum )
+      ENDIF
+#endif
+
    END SUBROUTINE dia_wri_state