Commit 57f1d4ee authored by HOURDIN Christophe's avatar HOURDIN Christophe
Browse files

changes for XIOS

parent 29397f5f
This diff is collapsed.
This diff is collapsed.
......@@ -19,7 +19,9 @@
<field id="Vtransform" long_name="vertical terrain-following transformation equation" />
</field_group>
#endif
<!-- T grid -->
<!--------------------------------------- T grid ----------------------------------------->
<field_group id="rho" grid_ref="rho_2D">
<field id="h" long_name="bathymetry at RHO-points" unit="meter" />
#ifdef WET_DRY
......@@ -309,6 +311,8 @@
#endif
</field_group>
<!--------------------------------------- SEDIMENT ----------------------------------------->
#ifdef SEDIMENT
<!-- SEDIMENT -->
<field_group id="b" grid_ref="b_2D">
......@@ -322,7 +326,8 @@
<!-- END SEDIMENT -->
#endif
<!-- U grid -->
<!--------------------------------------- U grid ----------------------------------------->
<field_group id="u" grid_ref="u_2D">
#ifdef SPHERICAL
<field id="lon_u" long_name="longitude of U-points" unit="degree_east" />
......@@ -354,7 +359,8 @@
#endif
</field_group>
<!-- V grid -->
<!--------------------------------------- V grid ----------------------------------------->
<field_group id="v" grid_ref="v_2D">
#ifdef SPHERICAL
<field id="lon_v" long_name="longitude of V-points" unit="degree_east" />
......@@ -386,7 +392,8 @@
#endif
</field_group>
<!-- W grid -->
<!--------------------------------------- W grid ----------------------------------------->
<field_group id="w" grid_ref="w_2D">
<field id="omega" long_name="S-coordinate vertical momentum component" unit="meter second-1" grid_ref="w_3D"/>
#ifdef MRL_WCI
......@@ -414,6 +421,8 @@
</field_group>
<!--------------------------------------- DIAGS ----------------------------------------->
#ifdef DIAGNOSTICS_UV
<field_group id="u_diaM" grid_ref="u_3D">
<field id="u_rate" long_name="u rate" unit="meter second-2" grid_ref="u_3D"/>
......
......@@ -8,234 +8,88 @@
<file_group id="1mo" output_freq="1mo" output_level="10" enabled=".false."/> <!-- real montly files -->
<file_group id="1y" output_freq="1y" output_level="10" enabled=".false."/> <!-- real yearly files -->
<file_group id="12h" output_freq="12h" output_level="10" enabled=".false.">
<file id="file1" name_suffix="_inst.1" >
<field_group id="grid_fields1" operation="once">
<field field_ref="hc" />
<field field_ref="theta_s" />
<field field_ref="theta_b" />
<field field_ref="Tcline" />
<field field_ref="Vtransform"/>
<field field_ref="h" />
<field field_ref="f" />
<field field_ref="pm" />
<field field_ref="pn" />
<field field_ref="lon_rho" />
<field field_ref="lat_rho" />
<field field_ref="lon_u" />
<field field_ref="lat_u" />
<field field_ref="lon_v" />
<field field_ref="lat_v" />
<field field_ref="angle" />
<field field_ref="mask_rho" />
<field field_ref="Cs_r" />
<field field_ref="sc_r" />
<field field_ref="Cs_w" />
<field field_ref="sc_w" />
</field_group>
<field_group id="inst_fields" operation="instant">
<field field_ref="zeta" />
<field field_ref="ubar" />
<field field_ref="vbar" />
<field field_ref="sustr"/>
<field field_ref="svstr"/>
<field field_ref="u" />
<field field_ref="v" />
<field field_ref="w" />
<field field_ref="temp" />
<field field_ref="salt" />
<field field_ref="rho" />
<field field_ref="bvf" />
</field_group>
</file>
</file_group>
<file_group id="5d" output_freq="2ts" output_level="10" enabled=".true.">
<file id="file2" name_suffix="_dyn.1" >
<field_group id="grid_fields2" operation="once">
<field field_ref="hc" />
<field field_ref="theta_s" />
<field field_ref="theta_b" />
<field field_ref="Tcline" />
<field field_ref="Vtransform"/>
<field field_ref="h" />
<field field_ref="lon_rho" />
<field field_ref="lat_rho" />
</field_group>
<field_group id="avg_fields" operation="average">
<field field_ref="zeta" />
<field field_ref="ubar" />
<field field_ref="vbar" />
<field field_ref="sustr"/>
<field field_ref="svstr"/>
<field field_ref="u" />
<field field_ref="v" />
<field field_ref="w" />
<field field_ref="temp" />
<field field_ref="salt" />
<field field_ref="rho" />
<field field_ref="bvf" />
</field_group>
</file>
</file_group>
<file_group id="1h" output_freq="1h" output_level="10" enabled=".false." >
<file id="file3" name_suffix="_inst_surf.1" >
<field field_ref="h" operation="once"/>
<field_group id="surf_fields" operation="instant">
<field field_ref="zeta" name="zeta" />
<field field_ref="u_surf" name="u" />
<field field_ref="v_surf" name="v" />
<field field_ref="temp_surf" name="temp" />
<field field_ref="salt_surf" name="salt" />
<!--field field_ref="shflx" />
<field field_ref="swflx" />
<field field_ref="radsw" />
<field field_ref="shflx_rlw" />
<field field_ref="shflx_lat" />
<field field_ref="shflx_sen" /-->
</field_group>
</file>
</file_group>
<!-- -->
<file_group id="PISCES" output_freq="2ts" output_level="10" enabled=".<use_pisces>.">
<file id="file30" name_suffix="_pisces.1" >
<field_group group_ref="grid_fields2" />
<field_group id="pisces_fields" operation="average">
<field field_ref="DIC" name="DIC"/>
<field field_ref="Alkalini" name="Alkalini" />
<field field_ref="Fer" name="Fer" />
<field field_ref="PO4" name="PO4" />
<field field_ref="O2" name="O2" />
<field field_ref="Si" name="Si" />
<field field_ref="DOC" name="DOC" />
<field field_ref="NO3" name="NO3" />
<field field_ref="NCHL" name="NCHL" />
<field field_ref="DCHL" name="DCHL" />
<field field_ref="PPPHY" name="PPPHY" />
<field field_ref="PPPHY2" name="PPPHY2" />
<field field_ref="LGW" name="LGW" />
</field_group>
</file>
<file id="file31" name_suffix="_pisces_diag.1">
<field_group group_ref="grid_fields2" />
<field_group id="pisces_diag_fields" operation="average">
<field field_ref="PH" name="PH" />
<field field_ref="CO3" name="CO3" />
<field field_ref="CO3sat" name="CO3sat" />
<field field_ref="PAR" name="PAR" />
<field field_ref="PPPHY" name="PPN" />
<field field_ref="PPPHY2" name="PPD" />
<field field_ref="PPNEWN" name="PN" />
<field field_ref="PPNEWD" name="PD" />
<field field_ref="PBSi" name="PBSi" />
<field field_ref="PFeN" name="PFeN" />
<field field_ref="PFeD" name="PFeD" />
<field field_ref="Grazing" name="grapoc" />
<field field_ref="Grazing2" name="grapoc2" />
<field field_ref="Nitrifo2" name="Nito2" />
<field field_ref="PPNEWo2" name="NPo2" />
<field field_ref="PPRego2" name="RPo2" />
<field field_ref="Remino2" name="Remo2" />
<field field_ref="MicroZo2" name="Mico2" />
<field field_ref="MesoZo2" name="Mso2" />
<field field_ref="Nfixo2" name="Fixo2" />
<field field_ref="Cflx" name="Cflx" />
<field field_ref="Oflx" name="Oflx" />
<field field_ref="Kg" name="Kg" />
<field field_ref="Heup" name="Zmeu" />
<field field_ref="Irondep" name="Fedep" />
<field field_ref="Nfix" name="Nfix"/>
<field field_ref="Ironsed" name="Fesed"/>
</field_group>
</file>
</file_group>
<!-- END -->
<file_group id="z1h" output_freq="1h" output_level="10" enabled=".false.">
<file id="file11" name="zoom1">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "zoom_1_grid_T" operation="once"/>
<field_group id="inst_fields_zoom_1" operation="instant">
<field field_ref="zeta" grid_ref= "zoom_1_grid_T" />
<field field_ref="temp" grid_ref= "zoom_1_grid_T3D"/>
<field field_ref="salt" grid_ref= "zoom_1_grid_T3D"/>
<field field_ref="u" grid_ref= "zoom_1_grid_U3D"/>
<field field_ref="v" grid_ref= "zoom_1_grid_V3D"/>
</field_group>
</file>
<file id="file12" name="zoom2">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "zoom_2_grid_T" operation="once"/>
<field_group id="inst_fields_zoom_2" operation="instant">
<field field_ref="zeta" grid_ref= "zoom_2_grid_T" />
<field field_ref="temp" grid_ref= "zoom_2_grid_T3D"/>
<field field_ref="salt" grid_ref= "zoom_2_grid_T3D"/>
<field field_ref="u" grid_ref= "zoom_2_grid_U3D"/>
<field field_ref="v" grid_ref= "zoom_2_grid_V3D"/>
</field_group>
</file>
</file_group>
<file_group id="10min" output_freq="600s" output_level="10" enabled=".false.">
<file id="file21" name="BR08">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_01_grid_T" operation="once"/>
<field_group id="inst_fields_PT_01" operation="instant">
<field field_ref="zeta" grid_ref= "PT_01_grid_T" />
<field field_ref="temp" grid_ref= "PT_01_grid_T3D"/>
<field field_ref="salt" grid_ref= "PT_01_grid_T3D"/>
<field field_ref="u" grid_ref= "PT_01_grid_U3D"/>
<field field_ref="v" grid_ref= "PT_01_grid_V3D"/>
</field_group>
</file>
<file id="file22" name="RO16">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_02_grid_T" operation="once"/>
<field_group id="inst_fields_PT_02" operation="instant">
<field field_ref="zeta" grid_ref= "PT_02_grid_T" />
<field field_ref="temp" grid_ref= "PT_02_grid_T3D"/>
<field field_ref="salt" grid_ref= "PT_02_grid_T3D"/>
<field field_ref="u" grid_ref= "PT_02_grid_U3D"/>
<field field_ref="v" grid_ref= "PT_02_grid_V3D"/>
</field_group>
</file>
<file id="file23" name="MARL">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_03_grid_T" operation="once"/>
<field_group id="inst_fields_PT_03" operation="instant">
<field field_ref="zeta" grid_ref= "PT_03_grid_T" />
<field field_ref="temp" grid_ref= "PT_03_grid_T3D"/>
<field field_ref="salt" grid_ref= "PT_03_grid_T3D"/>
<field field_ref="u" grid_ref= "PT_03_grid_U3D"/>
<field field_ref="v" grid_ref= "PT_03_grid_V3D"/>
</field_group>
</file>
<file id="file24" name="ELOR">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_04_grid_T" operation="once"/>
<field_group id="inst_fields_PT_04" operation="instant">
<field field_ref="zeta" grid_ref= "PT_04_grid_T" />
<field field_ref="temp" grid_ref= "PT_04_grid_T3D"/>
<field field_ref="salt" grid_ref= "PT_04_grid_T3D"/>
<field field_ref="u" grid_ref= "PT_04_grid_U3D"/>
<field field_ref="v" grid_ref= "PT_04_grid_V3D"/>
</field_group>
</file>
<file id="file25" name="PORT">
<field field_ref="h" grid_ref= "PT_05_grid_T" operation="once"/>
<field field_ref="zeta" grid_ref= "PT_05_grid_T" operation="instant"/>
</file>
</file_group>
<file_group id="5d" output_freq="2ts" output_level="10" enabled=".true.">
<file id="file2" name_suffix="_avg.1" >
<field_group id="grid_fields2" operation="once">
<field field_ref="time" />
<field field_ref="hc" />
<field field_ref="theta_s" />
<field field_ref="theta_b" />
<field field_ref="Tcline" />
<field field_ref="Vtransform"/>
<field field_ref="h" />
<field field_ref="f" />
<field field_ref="pm" />
<field field_ref="pn" />
<field field_ref="lon_rho" />
<field field_ref="lat_rho" />
<field field_ref="lon_u" />
<field field_ref="lat_u" />
<field field_ref="lon_v" />
<field field_ref="lat_v" />
<field field_ref="angle" />
<field field_ref="mask_rho" />
</field_group>
<field_group id="avg_fields" operation="average">
<!-- ajouts Steph -->
<field field_ref="bostr" />
<field field_ref="wstr" />
<field field_ref="hbl" />
<field field_ref="shflx" name="shflux" />
<field field_ref="swflx" name="swflx" />
<field field_ref="radsw" />
<field field_ref="shflx_rlw" />
<field field_ref="visc3d" />
<field field_ref="diff3d" />
<!-- ajouts Chris? -->
<field field_ref="shflx_lat" />
<field field_ref="shflx_sen" />
<field field_ref="zeta" />
<field field_ref="ubar" />
<field field_ref="vbar" />
<field field_ref="sustr"/>
<field field_ref="svstr"/>
<field field_ref="u" />
<field field_ref="v" />
<field field_ref="w" />
<field field_ref="temp" />
<field field_ref="salt" />
<field field_ref="rho" />
<field field_ref="bvf" />
<!-- pisces : 24 traceurs + ligand / renommés pour Steph -->
<field field_ref="DIC" name="DIC"/>
<field field_ref="Alkalini" name="TALK"/>
<field field_ref="CaCO3" name="CACO3"/>
<field field_ref="Fer" name="FER"/>
<field field_ref="PO4" />
<field field_ref="O2" />
<field field_ref="Si" />
<field field_ref="DOC" />
<field field_ref="NO3" />
<field field_ref="NCHL" />
<field field_ref="DCHL" />
<field field_ref="POC" />
<field field_ref="GOC" />
<field field_ref="PHY" name="NANO"/>
<field field_ref="PHY2" name="DIA"/>
<field field_ref="ZOO" />
<field field_ref="ZOO2" name="MESO"/>
<field field_ref="DSi" name="DSI"/>
<field field_ref="BSi" name="BSI"/>
<field field_ref="BFe" name="BFE"/>
<field field_ref="DFe" name="DFE"/>
<field field_ref="SFe" name="SFE"/>
<field field_ref="NFe" name="NFE"/>
<field field_ref="NH4" />
<field field_ref="LGW" />
</field_group>
</file>
</file_group>
</file_definition>
......@@ -8,234 +8,88 @@
<file_group id="1mo" output_freq="1mo" output_level="10" enabled=".false."/> <!-- real montly files -->
<file_group id="1y" output_freq="1y" output_level="10" enabled=".false."/> <!-- real yearly files -->
<file_group id="12h" output_freq="12h" output_level="10" enabled=".false.">
<file id="file1" name_suffix="_inst" >
<field_group id="grid_fields1" operation="once">
<field field_ref="hc" />
<field field_ref="theta_s" />
<field field_ref="theta_b" />
<field field_ref="Tcline" />
<field field_ref="Vtransform"/>
<field field_ref="h" />
<field field_ref="f" />
<field field_ref="pm" />
<field field_ref="pn" />
<field field_ref="lon_rho" />
<field field_ref="lat_rho" />
<field field_ref="lon_u" />
<field field_ref="lat_u" />
<field field_ref="lon_v" />
<field field_ref="lat_v" />
<field field_ref="angle" />
<field field_ref="mask_rho" />
<field field_ref="Cs_r" />
<field field_ref="sc_r" />
<field field_ref="Cs_w" />
<field field_ref="sc_w" />
</field_group>
<field_group id="inst_fields" operation="instant">
<field field_ref="zeta" />
<field field_ref="ubar" />
<field field_ref="vbar" />
<field field_ref="sustr"/>
<field field_ref="svstr"/>
<field field_ref="u" />
<field field_ref="v" />
<field field_ref="w" />
<field field_ref="temp" />
<field field_ref="salt" />
<field field_ref="rho" />
<field field_ref="bvf" />
</field_group>
</file>
</file_group>
<file_group id="5d" output_freq="2ts" output_level="10" enabled=".true.">
<file id="file2" name_suffix="_dyn" >
<field_group id="grid_fields2" operation="once">
<field field_ref="hc" />
<field field_ref="theta_s" />
<field field_ref="theta_b" />
<field field_ref="Tcline" />
<field field_ref="Vtransform"/>
<field field_ref="h" />
<field field_ref="lon_rho" />
<field field_ref="lat_rho" />
</field_group>
<field_group id="avg_fields" operation="average">
<field field_ref="zeta" />
<field field_ref="ubar" />
<field field_ref="vbar" />
<field field_ref="sustr"/>
<field field_ref="svstr"/>
<field field_ref="u" />
<field field_ref="v" />
<field field_ref="w" />
<field field_ref="temp" />
<field field_ref="salt" />
<field field_ref="rho" />
<field field_ref="bvf" />
</field_group>
</file>
</file_group>
<file_group id="1h" output_freq="1h" output_level="10" enabled=".false." >
<file id="file3" name_suffix="_inst_surf" >
<field field_ref="h" operation="once"/>
<field_group id="surf_fields" operation="instant">
<field field_ref="zeta" name="zeta" />
<field field_ref="u_surf" name="u" />
<field field_ref="v_surf" name="v" />
<field field_ref="temp_surf" name="temp" />
<field field_ref="salt_surf" name="salt" />
<!--field field_ref="shflx" />
<field field_ref="swflx" />
<field field_ref="radsw" />
<field field_ref="shflx_rlw" />
<field field_ref="shflx_lat" />
<field field_ref="shflx_sen" /-->
</field_group>
</file>
</file_group>
<!-- -->
<file_group id="PISCES" output_freq="2ts" output_level="10" enabled=".<use_pisces>.">
<file id="file30" name_suffix="_pisces" >
<field_group group_ref="grid_fields2" />
<field_group id="pisces_fields" operation="average">
<field field_ref="DIC" name="DIC"/>
<field field_ref="Alkalini" name="Alkalini" />
<field field_ref="Fer" name="Fer" />
<field field_ref="PO4" name="PO4" />
<field field_ref="O2" name="O2" />
<field field_ref="Si" name="Si" />
<field field_ref="DOC" name="DOC" />
<field field_ref="NO3" name="NO3" />
<field field_ref="NCHL" name="NCHL" />
<field field_ref="DCHL" name="DCHL" />
<field field_ref="PPPHY" name="PPPHY" />
<field field_ref="PPPHY2" name="PPPHY2" />
<field field_ref="LGW" name="LGW" />
</field_group>
</file>
<file id="file31" name_suffix="_pisces_diag">
<field_group group_ref="grid_fields2" />
<field_group id="pisces_diag_fields" operation="average">
<field field_ref="PH" name="PH" />
<field field_ref="CO3" name="CO3" />
<field field_ref="CO3sat" name="CO3sat" />
<field field_ref="PAR" name="PAR" />
<field field_ref="PPPHY" name="PPN" />
<field field_ref="PPPHY2" name="PPD" />
<field field_ref="PPNEWN" name="PN" />
<field field_ref="PPNEWD" name="PD" />
<field field_ref="PBSi" name="PBSi" />
<field field_ref="PFeN" name="PFeN" />
<field field_ref="PFeD" name="PFeD" />
<field field_ref="Grazing" name="grapoc" />
<field field_ref="Grazing2" name="grapoc2" />
<field field_ref="Nitrifo2" name="Nito2" />
<field field_ref="PPNEWo2" name="NPo2" />
<field field_ref="PPRego2" name="RPo2" />
<field field_ref="Remino2" name="Remo2" />
<field field_ref="MicroZo2" name="Mico2" />
<field field_ref="MesoZo2" name="Mso2" />
<field field_ref="Nfixo2" name="Fixo2" />
<field field_ref="Cflx" name="Cflx" />
<field field_ref="Oflx" name="Oflx" />
<field field_ref="Kg" name="Kg" />
<field field_ref="Heup" name="Zmeu" />
<field field_ref="Irondep" name="Fedep" />
<field field_ref="Nfix" name="Nfix"/>
<field field_ref="Ironsed" name="Fesed"/>
</field_group>
</file>
</file_group>
<!-- END -->
<file_group id="z1h" output_freq="1h" output_level="10" enabled=".false.">
<file id="file11" name="zoom1">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "zoom_1_grid_T" operation="once"/>
<field_group id="inst_fields_zoom_1" operation="instant">
<field field_ref="zeta" grid_ref= "zoom_1_grid_T" />
<field field_ref="temp" grid_ref= "zoom_1_grid_T3D"/>
<field field_ref="salt" grid_ref= "zoom_1_grid_T3D"/>
<field field_ref="u" grid_ref= "zoom_1_grid_U3D"/>
<field field_ref="v" grid_ref= "zoom_1_grid_V3D"/>
</field_group>
</file>
<file id="file12" name="zoom2">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "zoom_2_grid_T" operation="once"/>
<field_group id="inst_fields_zoom_2" operation="instant">
<field field_ref="zeta" grid_ref= "zoom_2_grid_T" />
<field field_ref="temp" grid_ref= "zoom_2_grid_T3D"/>
<field field_ref="salt" grid_ref= "zoom_2_grid_T3D"/>
<field field_ref="u" grid_ref= "zoom_2_grid_U3D"/>
<field field_ref="v" grid_ref= "zoom_2_grid_V3D"/>
</field_group>
</file>
</file_group>
<file_group id="10min" output_freq="600s" output_level="10" enabled=".false.">
<file id="file21" name="BR08">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_01_grid_T" operation="once"/>
<field_group id="inst_fields_PT_01" operation="instant">
<field field_ref="zeta" grid_ref= "PT_01_grid_T" />
<field field_ref="temp" grid_ref= "PT_01_grid_T3D"/>
<field field_ref="salt" grid_ref= "PT_01_grid_T3D"/>
<field field_ref="u" grid_ref= "PT_01_grid_U3D"/>
<field field_ref="v" grid_ref= "PT_01_grid_V3D"/>
</field_group>
</file>
<file id="file22" name="RO16">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_02_grid_T" operation="once"/>
<field_group id="inst_fields_PT_02" operation="instant">
<field field_ref="zeta" grid_ref= "PT_02_grid_T" />
<field field_ref="temp" grid_ref= "PT_02_grid_T3D"/>
<field field_ref="salt" grid_ref= "PT_02_grid_T3D"/>
<field field_ref="u" grid_ref= "PT_02_grid_U3D"/>
<field field_ref="v" grid_ref= "PT_02_grid_V3D"/>
</field_group>
</file>
<file id="file23" name="MARL">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_03_grid_T" operation="once"/>
<field_group id="inst_fields_PT_03" operation="instant">
<field field_ref="zeta" grid_ref= "PT_03_grid_T" />
<field field_ref="temp" grid_ref= "PT_03_grid_T3D"/>
<field field_ref="salt" grid_ref= "PT_03_grid_T3D"/>
<field field_ref="u" grid_ref= "PT_03_grid_U3D"/>
<field field_ref="v" grid_ref= "PT_03_grid_V3D"/>
</field_group>
</file>
<file id="file24" name="ELOR">
<field_group group_ref="Vertical_dimension_rho" operation="once"/>
<field field_ref="h" grid_ref= "PT_04_grid_T" operation="once"/>
<field_group id="inst_fields_PT_04" operation="instant">
<field field_ref="zeta" grid_ref= "PT_04_grid_T" />
<field field_ref="temp" grid_ref= "PT_04_grid_T3D"/>