Changeset 2080 for LMDZ5/trunk/libf/cosp/cosp_output_mod.F90

Timestamp:

Jul 7, 2014, 4:48:37 PM (10 years ago)

Author:

idelkadi

Message:

• Rajout des derictives OPENMP pour lire les fichiers namelists
• Corrections dans la re-ecriture des sorties (traitement des valeurs indefinies)
• Suppression des parametres non utilises des namelists

File:

• LMDZ5/trunk/libf/cosp/cosp_output_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/cosp/cosp_output_mod.F90

@@ -80 +80 @@
 !   LOGICAL, SAVE :: cosp_varsdefined = .FALSE. ! ug PAS THREADPRIVATE ET C'EST NORMAL
   LOGICAL, SAVE        :: cosp_varsdefined
-  INTEGER, save        :: Nlevout,Ncolout
-!$OMP THREADPRIVATE(Nlevout) 
 
 CONTAINS
@@ -130 +128 @@
     WRITE(lunout,*) 'Debut cosp_output_mod.F90'
     ! Initialisations (Valeurs par defaut)
-    Nlevout = vgrid%Nlvgrid
-    Ncolout = Ncolumns
 
     do ii=1,Ncolumns
@@ -188 +184 @@
        if (use_vgrid) then
 ! Axe vertical Cosp 40 niveaux (en m)
-      CALL histvert(cosp_nidfiles(iff),"height","height","m",Nlevout,vgrid%z,nvert(iff))
+      CALL histvert(cosp_nidfiles(iff),"height","height","m",vgrid%Nlvgrid,vgrid%z,nvert(iff))
        else
 ! Axe vertical modele LMDZ presnivs
-      CALL histvert(cosp_nidfiles(iff),"presnivs","Vertical levels","Pa",Nlevout,presnivs,nvert(iff),"down")
+      CALL histvert(cosp_nidfiles(iff),"presnivs","Vertical levels","Pa",vgrid%Nlvgrid,presnivs,nvert(iff),"down")
        endif
 ! Axe vertical niveaux modele (en m)
@@ -205 +201 @@
     ! ug déclaration des axes verticaux de chaque fichier:
     if (use_vgrid) then
-      CALL wxios_add_vaxis("height", cosp_outfilenames(iff), Nlevout, vgrid%z)
+      CALL wxios_add_vaxis("height", cosp_outfilenames(iff), vgrid%Nlvgrid, vgrid%z)
     else
-      CALL wxios_add_vaxis("presnivs", cosp_outfilenames(iff), Nlevout, presnivs)
+      CALL wxios_add_vaxis("presnivs", cosp_outfilenames(iff), vgrid%Nlvgrid, presnivs)
     endif
     CALL wxios_add_vaxis("height_mlev", cosp_outfilenames(iff), Nlevlmdz, vgrid%mz)