Ignore:
Timestamp:
2020-04-03T09:11:57+02:00 (8 months ago)
Author:
smasson
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/SAS/diawri.F90

    r12633 r12649  
    438438      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~   and forcing fields file created ' 
    439439      IF(lwp) WRITE(numout,*) '                and named :', cdfile_name, '...nc' 
    440  
    441 #if defined key_si3 
    442      CALL iom_open( TRIM(cdfile_name), inum, ldwrt = .TRUE., kdlev = jpl ) 
    443 #else 
    444      CALL iom_open( TRIM(cdfile_name), inum, ldwrt = .TRUE. ) 
    445 #endif 
    446  
     440      ! 
     441      CALL iom_open( TRIM(cdfile_name), inum, ldwrt = .TRUE. ) 
     442      ! 
    447443      CALL iom_rstput( 0, 0, inum, 'votemper', ts (:,:,:,jp_tem,Kmm) )    ! now temperature 
    448444      CALL iom_rstput( 0, 0, inum, 'vosaline', ts (:,:,:,jp_sal,Kmm) )    ! now salinity 
     
    457453      CALL iom_rstput( 0, 0, inum, 'sozotaux', utau                  )    ! i-wind stress 
    458454      CALL iom_rstput( 0, 0, inum, 'sometauy', vtau                  )    ! j-wind stress 
    459   
     455      ! 
     456      CALL iom_close( inum ) 
     457      ! 
    460458#if defined key_si3 
    461459      IF( nn_ice == 2 ) THEN   ! condition needed in case agrif + ice-model but no-ice in child grid 
     460         CALL iom_open( TRIM(cdfile_name)//'_ice', inum, ldwrt = .TRUE., kdlev = jpl, cdcomp = 'ICE' ) 
    462461         CALL ice_wri_state( inum ) 
    463       ENDIF 
    464 #endif 
    465       ! 
    466       CALL iom_close( inum ) 
    467       ! 
     462         CALL iom_close( inum ) 
     463      ENDIF 
     464#endif 
     465 
    468466   END SUBROUTINE dia_wri_state 
    469467 
Note: See TracChangeset for help on using the changeset viewer.