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 6737 – NEMO

Changeset 6737


Ignore:
Timestamp:
2016-06-24T11:00:27+02:00 (8 years ago)
Author:
malcolmroberts
Message:

Bug fixes from Tim's local GO6 package to fix age tracer output file naming

Location:
branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

    r6731 r6737  
    6262       
    6363      !                                        !  passive tracer informations 
    64                              CALL trc_nam_trc 
     64      CALL trc_nam_trc 
    6565       
    6666      !                                        !   Parameters of additional diagnostics 
    67       IF( .NOT. lk_iomput)   CALL trc_nam_dia 
     67      CALL trc_nam_dia 
    6868 
    6969      !                                        !   namelist of transport 
    70                              CALL trc_nam_trp 
     70      CALL trc_nam_trp 
    7171 
    7272 
     
    364364      ENDIF 
    365365 
    366       IF( ln_diatrc ) THEN  
     366      IF( ln_diatrc .AND. .NOT. lk_iomput ) THEN  
    367367         ALLOCATE( trc2d(jpi,jpj,jpdia2d), trc3d(jpi,jpj,jpk,jpdia3d),  & 
    368368           &       ctrc2d(jpdia2d), ctrc2l(jpdia2d), ctrc2u(jpdia2d) ,  &  
     
    375375      ENDIF 
    376376 
    377       IF( ln_diabio .OR. l_trdtrc ) THEN 
     377      IF( ( ln_diabio .AND. .NOT. lk_iomput ) .OR. l_trdtrc ) THEN 
    378378         ALLOCATE( trbio (jpi,jpj,jpk,jpdiabio) , & 
    379379           &       ctrbio(jpdiabio), ctrbil(jpdiabio), ctrbiu(jpdiabio), STAT = ierr )  
  • branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

    r6486 r6737  
    2727   USE trcnam_trp 
    2828   USE iom 
     29   USE in_out_manager , ONLY : ln_rstdate 
    2930   USE daymod 
    3031   IMPLICIT NONE 
     
    4849      !!---------------------------------------------------------------------- 
    4950      INTEGER, INTENT(in) ::   kt       ! number of iteration 
     51      INTEGER             ::   iyear, imonth, iday 
     52      REAL (wp)           ::   zsec 
    5053      ! 
    5154      CHARACTER(LEN=20)   ::   clkt     ! ocean time-step define as a character 
     
    7881      ! except if we write tracer restart files every tracer time step or if a tracer restart file was writen at nitend - 2*nn_dttrc + 1 
    7982      IF( kt == nitrst - 2*nn_dttrc .OR. nstock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN 
    80          ! beware of the format used to write kt (default is i8.8, that should be large enough) 
    81          IF( nitrst > 1.0e9 ) THEN   ;   WRITE(clkt,*       ) nitrst 
    82          ELSE                        ;   WRITE(clkt,'(i8.8)') nitrst 
     83         IF ( ln_rstdate ) THEN 
     84            CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )            
     85            WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
     86         ELSE 
     87            ! beware of the format used to write kt (default is i8.8, that should be large enough...) 
     88            IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 
     89            ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst 
     90            ENDIF 
    8391         ENDIF 
    8492         ! create the file 
Note: See TracChangeset for help on using the changeset viewer.