Changeset 3880 for trunk/NEMOGCM/NEMO

Timestamp:

2013-04-22T11:01:39+02:00 (11 years ago)

Author:

cetlod

Message:

v3_5_alpha: bugfix on temporal interpolation of atmospheric pcO2, see ticket #1082

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90

@@ -109 +109 @@
          ! then the first atmospheric CO2 record read is at years(1)
          zyr_dec = REAL( nyear + nn_offset, wp ) + REAL( nday_year, wp ) / REAL( nyear_len(1), wp )
-         jm = 2
-         DO WHILE( jm <= nmaxrec .AND. years(jm-1) < zyr_dec .AND. years(jm) >= zyr_dec ) ;  jm = jm + 1 ;  END DO
+         jm = 1
+         DO WHILE( jm <= nmaxrec .AND. years(jm) < zyr_dec ) ;  jm = jm + 1 ;  END DO
          iind = jm  ;   iindm1 = jm - 1
          zdco2dt = ( atcco2h(iind) - atcco2h(iindm1) ) / ( years(iind) - years(iindm1) + rtrn )
@@ -196 +196 @@
       END DO
 
-      t_oce_co2_flx = t_oce_co2_flx + glob_sum( oce_co2(:,:) )            ! Cumulative Total Flux of Carbon
-      t_atm_co2_flx = glob_sum( satmco2(:,:) * patm(:,:) * e1e2t(:,:) )   ! Total atmospheric pCO2
+      t_oce_co2_flx = t_oce_co2_flx + glob_sum( oce_co2(:,:) )      ! Cumulative Total Flux of Carbon
+      t_atm_co2_flx = glob_sum( satmco2(:,:) * e1e2t(:,:) )         ! Total atmospheric pCO2
 
       IF(ln_ctl)   THEN  ! print mean trends (used for debugging)