Changeset 1986 for LMDZ5/trunk/libf/cosp

Timestamp:

Feb 19, 2014, 3:51:00 PM (11 years ago)

Author:

jghattas

Message:

cosp : corrections for compiling with XIOS. Runnig with cosp not tested.
xml : corrected error in field ozone_daylight. Error seen when read_climoz=2.

Location:

LMDZ5/trunk/libf/cosp

Files:

• cosp_output_mod.F90 (modified) (1 diff)
• cosp_output_write_mod.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/cosp/cosp_output_mod.F90

@@ -205 +205 @@
     ! ug déclaration des axes verticaux de chaque fichier:
     if (use_vgrid) then
-      CALL wxios_add_vaxis("height", cosp_nidfiles(iff), Nlevout, vgrid%z)
+      CALL wxios_add_vaxis("height", cosp_outfilenames(iff), Nlevout, vgrid%z)
     else
-      CALL wxios_add_vaxis("presnivs", cosp_nidfiles(iff), Nlevout, presnivs)
+      CALL wxios_add_vaxis("presnivs", cosp_outfilenames(iff), Nlevout, presnivs)
     endif
-    CALL wxios_add_vaxis("height_mlev", cosp_nidfiles(iff), Nlevlmdz, vgrid%mz)
-    CALL wxios_add_vaxis("sza", cosp_nidfiles(iff), PARASOL_NREFL, PARASOL_SZA)
-    CALL wxios_add_vaxis("pressure2", cosp_nidfiles(iff), 7, ISCCP_PC)
-    CALL wxios_add_vaxis("column", cosp_nidfiles(iff), Ncolumns, column_ax)
+    CALL wxios_add_vaxis("height_mlev", cosp_outfilenames(iff), Nlevlmdz, vgrid%mz)
+    CALL wxios_add_vaxis("sza", cosp_outfilenames(iff), PARASOL_NREFL, PARASOL_SZA)
+    CALL wxios_add_vaxis("pressure2", cosp_outfilenames(iff), 7, ISCCP_PC)
+    CALL wxios_add_vaxis("column", cosp_outfilenames(iff), Ncolumns, column_ax)
 #endif
 

LMDZ5/trunk/libf/cosp/cosp_output_write_mod.F90

@@ -22 +22 @@
 #ifdef CPP_XIOS
     ! ug Pour les sorties XIOS
-        USE wxios
-    USE xios
+    USE wxios
 #endif
 
@@ -244 +243 @@
     use iophy
     USE mod_phys_lmdz_para
+#ifdef CPP_XIOS
+  USE wxios
+#endif
 
     IMPLICIT NONE
@@ -277 +279 @@
 
 #ifdef CPP_XIOS
-        CALL wxios_add_field_to_file(var%name, 2, cosp_nidfiles(iff),
-cosp_outfilenames(iff), &
-        var%description, var%unit, var%cles(iff), typeecrit)
+        CALL wxios_add_field_to_file(var%name, 2, cosp_nidfiles(iff), cosp_outfilenames(iff), &
+        var%description, var%unit, 1, typeecrit)
 #endif
        IF ( var%cles(iff) ) THEN
@@ -294 +295 @@
     use iophy
     USE mod_phys_lmdz_para
+
+#ifdef CPP_XIOS
+  USE wxios
+#endif
+
 
     IMPLICIT NONE
@@ -352 +358 @@
 
 #ifdef CPP_XIOS
-        CALL wxios_add_field_to_file(nom, 3, cosp_nidfiles(iff),
-cosp_outfilenames(iff), &
-        var%description, var%unit, var%flag(iff), typeecrit)
+        CALL wxios_add_field_to_file(nom, 3, cosp_nidfiles(iff), cosp_outfilenames(iff), &
+        var%description, var%unit, 1, typeecrit)
 #endif
        IF ( var%cles(iff) ) THEN
@@ -439 +444 @@
 
 #ifdef CPP_XIOS
-! USE WXIOS
+ USE WXIOS
 #endif