Changeset 1454 for LMDZ5/trunk/libf/phylmd/cpl_mod.F90

Timestamp:

Nov 18, 2010, 1:01:24 PM (14 years ago)

Author:

Laurent Fairhead

Message:

Merge of LMDZ5V1.0-dev branch r1453 into LMDZ5 trunk r1434

---

Fusion entre la version r1453 de la branche de développement LMDZ5V1.0-dev
et le tronc LMDZ5 (r1434)

Location:

LMDZ5/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/cpl_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/cpl_mod.F90

@@ -100 +100 @@
   SUBROUTINE cpl_init(dtime, rlon, rlat)
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, fco2_ocn_day
+    USE surface_data
 
     INCLUDE "dimensions.h"
@@ -270 +271 @@
     ENDIF    ! is_sequential
     
+
+!*************************************************************************************
+! compatibility test
+!
+!*************************************************************************************
+    IF (carbon_cycle_cpl .AND. version_ocean=='opa8') THEN
+       abort_message='carbon_cycle_cpl does not work with opa8'
+       CALL abort_gcm(modname,abort_message,1)
+    END IF
+
   END SUBROUTINE cpl_init