Changeset 9298 for branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90

Timestamp:

2018-02-01T12:58:33+01:00 (6 years ago)

Author:

jpalmier

Message:

JPALM -- correct the CO2 interpolation for ocean-only; atm CO2 read from file in ocean-only whatever record length; report corrctly what is read in ocean.output

File:

• branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90 (modified) (4 diffs)

branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90

@@ -497 +497 @@
       !! ** Method  : - Read the xco2 file
       !!----------------------------------------------------------------------
-      INTEGER  ::  jn, jl, jm, io, ierr, inum
+      INTEGER  ::  jn, jm, io, ierr, inum
       INTEGER  ::  iskip = 4   ! number of 1st descriptor lines
-      REAL(wp) ::  zyy
+      REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:)   ::   zyy !: xCO2 record years
       CHARACTER (len=10) ::   clname = 'xco2.atm'  !! atm CO2 record file
       !!----------------------------------------------------------------------
@@ -525 +525 @@
       !                                ! Allocate CO2 hist arrays
       ierr = 0 
-      ALLOCATE( hist_pco2(co2_rec), STAT=ierr )
+      ALLOCATE( hist_pco2(co2_rec),zyy(co2_rec), STAT=ierr )
       IF( ierr > 0 ) THEN
          CALL ctl_stop( 'trc_ini_medusa_co2atm: unable to allocate  array' )   ; RETURN
@@ -540 +540 @@
       jn = 1
       DO
-        READ(inum,*, IOSTAT=io) zyy, hist_pco2(jn)
+        READ(inum,*, IOSTAT=io) zyy(jn), hist_pco2(jn)
         IF( io < 0 ) exit
-        IF(jn==1) co2_yinit = int(zyy)
+        IF(jn==1) co2_yinit = zyy(jn)
         jn = jn + 1
       END DO
-      co2_yend = co2_yinit + co2_rec - 1
+      co2_yend = co2_yinit + real(co2_rec) - 1.
 
       IF(lwp) THEN        ! Control print
@@ -553 +553 @@
          WRITE(numout,*) ' Year   xCO2 atm '
          DO jn = 1, co2_rec
-            jl = jn + co2_yinit - 1
-            WRITE(numout, '( 1I4, 6F9.2)') jl, hist_pco2(jn)
+            WRITE(numout, '( 5F7.1, 6F9.2)') zyy(jn), hist_pco2(jn)
          END DO
       ENDIF