New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6708 – NEMO

Changeset 6708


Ignore:
Timestamp:
2016-06-14T13:16:51+02:00 (8 years ago)
Author:
frrh
Message:

Merge in revisions 6305:6336 inclusive of

branches/UKMO/restart_datestamp

since these were also missing from the original GO6 package branch!

Location:
branches/UKMO/dev_r5518_GO6_package_MEDUSA_temporary/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/dev_r5518_GO6_package_MEDUSA_temporary/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

    r6491 r6708  
    162162      INTEGER             ::   iyear, imonth, iday 
    163163      REAL (wp)           ::   zsec 
     164      REAL (wp)           ::   zfjulday 
    164165      CHARACTER(len=256)  :: cl_path 
    165166      CHARACTER(len=256)  :: cl_filename 
    … …  
    173174      IF( cl_path(LEN_TRIM(cl_path):) /= '/' ) cl_path = TRIM(cl_path) // '/' 
    174175      IF ( ln_rstdate ) THEN 
    175          CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )            
     176         zfjulday = fjulday + rdttra(1) / rday 
     177         IF( ABS(zfjulday - REAL(NINT(zfjulday),wp)) < 0.1 / rday )   zfjulday = REAL(NINT(zfjulday),wp)   ! avoid truncation error 
     178         CALL ju2ymds( zfjulday, iyear, imonth, iday, zsec )            
    176179         WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
    177180      ELSE 

  • branches/UKMO/dev_r5518_GO6_package_MEDUSA_temporary/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

    r6491 r6708  
    5858      INTEGER             ::   iyear, imonth, iday 
    5959      REAL (wp)           ::   zsec 
     60      REAL (wp)           ::   zfjulday 
    6061      !! 
    6162      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step deine as a character 
    … …  
    8687         IF( nitrst <= nitend .AND. nitrst > 0 ) THEN  
    8788            IF ( ln_rstdate ) THEN 
    88                CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )            
     89               zfjulday = fjulday + rdttra(1) / rday 
     90               IF( ABS(zfjulday - REAL(NINT(zfjulday),wp)) < 0.1 / rday )   zfjulday = REAL(NINT(zfjulday),wp)   ! avoid truncation error 
     91               CALL ju2ymds( zfjulday, iyear, imonth, iday, zsec )            
    8992               WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
    9093            ELSE 
Note: See TracChangeset for help on using the changeset viewer.