Changeset 9248

Timestamp:

2018-01-16T17:41:18+01:00 (6 years ago)

Author:

cetlod

Message:

dev2017 : Minor correction in p4Zflx

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90

@@ -249 +249 @@
          WRITE(numout,*) '      reading in the atm pCO2 file or constant value   ln_co2int =', ln_co2int
       ENDIF
-
-!!gm  BUG !!!   ===>>>  ln_presatm and ln_presatmco2 are used below, but read in namelist 
-!!gm                    at the end of the routine via a CALL to CALL p4z_patm( nit000 )
-
-     IF( .NOT.ln_co2int .AND. .NOT.ln_presatmco2 ) THEN
+      !
+      CALL p4z_patm( nit000 )
+      !
+      IF( .NOT.ln_co2int .AND. .NOT.ln_presatmco2 ) THEN
          IF(lwp) THEN                         ! control print
             WRITE(numout,*) '         Constant Atmospheric pCO2 value               atcco2    =', atcco2
@@ -281 +280 @@
          CLOSE(numco2)
       ELSEIF( .NOT.ln_co2int .AND. ln_presatmco2 ) THEN
-         IF(lwp)  THEN
-            WRITE(numout,*) '    Spatialized Atmospheric pCO2 from an external file'
-         ENDIF
+         IF(lwp) WRITE(numout,*) '    Spatialized Atmospheric pCO2 from an external file'
       ELSE
-         IF(lwp)  THEN
-            WRITE(numout,*) '    Spatialized Atmospheric pCO2 from an external file'
-         ENDIF
+         IF(lwp) WRITE(numout,*) '    Spatialized Atmospheric pCO2 from an external file'
       ENDIF
       !
@@ -293 +288 @@
       t_oce_co2_flx = 0._wp
       t_atm_co2_flx = 0._wp
-      !
-      CALL p4z_patm( nit000 )
       !
    END SUBROUTINE p4z_flx_init