Changeset 2057 for LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

Timestamp:

Jun 16, 2014, 4:33:38 PM (10 years ago)

Author:

Ehouarn Millour

Message:

Preparatory stuff to fix and improve the slab ocean model.
FC

File:

• LMDZ5/trunk/libf/phylmd/conf_phys_m.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -53 +53 @@
     ! type_ocean:      type d'ocean (force, slab, couple)
     ! version_ocean:   version d'ocean (opa8/nemo pour type_ocean=couple ou 
-    !                                   sicOBS pour type_ocean=slab)
+    !                                   sicOBS,sicINT,sicNO pour type_ocean=slab)
     ! ok_veget:   type de modele de vegetation
     ! ok_journe:  sorties journalieres
@@ -1933 +1933 @@
     IF (type_ocean=='slab' .AND. version_ocean=='xxxxxx') THEN
        version_ocean='sicOBS'
-    ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS') THEN
+    ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS' &
+             .AND. version_ocean/='sicINT' .AND. version_ocean/='sicNO') THEN
        WRITE(lunout,*)' ERROR version_ocean=',version_ocean,' not valid with slab ocean'
        CALL abort_gcm('conf_phys','version_ocean not valid',1)