Changeset 1986


Ignore:
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
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/DefLists/iodef_fields.xml

    r1907 r1986  
    324324        <field id="lcc"    long_name="Cloud liquid fraction at top of cloud"    unit="1" />
    325325        <field id="wvapp"    long_name="-"    unit="-" />
    326         <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
    327326        <field id="albe_ter"    long_name="Albedo VIS surf. ter"    unit="-" />
    328327        <field id="albe_lic"    long_name="Albedo VIS surf. lic"    unit="-" />
    … …  
    387386        <field id="rhum"    long_name="Relative humidity"    unit="-" />
    388387        <field id="ozone"    long_name="Ozone mole fraction"    unit="-" />
     388        <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
    389389        <field id="upwd"    long_name="saturated updraft"    unit="kg/m2/s" />
    390390        <field id="dtphy"    long_name="Physics dT"    unit="K/s" />

  • LMDZ5/trunk/DefLists/iodef_file_histLES.xml

    r1907 r1986  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="10" />
    335334                <field field_ref="albe_lic" level="10" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/trunk/DefLists/iodef_file_histday.xml

    r1907 r1986  
    331331                <field field_ref="lcc" level="6" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="7" />
    335334                <field field_ref="albe_lic" level="7" />
    … …  
    395394                <field field_ref="rhum" level="5" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/trunk/DefLists/iodef_file_histhf.xml

    r1907 r1986  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="7" />
    335334                <field field_ref="albe_lic" level="7" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/trunk/DefLists/iodef_file_histins.xml

    r1907 r1986  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="10" />
    335334                <field field_ref="albe_lic" level="10" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/trunk/DefLists/iodef_file_histmth.xml

    r1907 r1986  
    333333                <field field_ref="lcc" level="2" />
    334334                <field field_ref="wvapp" level="2" />
    335                 <field field_ref="ozone_daylight" level="2" />
    336335                <field field_ref="albe_ter" level="3" />
    337336                <field field_ref="albe_lic" level="3" />
    … …  
    397396                <field field_ref="rhum" level="2" />
    398397                <field field_ref="ozone" level="2" />
     398                <field field_ref="ozone_daylight" level="2" />
    399399                <field field_ref="upwd" level="2" />
    400400                <field field_ref="dtphy" level="2" />

  • LMDZ5/trunk/DefLists/iodef_file_histstn.xml

    r1907 r1986  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="10" />
    335334                <field field_ref="albe_lic" level="10" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/trunk/libf/cosp/cosp_output_mod.F90

    r1926 r1986  
    205205    ! ug déclaration des axes verticaux de chaque fichier:
    206206    if (use_vgrid) then
    207       CALL wxios_add_vaxis("height", cosp_nidfiles(iff), Nlevout, vgrid%z)
     207      CALL wxios_add_vaxis("height", cosp_outfilenames(iff), Nlevout, vgrid%z)
    208208    else
    209       CALL wxios_add_vaxis("presnivs", cosp_nidfiles(iff), Nlevout, presnivs)
     209      CALL wxios_add_vaxis("presnivs", cosp_outfilenames(iff), Nlevout, presnivs)
    210210    endif
    211     CALL wxios_add_vaxis("height_mlev", cosp_nidfiles(iff), Nlevlmdz, vgrid%mz)
    212     CALL wxios_add_vaxis("sza", cosp_nidfiles(iff), PARASOL_NREFL, PARASOL_SZA)
    213     CALL wxios_add_vaxis("pressure2", cosp_nidfiles(iff), 7, ISCCP_PC)
    214     CALL wxios_add_vaxis("column", cosp_nidfiles(iff), Ncolumns, column_ax)
     211    CALL wxios_add_vaxis("height_mlev", cosp_outfilenames(iff), Nlevlmdz, vgrid%mz)
     212    CALL wxios_add_vaxis("sza", cosp_outfilenames(iff), PARASOL_NREFL, PARASOL_SZA)
     213    CALL wxios_add_vaxis("pressure2", cosp_outfilenames(iff), 7, ISCCP_PC)
     214    CALL wxios_add_vaxis("column", cosp_outfilenames(iff), Ncolumns, column_ax)
    215215#endif
    216216

  • LMDZ5/trunk/libf/cosp/cosp_output_write_mod.F90

    r1926 r1986  
    2222#ifdef CPP_XIOS
    2323    ! ug Pour les sorties XIOS
    24         USE wxios
    25     USE xios
     24    USE wxios
    2625#endif
    2726
    … …  
    244243    use iophy
    245244    USE mod_phys_lmdz_para
     245#ifdef CPP_XIOS
     246  USE wxios
     247#endif
    246248
    247249    IMPLICIT NONE
    … …  
    277279
    278280#ifdef CPP_XIOS
    279         CALL wxios_add_field_to_file(var%name, 2, cosp_nidfiles(iff),
    280 cosp_outfilenames(iff), &
    281         var%description, var%unit, var%cles(iff), typeecrit)
     281        CALL wxios_add_field_to_file(var%name, 2, cosp_nidfiles(iff), cosp_outfilenames(iff), &
     282        var%description, var%unit, 1, typeecrit)
    282283#endif
    283284       IF ( var%cles(iff) ) THEN
    … …  
    294295    use iophy
    295296    USE mod_phys_lmdz_para
     297
     298#ifdef CPP_XIOS
     299  USE wxios
     300#endif
     301
    296302
    297303    IMPLICIT NONE
    … …  
    352358
    353359#ifdef CPP_XIOS
    354         CALL wxios_add_field_to_file(nom, 3, cosp_nidfiles(iff),
    355 cosp_outfilenames(iff), &
    356         var%description, var%unit, var%flag(iff), typeecrit)
     360        CALL wxios_add_field_to_file(nom, 3, cosp_nidfiles(iff), cosp_outfilenames(iff), &
     361        var%description, var%unit, 1, typeecrit)
    357362#endif
    358363       IF ( var%cles(iff) ) THEN
    … …  
    439444
    440445#ifdef CPP_XIOS
    441 ! USE WXIOS
     446 USE WXIOS
    442447#endif
    443448
Note: See TracChangeset for help on using the changeset viewer.