Changeset 6532 for branches/CNRS/dev_r6526_PISCES_GAS

Timestamp:

2016-05-13T14:53:30+02:00 (8 years ago)

Author:

cetlod

Message:

minor bug corrections

Location:

branches/CNRS/dev_r6526_PISCES_GAS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z

Files:

• p4zflx.F90 (modified) (1 diff)
• p4zopt.F90 (modified) (3 diffs)

branches/CNRS/dev_r6526_PISCES_GAS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90

@@ -42 +42 @@
    CHARACTER(len=34) ::  clname     !: filename of pco2 values
    INTEGER           ::  nn_offset  !: Offset model-data start year (default = 0) 
+#if defined key_gas
+   REAL(wp)          ::  atccos
+   REAL(wp)          ::  atcn2o
+#endif
 
    !!  Variables related to reading atmospheric CO2 time history    

branches/CNRS/dev_r6526_PISCES_GAS/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90

@@ -51 +51 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: emoy           !: averaged PAR in the mixed layer
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: ekb, ekg, ekr  !: wavelength (Red-Green-Blue)
-#ifdef key_gas
-       REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: euv        !: averaged UV in the mixed layer
-       REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: a350       !: wavelength (350 for COS)
-#endif
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: euv        !: averaged UV in the mixed layer
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: a350       !: wavelength (350 for COS)
 
    INTEGER  ::   nksrp   ! levels below which the light cannot penetrate ( depth larger than 391 m)
@@ -415 +413 @@
       !
       NAMELIST/nampisopt/cn_dir, sn_par, ln_varpar, &
-#ifdef key_gas
+#if defined key_gas
                & uvlux, &
 #endif
@@ -501 +499 @@
 
       ALLOCATE( ekb(jpi,jpj,jpk)      , ekr(jpi,jpj,jpk), ekg(jpi,jpj,jpk),   &
-        &       enano(jpi,jpj,jpk)    , ediat(jpi,jpj,jpk), &
-        &       etot_ndcy(jpi,jpj,jpk), emoy (jpi,jpj,jpk), ierr(1) ) 
-
-      IF( lk_gas ) ALLOCATE( euv(jpi,jpj,jpk), a350(jpi,jpj,jpk), ierr(2) )
+        &       enano(jpi,jpj,jpk)    , ediat(jpi,jpj,jpk),                  &
+        &       etot_ndcy(jpi,jpj,jpk), emoy (jpi,jpj,jpk), STAT = ierr(1) ) 
+
+      IF( lk_gas ) ALLOCATE( euv(jpi,jpj,jpk), a350(jpi,jpj,jpk), STAT = ierr(2) )
       
       p4z_opt_alloc = MAXVAL( ierr )