Changeset 6737 for branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

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

File:

• branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -62 +62 @@
       
       !                                        !  passive tracer informations
-                             CALL trc_nam_trc
+      CALL trc_nam_trc
       
       !                                        !   Parameters of additional diagnostics
-      IF( .NOT. lk_iomput)   CALL trc_nam_dia
+      CALL trc_nam_dia
 
       !                                        !   namelist of transport
-                             CALL trc_nam_trp
+      CALL trc_nam_trp
 
 
@@ -364 +364 @@
       ENDIF
 
-      IF( ln_diatrc ) THEN 
+      IF( ln_diatrc .AND. .NOT. lk_iomput ) THEN 
          ALLOCATE( trc2d(jpi,jpj,jpdia2d), trc3d(jpi,jpj,jpk,jpdia3d),  &
            &       ctrc2d(jpdia2d), ctrc2l(jpdia2d), ctrc2u(jpdia2d) ,  & 
@@ -375 +375 @@
       ENDIF
 
-      IF( ln_diabio .OR. l_trdtrc ) THEN
+      IF( ( ln_diabio .AND. .NOT. lk_iomput ) .OR. l_trdtrc ) THEN
          ALLOCATE( trbio (jpi,jpj,jpk,jpdiabio) , &
            &       ctrbio(jpdiabio), ctrbil(jpdiabio), ctrbiu(jpdiabio), STAT = ierr )