Ignore:
Timestamp:
2019-08-06T17:59:22+02:00 (21 months ago)
Author:
gsamson
Message:

dev_r11265_ABL : see #2131

  • merge src and cfgs from HPC-13_IRRMANN_BDY_optimization branch @ r11402 with dev_r11265_ABL branch @ r11363
  • change ORCA2 results due to ice rheology "cleaning" (see commit r11377)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/SAS/diawri.F90

    r11357 r11413  
    137137      !!      define all the NETCDF files and fields 
    138138      !!      At each time step call histdef to compute the mean if ncessary 
    139       !!      Each nwrite time step, output the instantaneous or mean fields 
     139      !!      Each nn_write time step, output the instantaneous or mean fields 
    140140      !!---------------------------------------------------------------------- 
    141141      !! 
     
    152152      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: zw3d_abl   ! ABL 3D workspace 
    153153      !!---------------------------------------------------------------------- 
    154       !  
    155       IF( ln_timing )   CALL timing_start('dia_wri') 
    156154      ! 
    157155      ! Output the initial state and forcings 
     
    161159      ENDIF 
    162160      ! 
     161      IF( nn_write == -1 )   RETURN   ! we will never do any output 
     162      !  
     163      IF( ln_timing )   CALL timing_start('dia_wri') 
     164      ! 
    163165      ! 0. Initialisation 
    164166      ! ----------------- 
     
    173175      ENDIF 
    174176#if defined key_diainstant 
    175       zsto = nwrite * rdt 
     177      zsto = nn_write * rdt 
    176178      clop = "inst("//TRIM(clop)//")" 
    177179#else 
     
    179181      clop = "ave("//TRIM(clop)//")" 
    180182#endif 
    181       zout = nwrite * rdt 
     183      zout = nn_write * rdt 
    182184      zmax = ( nitend - nit000 + 1 ) * rdt 
    183185 
     
    211213         ! WRITE root name in date.file for use by postpro 
    212214         IF(lwp) THEN 
    213             CALL dia_nam( clhstnam, nwrite,' ' ) 
     215            CALL dia_nam( clhstnam, nn_write,' ' ) 
    214216            CALL ctl_opn( inum, 'date.file', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea ) 
    215217            WRITE(inum,*) clhstnam 
     
    219221         ! Define the T grid FILE ( nid_T ) 
    220222 
    221          CALL dia_nam( clhstnam, nwrite, 'grid_T' ) 
     223         CALL dia_nam( clhstnam, nn_write, 'grid_T' ) 
    222224         IF(lwp) WRITE(numout,*) " Name of NETCDF file ", clhstnam    ! filename 
    223225         CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,           &  ! Horizontal grid: glamt and gphit 
     
    231233         ! Define the U grid FILE ( nid_U ) 
    232234 
    233          CALL dia_nam( clhstnam, nwrite, 'grid_U' ) 
     235         CALL dia_nam( clhstnam, nn_write, 'grid_U' ) 
    234236         IF(lwp) WRITE(numout,*) " Name of NETCDF file ", clhstnam    ! filename 
    235237         CALL histbeg( clhstnam, jpi, glamu, jpj, gphiu,           &  ! Horizontal grid: glamu and gphiu 
     
    243245         ! Define the V grid FILE ( nid_V ) 
    244246 
    245          CALL dia_nam( clhstnam, nwrite, 'grid_V' )                   ! filename 
     247         CALL dia_nam( clhstnam, nn_write, 'grid_V' )                   ! filename 
    246248         IF(lwp) WRITE(numout,*) " Name of NETCDF file ", clhstnam 
    247249         CALL histbeg( clhstnam, jpi, glamv, jpj, gphiv,           &  ! Horizontal grid: glamv and gphiv 
     
    349351      ! donne le nombre d'elements, et ndex la liste des indices a sortir 
    350352 
    351       IF( lwp .AND. MOD( itmod, nwrite ) == 0 ) THEN  
     353      IF( lwp .AND. MOD( itmod, nn_write ) == 0 ) THEN  
    352354         WRITE(numout,*) 'dia_wri : write model outputs in NetCDF files at ', kt, 'time-step' 
    353355         WRITE(numout,*) '~~~~~~ ' 
Note: See TracChangeset for help on using the changeset viewer.