Changeset 996 for LMDZ4/trunk/libf/phylmd/oasis.F90

Timestamp:

Sep 9, 2008, 3:22:23 PM (16 years ago)

Author:

lsce

Message:

• Modifications liées au calcul des nouveau sous-fractions
• Nettoyage de ocean slab : il reste uniquement la version avec glace de mer forcé
• Nouveaux variables pour distiguer la version et type d'ocean : type_ocean=force/slab/couple, version_ocean=opa8/nemo pour couplé ou version_ocean=sicOBS pour slab

JG

File:

• LMDZ4/trunk/libf/phylmd/oasis.F90 (modified) (6 diffs)

LMDZ4/trunk/libf/phylmd/oasis.F90

@@ -44 +44 @@
   !$OMP THREADPRIVATE(out_var_id)
 
-  CHARACTER(LEN=*),PARAMETER :: OPA_version='OPA9'
 
 #ifdef CPP_COUPLE
@@ -58 +57 @@
 !     LF 09/2003
 !
+    USE surface_data, ONLY : version_ocean
     INCLUDE "dimensions.h"
 
@@ -130 +130 @@
 !     Define symbolic name for fields exchanged from atmos to coupler,
 !         must be the same as (1) of the field  definition in namcouple:
-    IF (OPA_version=='OPA9') THEN
-      cl_writ(1)='COTAUXXU'
-      cl_writ(2)='COTAUYYU'
-      cl_writ(3)='COTAUZZU'
-      cl_writ(4)='COTAUXXV'
-      cl_writ(5)='COTAUYYV'
-      cl_writ(6)='COTAUZZV'
-      cl_writ(7)='COWINDSP'
-      cl_writ(8)='COPEFWAT'
-      cl_writ(9)='COPEFICE'
+
+    cl_writ(1)='COTAUXXU'
+    cl_writ(2)='COTAUYYU'
+    cl_writ(3)='COTAUZZU'
+    cl_writ(4)='COTAUXXV'
+    cl_writ(5)='COTAUYYV'
+    cl_writ(6)='COTAUZZV'
+    cl_writ(7)='COWINDSP'
+    
+    IF (version_ocean=='nemo') THEN
+      cl_writ(8) ='COPEFWAT'
+      cl_writ(9) ='COPEFICE'
       cl_writ(10)='COTOSPSU'
       cl_writ(11)='COICEVAP'
@@ -150 +152 @@
       cl_writ(18)='CRWOCERD'
       cl_writ(19)='CRWOCECD'
-    ELSE IF (OPA_version=='OPA8') THEN
-      cl_writ(1)='COTAUXXU'
-      cl_writ(2)='COTAUYYU'
-      cl_writ(3)='COTAUZZU'
-      cl_writ(4)='COTAUXXV'
-      cl_writ(5)='COTAUYYV'
-      cl_writ(6)='COTAUZZV'
-      cl_writ(7)='COWINDSP'
-      cl_writ(8)='COSHFICE'
-      cl_writ(9)='COSHFOCE'
+    ELSE IF (version_ocean=='opa8') THEN
+      cl_writ(8) ='COSHFICE'
+      cl_writ(9) ='COSHFOCE'
       cl_writ(10)='CONSFICE'
       cl_writ(11)='CONSFOCE'
@@ -170 +165 @@
       cl_writ(18)='CORIVFLU'
       cl_writ(19)='COCALVIN'
-    ELSE
-      STOP 'Bad OPA version for coupled model'
     ENDIF
 
@@ -178 +171 @@
 !         must be the same as (2) of the field  definition in namcouple:
 !
-    IF (OPA_version=='OPA9') THEN
-      cl_read(1)='SISUTESW'
-      cl_read(2)='SIICECOV'
-      cl_read(4)='SIICEALW'
-      cl_read(3)='SIICTEMW'
-    ELSE IF (OPA_version=='OPA8') THEN
-      cl_read(1)='SISUTESW'
-      cl_read(2)='SIICECOV'
-      cl_read(3)='SIICEALW'
-      cl_read(4)='SIICTEMW'
-    ELSE
-      STOP 'Bad OPA version for coupled model'
-    ENDIF
-    
+    IF (version_ocean=='nemo') THEN
+       cl_read(1)='SISUTESW'
+       cl_read(2)='SIICECOV'
+       cl_read(4)='SIICEALW'
+       cl_read(3)='SIICTEMW'
+    ELSE IF (version_ocean=='opa8') THEN
+       cl_read(1)='SISUTESW'
+       cl_read(2)='SIICECOV'
+       cl_read(3)='SIICEALW'
+       cl_read(4)='SIICTEMW'
+    END IF
+
     il_var_nodims(1) = 2
     il_var_nodims(2) = 1