Changeset 5746


Ignore:
Timestamp:
2015-09-15T18:06:54+02:00 (5 years ago)
Author:
rfurner
Message:

changes to name restart files with date instead of time stamp

Location:
branches/UKMO/2014_Surge_Modelling/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/2014_Surge_Modelling/NEMOGCM/CONFIG/AMM7_SURGE/EXP00/namelist_ref

    r5727 r5746  
    3131   nn_leapy    =       0   !  Leap year calendar (1) or not (0) 
    3232   ln_rstart   = .false.   !  start from rest (F) or from a restart file (T) 
     33   ln_rstdate  = .false.   !  Name restart dump by date instead of time step 
    3334   nn_euler    =       1   !  = 0 : start with forward time step if ln_rstart=.true. 
    3435   nn_rstctl   =       0   !  restart control => activated only if ln_rstart = T 
  • branches/UKMO/2014_Surge_Modelling/NEMOGCM/CONFIG/SHARED/namelist_ref

    r4384 r5746  
    3131   nn_leapy    =       0   !  Leap year calendar (1) or not (0) 
    3232   ln_rstart   = .false.   !  start from rest (F) or from a restart file (T) 
     33   ln_rstdate  = .false.   !  Name restart dump by date instead of time step 
    3334   nn_euler    =       1   !  = 0 : start with forward time step if ln_rstart=.true. 
    3435   nn_rstctl   =       0   !  restart control => activated only if ln_rstart = T 
     
    305306   rn_vfac     = 0.        !  multiplicative factor for ocean/ice velocity  
    306307                           !  in the calculation of the wind stress (0.=absolute winds or 1.=relative winds) 
     308   ln_charnock = .false.   ! logical flag for charnock wind stress in surge model(true) or not(false) 
    307309/ 
    308310!----------------------------------------------------------------------- 
     
    11781180   rn_htrmax         =  200.0   ! max. depth of transition range 
    11791181/ 
     1182!----------------------------------------------------------------------- 
     1183&namwad       !   Wetting and Drying namelist 
     1184!----------------------------------------------------------------------- 
     1185   ln_wd = .false.   !: key to turn on/off wetting/drying (T: on, F: off) 
     1186   rn_wdmin1=0.1     !: minimum water depth on dried cells 
     1187   rn_wdmin2 = 0.01  !: tolerrance of minimum water depth on dried cells 
     1188   rn_wdld   = 20.0  !: land elevation below which wetting/drying will be considered 
     1189   nn_wdit   =   10  !: maximum number of iteration for W/D limiter 
     1190/ 
  • branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

    r5066 r5746  
    136136      !!---------------------------------------------------------------------- 
    137137      USE ioipsl 
    138       NAMELIST/namrun/ nn_no   , cn_exp    , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstctl,   & 
     138! Added nn_rstdate, eventually should include separate branch for this 
     139      NAMELIST/namrun/ nn_no   , cn_exp    , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstdate, nn_rstctl,   & 
    139140         &             nn_it000, nn_itend  , nn_date0    , nn_leapy     , nn_istate , nn_stock ,   & 
    140141         &             nn_write, ln_dimgnnn, ln_mskland  , ln_clobber   , nn_chunksz, nn_euler 
     
    172173         WRITE(numout,*) '      file prefix restart output      cn_ocerst_out= ', cn_ocerst_out 
    173174         WRITE(numout,*) '      restart logical                 ln_rstart  = ', ln_rstart 
     175         WRITE(numout,*) '      datestamping of restarts        ln_rstdate = ', ln_rstdate 
    174176         WRITE(numout,*) '      start with forward time step    nn_euler   = ', nn_euler 
    175177         WRITE(numout,*) '      control of time step            nn_rstctl  = ', nn_rstctl 
  • branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

    r3614 r5746  
    2424   USE icb_oce        ! define iceberg arrays 
    2525   USE icbutl         ! iceberg utility routines 
     26! added for ln_rstdate, should include separate branch at later date... 
     27   USE phycst         ! for rday 
     28   USE ioipsl, ONLY : ju2ymds    ! for calendar 
    2629 
    2730   IMPLICIT NONE 
     
    231234      TYPE(iceberg), POINTER :: this 
    232235      TYPE(point)  , POINTER :: pt 
    233       !!---------------------------------------------------------------------- 
    234  
     236! included for ln_rstdate.... 
     237      INTEGER             ::   iyear, imonth, iday 
     238      REAL (wp)           ::   zsec 
     239      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character 
     240      !!---------------------------------------------------------------------- 
     241 
     242      IF ( ln_rstdate ) THEN 
     243         CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )            
     244         WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
     245      ELSE 
     246         IF( kt > 999999999 ) THEN   ;   WRITE(clkt, *       ) kt 
     247         ELSE                        ;   WRITE(clkt, '(i8.8)') kt 
     248         ENDIF 
     249      ENDIF 
     250 
     251! changed for ln_rstdate.... 
    235252      IF( lk_mpp ) THEN 
    236          WRITE(cl_filename,'("icebergs_",I8.8,"_restart_",I4.4,".nc")') kt, narea-1 
     253         !WRITE(cl_filename,'("icebergs_",I8.8,"_restart_",I4.4,".nc")') kt, narea-1 
     254         WRITE(cl_filename,'("icebergs_",A,"_restart_",I4.4,".nc")') TRIM(ADJUSTL(clkt)), narea-1 
    237255      ELSE 
    238          WRITE(cl_filename,'("icebergs_",I8.8,"_restart.nc")') kt 
     256         !WRITE(cl_filename,'("icebergs_",I8.8,"_restart.nc")') kt 
     257         WRITE(cl_filename,'("_icebergs_",A,"_restart.nc")') TRIM(ADJUSTL(clkt)) 
    239258      ENDIF 
    240259      IF (nn_verbose_level >= 0) WRITE(numout,'(2a)') 'icebergs, write_restart: creating ',TRIM(cl_filename) 
  • branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90

    r4624 r5746  
    4343   LOGICAL       ::   ln_clobber       !: clobber (overwrite) an existing file 
    4444   INTEGER       ::   nn_chunksz       !: chunksize (bytes) for NetCDF file (works only with iom_nf90 routines) 
     45! included for rstdate, should be moved to seperate branch! 
     46   LOGICAL       ::   ln_rstdate       !: datestamping of restarts 
    4547#if defined key_netcdf4 
    4648   !!---------------------------------------------------------------------- 
  • branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

    r4334 r5746  
    2525   USE divcur          ! hor. divergence and curl      (div & cur routines) 
    2626   USE sbc_ice, ONLY : lk_lim3 
     27! for ln_rstdate.... 
     28   USE ioipsl, ONLY : ju2ymds    ! for calendar 
    2729 
    2830   IMPLICIT NONE 
     
    5860      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character 
    5961      CHARACTER(LEN=50)   ::   clname   ! ice output restart file name 
     62! Included for ln_rstdate 
     63      INTEGER             ::   iyear, imonth, iday 
     64      REAL (wp)           ::   zsec 
     65 
    6066      !!---------------------------------------------------------------------- 
    6167      ! 
     
    7379      ! except if we write ocean restart files every time step or if an ocean restart file was writen at nitend - 1 
    7480      IF( kt == nitrst - 1 .OR. nstock == 1 .OR. ( kt == nitend .AND. .NOT. lrst_oce ) ) THEN 
    75          ! beware of the format used to write kt (default is i8.8, that should be large enough...) 
    76          IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 
    77          ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst 
     81! changes for ln_rstdate.... 
     82!         ! beware of the format used to write kt (default is i8.8, that should be large enough...) 
     83!         IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 
     84!         ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst 
     85           IF ( ln_rstdate ) THEN 
     86              CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )            
     87              WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
     88           ELSE 
     89              ! beware of the format used to write kt (default is i8.8, that should be large enough...) 
     90              IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 
     91              ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst 
     92              ENDIF 
     93! end 
    7894         ENDIF 
    7995         ! create the file 
Note: See TracChangeset for help on using the changeset viewer.