Changeset 10055 for branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_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/trcini_medusa.F90 (modified) (1 diff)

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

@@ -330 +330 @@
       !!----------------------------------------------------------------------
       !! 
+# if defined key_foam_medusa
+      IF( ( .NOT.lk_oasis ) .AND. ( .NOT.lk_pi_co2 ) .AND. ( xobs_xco2a > 0.0 ) ) THEN
+# else
       IF( ( .NOT.lk_oasis ) .AND. ( .NOT.lk_pi_co2 ) ) THEN
+# endif
          IF(lwp) WRITE(numout,*) ' trc_ini_medusa: initialisating atm CO2 record'
          CALL trc_ini_medusa_co2atm