Changeset 10055 for branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90

Timestamp:

2018-08-20T15:17:09+02:00 (6 years ago)

Author:

dford

Message:

Merge in branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc and address conflicts.

File:

• branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90

@@ -105 +105 @@
       USE sbc_oce,                    ONLY: lk_oasis
       USE sms_medusa,                 ONLY: hist_pco2, co2_yinit, co2_yend, &
+# if defined key_foam_medusa
+                                            xobs_xco2a, pgrow_avg,          &
+                                            ploss_avg, phyt_avg, mld_max,   &
+# endif
                                             lk_pi_co2
       USE trc,                        ONLY: ln_rsttr, nittrc000, trn
@@ -330 +334 @@
          !! f_xco2a(:,:) = 284.725       !! CMIP5 pre-industrial pCO2
          f_xco2a(:,:) = 284.317          !! CMIP6 pre-industrial pCO2 
+#  if defined key_foam_medusa
+      ELSEIF ( xobs_xco2a > 0.0 ) THEN
+         IF(lwp) WRITE(numout,*) ' using observed atm pCO2 = ', xobs_xco2a
+         f_xco2a(:,:) = xobs_xco2a
+#  endif
       ELSE      
          !! xCO2 from file
@@ -418 +427 @@
       !! now use the NEMO calendar tool : nsec_month to be sure to call 
       !! at the beginning of a new month .
+#if defined key_foam_medusa
+      !! DAF: For FOAM we want to run daily
+      IF ( (kt == nittrc000 .AND. .NOT.ln_rsttr) .OR.                        &
+           (MOD(kt*rdt, 86400.0) == rdt) ) THEN
+#else
       IF ( (kt == nittrc000 .AND. .NOT.ln_rsttr) .OR.                        &
            ( nsec_month .LE. INT(rdt) ) )  THEN
+#endif
            IF ( lwp )  WRITE(numout,*)                                       &         
                               ' *** 3D carb chem call *** -- kt:', kt,       &