Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • nemo/nemo
  • sparonuz/nemo
  • hatfield/nemo
  • extdevs/nemo
4 results
Show changes
Commits on Source (55)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 297 additions and 294 deletions
cfgs/AGRIF_DEMO/EXPREF/file_def_nemo-oce.xml
View file @ 5bc9e5ca
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<field field_ref="qt_oce" name="qt_oce" /> <field field_ref="qt_oce" name="qt_oce" />
<field field_ref="saltflx" name="sfx" /> <field field_ref="saltflx" name="sfx" />
<field field_ref="taum" name="taum" /> <field field_ref="taum" name="taum" />
<field field_ref="utau" name="tauuo" />
<field field_ref="vtau" name="tauvo" />
<field field_ref="wspd" name="windsp" /> <field field_ref="wspd" name="windsp" />
<field field_ref="precip" name="precip" /> <field field_ref="precip" name="precip" />
<!-- ice and snow --> <!-- ice and snow -->
...@@ -44,7 +46,6 @@ ...@@ -44,7 +46,6 @@
<field field_ref="e3u" /> <field field_ref="e3u" />
<field field_ref="ssu" name="uos" /> <field field_ref="ssu" name="uos" />
<field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field> <field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
<field field_ref="utau" name="tauuo" />
<field field_ref="uocetr_eff" name="uocetr_eff" /> <field field_ref="uocetr_eff" name="uocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="u_masstr" name="vozomatr" /> <field field_ref="u_masstr" name="vozomatr" />
...@@ -56,7 +57,6 @@ ...@@ -56,7 +57,6 @@
<field field_ref="e3v" /> <field field_ref="e3v" />
<field field_ref="ssv" name="vos" /> <field field_ref="ssv" name="vos" />
<field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field> <field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
<field field_ref="vtau" name="tauvo" />
<field field_ref="vocetr_eff" name="vocetr_eff" /> <field field_ref="vocetr_eff" name="vocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="v_masstr" name="vomematr" /> <field field_ref="v_masstr" name="vomematr" />
......
cfgs/AMM12/EXPREF/file_def_nemo-oce.xml
View file @ 5bc9e5ca
...@@ -100,6 +100,8 @@ ...@@ -100,6 +100,8 @@
<field field_ref="qsr" name="rsntds" /> <field field_ref="qsr" name="rsntds" />
<field field_ref="qt" name="tohfls" /> <field field_ref="qt" name="tohfls" />
<field field_ref="taum" /> <field field_ref="taum" />
<field field_ref="utau" name="tauuo" />
<field field_ref="vtau" name="tauvo" />
<field field_ref="mldkz5" /> <field field_ref="mldkz5" />
<field field_ref="mldr10_1" /> <field field_ref="mldr10_1" />
</file> </file>
...@@ -107,13 +109,11 @@ ...@@ -107,13 +109,11 @@
<file id="file5" name_suffix="_grid_U" description="ocean U grid variables" > <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
<field field_ref="uoce" name="uo" /> <field field_ref="uoce" name="uo" />
<field field_ref="ssu" name="uos" /> <field field_ref="ssu" name="uos" />
<field field_ref="utau" name="tauuo" />
</file> </file>
<file id="file6" name_suffix="_grid_V" description="ocean V grid variables" > <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
<field field_ref="voce" name="vo" /> <field field_ref="voce" name="vo" />
<field field_ref="ssv" name="vos" /> <field field_ref="ssv" name="vos" />
<field field_ref="vtau" name="tauvo" />
</file> </file>
<file id="file7" name_suffix="_grid_W" description="ocean W grid variables" > <file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >
......
cfgs/GYRE_PISCES/EXPREF/file_def_nemo.xml
View file @ 5bc9e5ca
...@@ -32,16 +32,16 @@ ...@@ -32,16 +32,16 @@
<field field_ref="qt" name="sohefldo" /> <field field_ref="qt" name="sohefldo" />
<field field_ref="mldr10_1" name="somxl010" /> <field field_ref="mldr10_1" name="somxl010" />
<field field_ref="mldkz5" name="somixhgt" /> <field field_ref="mldkz5" name="somixhgt" />
<field field_ref="utau" name="sozotaux" />
<field field_ref="vtau" name="sometauy" />
</file> </file>
<file id="file2" name_suffix="_grid_U" description="ocean U grid variables" > <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
<field field_ref="uoce" name="vozocrtx" /> <field field_ref="uoce" name="vozocrtx" />
<field field_ref="utau" name="sozotaux" />
</file> </file>
<file id="file3" name_suffix="_grid_V" description="ocean V grid variables" > <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
<field field_ref="voce" name="vomecrty" /> <field field_ref="voce" name="vomecrty" />
<field field_ref="vtau" name="sometauy" />
</file> </file>
<file id="file4" name_suffix="_grid_W" description="ocean W grid variables" > <file id="file4" name_suffix="_grid_W" description="ocean W grid variables" >
......
cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml
View file @ 5bc9e5ca
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
<field field_ref="qt_oce" name="qt_oce" /> <field field_ref="qt_oce" name="qt_oce" />
<field field_ref="saltflx" name="sfx" /> <field field_ref="saltflx" name="sfx" />
<field field_ref="taum" name="taum" /> <field field_ref="taum" name="taum" />
<field field_ref="utau" name="tauuo" />
<field field_ref="vtau" name="tauvo" />
<field field_ref="wspd" name="windsp" /> <field field_ref="wspd" name="windsp" />
<field field_ref="precip" name="precip" /> <field field_ref="precip" name="precip" />
<!-- ice and snow --> <!-- ice and snow -->
...@@ -40,14 +42,12 @@ ...@@ -40,14 +42,12 @@
<field field_ref="e3u" /> <field field_ref="e3u" />
<field field_ref="ssu" name="uos" /> <field field_ref="ssu" name="uos" />
<field field_ref="uoce" name="uo" /> <field field_ref="uoce" name="uo" />
<field field_ref="utau" name="tauuo" />
</file> </file>
<file id="file13" name_suffix="_grid_V" description="ocean V grid variables" > <file id="file13" name_suffix="_grid_V" description="ocean V grid variables" >
<field field_ref="e3v" /> <field field_ref="e3v" />
<field field_ref="ssv" name="vos" /> <field field_ref="ssv" name="vos" />
<field field_ref="voce" name="vo" /> <field field_ref="voce" name="vo" />
<field field_ref="vtau" name="tauvo" />
</file> </file>
<file id="file14" name_suffix="_grid_ABL" description="ABL grid variables" > <file id="file14" name_suffix="_grid_ABL" description="ABL grid variables" >
......
cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml
View file @ 5bc9e5ca
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<field field_ref="qt_oce" name="qt_oce" /> <field field_ref="qt_oce" name="qt_oce" />
<field field_ref="saltflx" name="sfx" /> <field field_ref="saltflx" name="sfx" />
<field field_ref="taum" name="taum" /> <field field_ref="taum" name="taum" />
<field field_ref="utau" name="tauuo" />
<field field_ref="vtau" name="tauvo" />
<field field_ref="wspd" name="windsp" /> <field field_ref="wspd" name="windsp" />
<field field_ref="precip" name="precip" /> <field field_ref="precip" name="precip" />
<!-- ice and snow --> <!-- ice and snow -->
...@@ -44,7 +46,6 @@ ...@@ -44,7 +46,6 @@
<field field_ref="e3u" /> <field field_ref="e3u" />
<field field_ref="ssu" name="uos" /> <field field_ref="ssu" name="uos" />
<field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field> <field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
<field field_ref="utau" name="tauuo" />
<field field_ref="uocetr_eff" name="uocetr_eff" /> <field field_ref="uocetr_eff" name="uocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="u_masstr" name="vozomatr" /> <field field_ref="u_masstr" name="vozomatr" />
...@@ -56,7 +57,6 @@ ...@@ -56,7 +57,6 @@
<field field_ref="e3v" /> <field field_ref="e3v" />
<field field_ref="ssv" name="vos" /> <field field_ref="ssv" name="vos" />
<field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field> <field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
<field field_ref="vtau" name="tauvo" />
<field field_ref="vocetr_eff" name="vocetr_eff" /> <field field_ref="vocetr_eff" name="vocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="v_masstr" name="vomematr" /> <field field_ref="v_masstr" name="vomematr" />
......
cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo-innerttrc.xml
View file @ 5bc9e5ca
...@@ -36,12 +36,23 @@ ...@@ -36,12 +36,23 @@
<field field_ref="ssh" name="zos" /> <field field_ref="ssh" name="zos" />
</file> </file>
<file id="file1" name_suffix="_trc" description="passive tracers variables" > <file id="file2" name_suffix="_trc" description="passive tracers variables" >
<field field_ref="Age" name="Age" operation="average" freq_op="1y" > @Age_e3t / @e3t </field> <field field_ref="Age" name="Age" operation="average" freq_op="1y" > @Age_e3t / @e3t </field>
<field field_ref="CFC11" name="CFC11" operation="average" freq_op="1y" > @CFC11_e3t / @e3t </field> <field field_ref="CFC11" name="CFC11" operation="average" freq_op="1y" > @CFC11_e3t / @e3t </field>
<field field_ref="CFC12" name="CFC12" operation="average" freq_op="1y" > @CFC12_e3t / @e3t </field> <field field_ref="CFC12" name="CFC12" operation="average" freq_op="1y" > @CFC12_e3t / @e3t </field>
<field field_ref="SF6" name="SF6" operation="average" freq_op="1y" > @SF6_e3t / @e3t </field> <field field_ref="SF6" name="SF6" operation="average" freq_op="1y" > @SF6_e3t / @e3t </field>
<field field_ref="RC14" name="RC14" operation="average" freq_op="1y" > @RC14_e3t / @e3t </field> <field field_ref="RC14" name="RC14" operation="average" freq_op="1y" > @RC14_e3t / @e3t </field>
<field field_ref="qtr_CFC11" />
<field field_ref="qint_CFC11" />
<field field_ref="qtr_CFC12" />
<field field_ref="qint_CFC12" />
<field field_ref="qtr_SF6" />
<field field_ref="qint_SF6" />
<field field_ref="qtr_c14" />
<field field_ref="qint_c14" />
<field field_ref="DeltaC14" />
<field field_ref="C14Age" />
<field field_ref="RAge" />
</file> </file>
</file_group> </file_group>
......
cfgs/ORCA2_SAS_ICE/EXPREF/file_def_nemo-oce.xml
View file @ 5bc9e5ca
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<field field_ref="qt_oce" name="qt_oce" /> <field field_ref="qt_oce" name="qt_oce" />
<field field_ref="saltflx" name="sfx" /> <field field_ref="saltflx" name="sfx" />
<field field_ref="taum" name="taum" /> <field field_ref="taum" name="taum" />
<field field_ref="utau" name="tauuo" />
<field field_ref="vtau" name="tauvo" />
<field field_ref="wspd" name="windsp" /> <field field_ref="wspd" name="windsp" />
<field field_ref="precip" name="precip" /> <field field_ref="precip" name="precip" />
<!-- ice and snow --> <!-- ice and snow -->
...@@ -44,7 +46,6 @@ ...@@ -44,7 +46,6 @@
<field field_ref="e3u" /> <field field_ref="e3u" />
<field field_ref="ssu" name="uos" /> <field field_ref="ssu" name="uos" />
<field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field> <field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
<field field_ref="utau" name="tauuo" />
<field field_ref="uocetr_eff" name="uocetr_eff" /> <field field_ref="uocetr_eff" name="uocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="u_masstr" name="vozomatr" /> <field field_ref="u_masstr" name="vozomatr" />
...@@ -56,7 +57,6 @@ ...@@ -56,7 +57,6 @@
<field field_ref="e3v" /> <field field_ref="e3v" />
<field field_ref="ssv" name="vos" /> <field field_ref="ssv" name="vos" />
<field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field> <field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
<field field_ref="vtau" name="tauvo" />
<field field_ref="vocetr_eff" name="vocetr_eff" /> <field field_ref="vocetr_eff" name="vocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="v_masstr" name="vomematr" /> <field field_ref="v_masstr" name="vomematr" />
......
cfgs/SHARED/field_def_nemo-ice.xml
View file @ 5bc9e5ca
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<field_group id="SBC" > <!-- time step automaticaly defined based on nn_fsbc --> <field_group id="SBC" > <!-- time step automaticaly defined based on nn_fsbc -->
<!-- 2D variables --> <!-- 2D variables -->
<field_group id="SBC_2D" grid_ref="grid_T_2D" > <field_group id="SBC_2D" grid_ref="grid_T_2D_inner" >
<!-- =================== --> <!-- =================== -->
<!-- standard ice fields --> <!-- standard ice fields -->
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
</field_group> <!-- SBC_2D --> </field_group> <!-- SBC_2D -->
<!-- categories --> <!-- categories -->
<field_group id="SBC_3D" grid_ref="grid_T_ncatice" > <field_group id="SBC_3D" grid_ref="grid_T_ncatice_inner" >
<!-- standard ice fields --> <!-- standard ice fields -->
<field id="iceconc_cat" long_name="Sea-ice concentration per category" unit="" /> <field id="iceconc_cat" long_name="Sea-ice concentration per category" unit="" />
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
--> -->
<!-- output variables for my configuration (example) --> <!-- output variables for my configuration (example) -->
<field_group id="myvarICE" grid_ref="grid_T_2D" > <field_group id="myvarICE" >
<!-- ice mask --> <!-- ice mask -->
<field field_ref="icemask" name="simsk" /> <field field_ref="icemask" name="simsk" />
<field field_ref="icemask05" name="simsk05" /> <field field_ref="icemask05" name="simsk05" />
...@@ -495,7 +495,7 @@ ...@@ -495,7 +495,7 @@
</field_group> </field_group>
<field_group id="myvarICE_cat" grid_ref="grid_T_ncatice" > <field_group id="myvarICE_cat" >
<!-- categories --> <!-- categories -->
<field field_ref="icemask_cat" name="simskcat"/> <field field_ref="icemask_cat" name="simskcat"/>
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
<field field_ref="ilbgvol_tot" name="ilbgvol_tot" /> <field field_ref="ilbgvol_tot" name="ilbgvol_tot" />
</field_group> </field_group>
<field_group id="ICE_budget" grid_ref="grid_T_2D" > <field_group id="ICE_budget" >
<!-- general --> <!-- general -->
<field field_ref="icemask" name="simsk" /> <field field_ref="icemask" name="simsk" />
<field field_ref="iceconc" name="siconc" /> <field field_ref="iceconc" name="siconc" />
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
</field_group> </field_group>
<!-- SIMIP daily fields --> <!-- SIMIP daily fields -->
<field_group id="SIday_fields" grid_ref="grid_T_2D" > <field_group id="SIday_fields" >
<field field_ref="icepres" name="sitimefrac" /> <field field_ref="icepres" name="sitimefrac" />
<field field_ref="iceconc_pct" name="siconc" /> <field field_ref="iceconc_pct" name="siconc" />
<field field_ref="icethic_cmip" name="sithick" /> <field field_ref="icethic_cmip" name="sithick" />
...@@ -591,7 +591,7 @@ ...@@ -591,7 +591,7 @@
</field_group> </field_group>
<!-- SIMIP monthly fields --> <!-- SIMIP monthly fields -->
<field_group id="SImon_fields" grid_ref="grid_T_2D" > <field_group id="SImon_fields" >
<!-- Sea-ice state variables --> <!-- Sea-ice state variables -->
<field field_ref="icepres" name="sitimefrac" /> <field field_ref="icepres" name="sitimefrac" />
<field field_ref="iceconc_pct" name="siconc" /> <field field_ref="iceconc_pct" name="siconc" />
......
cfgs/SHARED/field_def_nemo-innerttrc.xml
View file @ 5bc9e5ca
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
--> -->
<field_group id="inerttrc" grid_ref="grid_T_2D"> <field_group id="inerttrc" grid_ref="grid_T_2D_inner">
<!-- CFC11 : variables available with ln_cfc11 --> <!-- CFC11 : variables available with ln_cfc11 -->
<field id="CFC11" long_name="Chlorofluoro carbon11 Concentration" unit="umol/m3" grid_ref="grid_T_3D" /> <field id="CFC11" long_name="Chlorofluoro carbon11 Concentration" unit="umol/m3" grid_ref="grid_T_3D" />
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
<!-- C14 : variables available with ln_c14 --> <!-- C14 : variables available with ln_c14 -->
<field id="RC14" long_name="Radiocarbon ratio" unit="-" grid_ref="grid_T_3D" /> <field id="RC14" long_name="Radiocarbon ratio" unit="-" grid_ref="grid_T_3D" />
<field id="RC14_e3t" long_name="RC14 * e3t" unit="m" grid_ref="grid_T_3D" > RC14 * e3t </field > <field id="RC14_e3t" long_name="RC14 * e3t" unit="m" grid_ref="grid_T_3D" > RC14 * e3t </field >
<field id="DeltaC14" long_name="Delta C14" unit="permil" grid_ref="grid_T_3D" /> <field id="DeltaC14" long_name="Delta C14" unit="permil" grid_ref="grid_T_3D_inner" />
<field id="C14Age" long_name="Radiocarbon age" unit="yr" grid_ref="grid_T_3D" /> <field id="C14Age" long_name="Radiocarbon age" unit="yr" grid_ref="grid_T_3D_inner" />
<field id="RAge" long_name="Reservoir Age" unit="yr" /> <field id="RAge" long_name="Reservoir Age" unit="yr" />
<field id="qtr_c14" long_name="Air-sea flux of C14" unit="1/m2/s" /> <field id="qtr_c14" long_name="Air-sea flux of C14" unit="1/m2/s" />
<field id="qint_c14" long_name="Cumulative air-sea flux of C14" unit="1/m2" /> <field id="qint_c14" long_name="Cumulative air-sea flux of C14" unit="1/m2" />
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<!-- AGE : variables available with ln_age --> <!-- AGE : variables available with ln_age -->
<field id="Age" long_name="Sea water age since surface contact" unit="yr" grid_ref="grid_T_3D" /> <field id="Age" long_name="Sea water age since surface contact" unit="yr" grid_ref="grid_T_3D" />
<field id="Age_e3t" long_name="Age * e3t" unit="yr * m" grid_ref="grid_T_3D" > Age * e3t </field > <field id="Age_e3t" long_name="Age * e3t" unit="yr * m" grid_ref="grid_T_3D" > Age * e3t </field >
</field_group> </field_group>
......
cfgs/SHARED/field_def_nemo-oce.xml
View file @ 5bc9e5ca
This diff is collapsed.
cfgs/SHARED/field_def_nemo-pisces.xml
View file @ 5bc9e5ca
This diff is collapsed.
cfgs/SHARED/grid_def_nemo.xml
View file @ 5bc9e5ca
...@@ -336,41 +336,44 @@ ...@@ -336,41 +336,44 @@
<scalar /> <scalar />
</grid> </grid>
<grid id="diamlr_grid_T_2D" > <grid id="diamlr_grid_T_2D" >
<domain domain_ref="grid_T" /> <domain domain_ref="grid_T_inner" />
<scalar /> <scalar />
</grid> </grid>
<grid id="diamlr_grid_T_2D_inner" >
<domain domain_ref="grid_T_inner" />
</grid>
<grid id="diamlr_grid_U_2D" > <grid id="diamlr_grid_U_2D" >
<domain domain_ref="grid_U" /> <domain domain_ref="grid_U_inner" />
<scalar /> <scalar />
</grid> </grid>
<grid id="diamlr_grid_V_2D" > <grid id="diamlr_grid_V_2D" >
<domain domain_ref="grid_V" /> <domain domain_ref="grid_V_inner" />
<scalar /> <scalar />
</grid> </grid>
<grid id="diamlr_grid_W_2D" > <grid id="diamlr_grid_W_2D" >
<domain domain_ref="grid_W" /> <domain domain_ref="grid_W_inner" />
<scalar /> <scalar />
</grid> </grid>
<grid id="diamlr_grid_2D_to_grid_T_3D" > <grid id="diamlr_grid_2D_to_grid_T_3D" >
<domain domain_ref="grid_T" /> <domain domain_ref="grid_T_inner" />
<axis axis_ref="deptht"> <axis axis_ref="deptht">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
</grid> </grid>
<grid id="diamlr_grid_2D_to_grid_U_3D" > <grid id="diamlr_grid_2D_to_grid_U_3D" >
<domain domain_ref="grid_U" /> <domain domain_ref="grid_U_inner" />
<axis axis_ref="depthu"> <axis axis_ref="depthu">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
</grid> </grid>
<grid id="diamlr_grid_2D_to_grid_V_3D" > <grid id="diamlr_grid_2D_to_grid_V_3D" >
<domain domain_ref="grid_V" /> <domain domain_ref="grid_V_inner" />
<axis axis_ref="depthv"> <axis axis_ref="depthv">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
</grid> </grid>
<grid id="diamlr_grid_2D_to_grid_W_3D" > <grid id="diamlr_grid_2D_to_grid_W_3D" >
<domain domain_ref="grid_W" /> <domain domain_ref="grid_W_inner" />
<axis axis_ref="depthw"> <axis axis_ref="depthw">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
...@@ -383,37 +386,37 @@ ...@@ -383,37 +386,37 @@
</grid> </grid>
<!-- grid definitions for the computation of daily detided model diagnostics (diadetide) --> <!-- grid definitions for the computation of daily detided model diagnostics (diadetide) -->
<grid id="diadetide_grid_T_2D" > <grid id="diadetide_grid_T_2D" >
<domain domain_ref="grid_T" /> <domain domain_ref="grid_T_inner" />
<scalar /> <scalar />
</grid> </grid>
<grid id="diadetide_grid_U_2D" > <grid id="diadetide_grid_U_2D" >
<domain domain_ref="grid_U" /> <domain domain_ref="grid_U_inner" />
<scalar /> <scalar />
</grid> </grid>
<grid id="diadetide_grid_V_2D" > <grid id="diadetide_grid_V_2D" >
<domain domain_ref="grid_V" /> <domain domain_ref="grid_V_inner" />
<scalar /> <scalar />
</grid> </grid>
<grid id="diadetide_grid_2D_to_grid_T_3D" > <grid id="diadetide_grid_2D_to_grid_T_3D" >
<domain domain_ref="grid_T" /> <domain domain_ref="grid_T_inner" />
<axis axis_ref="deptht"> <axis axis_ref="deptht">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
</grid> </grid>
<grid id="diadetide_grid_2D_to_grid_U_3D" > <grid id="diadetide_grid_2D_to_grid_U_3D" >
<domain domain_ref="grid_U" /> <domain domain_ref="grid_U_inner" />
<axis axis_ref="depthu"> <axis axis_ref="depthu">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
</grid> </grid>
<grid id="diadetide_grid_2D_to_grid_V_3D" > <grid id="diadetide_grid_2D_to_grid_V_3D" >
<domain domain_ref="grid_V" /> <domain domain_ref="grid_V_inner" />
<axis axis_ref="depthv"> <axis axis_ref="depthv">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
</grid> </grid>
<grid id="diadetide_grid_2D_to_grid_W_3D" > <grid id="diadetide_grid_2D_to_grid_W_3D" >
<domain domain_ref="grid_W" /> <domain domain_ref="grid_W_inner" />
<axis axis_ref="depthw"> <axis axis_ref="depthw">
<duplicate_scalar /> <duplicate_scalar />
</axis> </axis>
......
cfgs/SHARED/namelist_ref
View file @ 5bc9e5ca
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
!*** receive *** !*** receive ***
sn_rcv_w10m = 'none' , 'no' , '' , '' , '' sn_rcv_w10m = 'none' , 'no' , '' , '' , ''
sn_rcv_taumod = 'coupled' , 'no' , '' , '' , '' sn_rcv_taumod = 'coupled' , 'no' , '' , '' , ''
sn_rcv_tau = 'oce only' , 'no' , 'cartesian' , 'eastward-northward' , 'U,V' sn_rcv_tau = 'oce only' , 'no' , 'cartesian' , 'eastward-northward' , ''
sn_rcv_dqnsdt = 'coupled' , 'no' , '' , '' , '' sn_rcv_dqnsdt = 'coupled' , 'no' , '' , '' , ''
sn_rcv_qsr = 'oce and ice' , 'no' , '' , '' , '' sn_rcv_qsr = 'oce and ice' , 'no' , '' , '' , ''
sn_rcv_qns = 'oce and ice' , 'no' , '' , '' , '' sn_rcv_qns = 'oce and ice' , 'no' , '' , '' , ''
...@@ -380,21 +380,22 @@ ...@@ -380,21 +380,22 @@
sn_rcv_iceflx = 'none' , 'no' , '' , '' , '' sn_rcv_iceflx = 'none' , 'no' , '' , '' , ''
sn_rcv_mslp = 'none' , 'no' , '' , '' , '' sn_rcv_mslp = 'none' , 'no' , '' , '' , ''
sn_rcv_ts_ice = 'none' , 'no' , '' , '' , '' sn_rcv_ts_ice = 'none' , 'no' , '' , '' , ''
sn_rcv_qtrice = 'none' , 'no' , '' , '' , ''
sn_rcv_isf = 'none' , 'no' , '' , '' , '' sn_rcv_isf = 'none' , 'no' , '' , '' , ''
sn_rcv_icb = 'none' , 'no' , '' , '' , '' sn_rcv_icb = 'none' , 'no' , '' , '' , ''
sn_rcv_hsig = 'none' , 'no' , '' , '' , 'T' sn_rcv_hsig = 'none' , 'no' , '' , '' , ''
sn_rcv_phioc = 'none' , 'no' , '' , '' , 'T' sn_rcv_phioc = 'none' , 'no' , '' , '' , ''
sn_rcv_sdrfx = 'none' , 'no' , '' , '' , 'T' sn_rcv_sdrfx = 'none' , 'no' , '' , '' , ''
sn_rcv_sdrfy = 'none' , 'no' , '' , '' , 'T' sn_rcv_sdrfy = 'none' , 'no' , '' , '' , ''
sn_rcv_wper = 'none' , 'no' , '' , '' , 'T' sn_rcv_wper = 'none' , 'no' , '' , '' , ''
sn_rcv_wnum = 'none' , 'no' , '' , '' , 'T' sn_rcv_wnum = 'none' , 'no' , '' , '' , ''
sn_rcv_wstrf = 'none' , 'no' , '' , '' , 'T' sn_rcv_wstrf = 'none' , 'no' , '' , '' , ''
sn_rcv_wdrag = 'none' , 'no' , '' , '' , 'T' sn_rcv_wdrag = 'none' , 'no' , '' , '' , ''
sn_rcv_charn = 'none' , 'no' , '' , '' , 'T' sn_rcv_charn = 'none' , 'no' , '' , '' , ''
sn_rcv_taw = 'none' , 'no' , '' , '' , 'U,V' sn_rcv_taw = 'none' , 'no' , '' , '' , ''
sn_rcv_bhd = 'none' , 'no' , '' , '' , 'T' sn_rcv_bhd = 'none' , 'no' , '' , '' , ''
sn_rcv_tusd = 'none' , 'no' , '' , '' , 'T' sn_rcv_tusd = 'none' , 'no' , '' , '' , ''
sn_rcv_tvsd = 'none' , 'no' , '' , '' , 'T' sn_rcv_tvsd = 'none' , 'no' , '' , '' , ''
/ /
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
&namsbc_sas ! Stand-Alone Surface module: ocean data (SAS_SRC only) &namsbc_sas ! Stand-Alone Surface module: ocean data (SAS_SRC only)
...@@ -882,6 +883,9 @@ ...@@ -882,6 +883,9 @@
! !
! ! S-EOS coefficients (ln_seos=T): ! ! S-EOS coefficients (ln_seos=T):
! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
! ! dT = T-rn_T0 ; dS = S-rn_S0
rn_T0 = 10. ! reference temperature
rn_S0 = 35. ! reference salinity
rn_a0 = 1.6550e-1 ! thermal expension coefficient rn_a0 = 1.6550e-1 ! thermal expension coefficient
rn_b0 = 7.6554e-1 ! saline expension coefficient rn_b0 = 7.6554e-1 ! saline expension coefficient
rn_lambda1 = 5.9520e-2 ! cabbeling coeff in T^2 (=0 for linear eos) rn_lambda1 = 5.9520e-2 ! cabbeling coeff in T^2 (=0 for linear eos)
......
cfgs/SPITZ12/EXPREF/file_def_nemo-oce.xml
View file @ 5bc9e5ca
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<field field_ref="qt_oce" name="qt_oce" /> <field field_ref="qt_oce" name="qt_oce" />
<field field_ref="saltflx" name="sfx" /> <field field_ref="saltflx" name="sfx" />
<field field_ref="taum" name="taum" /> <field field_ref="taum" name="taum" />
<field field_ref="utau" name="tauuo" />
<field field_ref="vtau" name="tauvo" />
<field field_ref="wspd" name="windsp" /> <field field_ref="wspd" name="windsp" />
<field field_ref="precip" name="precip" /> <field field_ref="precip" name="precip" />
<!-- ice and snow --> <!-- ice and snow -->
...@@ -44,7 +46,6 @@ ...@@ -44,7 +46,6 @@
<field field_ref="e3u" /> <field field_ref="e3u" />
<field field_ref="ssu" name="uos" /> <field field_ref="ssu" name="uos" />
<field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field> <field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
<field field_ref="utau" name="tauuo" />
<field field_ref="uocetr_eff" name="uocetr_eff" /> <field field_ref="uocetr_eff" name="uocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="u_masstr" name="vozomatr" /> <field field_ref="u_masstr" name="vozomatr" />
...@@ -56,7 +57,6 @@ ...@@ -56,7 +57,6 @@
<field field_ref="e3v" /> <field field_ref="e3v" />
<field field_ref="ssv" name="vos" /> <field field_ref="ssv" name="vos" />
<field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field> <field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
<field field_ref="vtau" name="tauvo" />
<field field_ref="vocetr_eff" name="vocetr_eff" /> <field field_ref="vocetr_eff" name="vocetr_eff" />
<!-- available with diaar5 --> <!-- available with diaar5 -->
<field field_ref="v_masstr" name="vomematr" /> <field field_ref="v_masstr" name="vomematr" />
......
cfgs/WED025/EXPREF/file_def_nemo-oce.xml
View file @ 5bc9e5ca
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<field field_ref="qt_oce" name="qt_oce" /> <field field_ref="qt_oce" name="qt_oce" />
<field field_ref="saltflx" name="sfx" /> <field field_ref="saltflx" name="sfx" />
<field field_ref="taum" name="taum" /> <field field_ref="taum" name="taum" />
<field field_ref="utau" name="tauuo" />
<field field_ref="vtau" name="tauvo" />
<field field_ref="wspd" name="windsp" /> <field field_ref="wspd" name="windsp" />
<field field_ref="precip" name="precip" /> <field field_ref="precip" name="precip" />
<field field_ref="snowpre" /> <field field_ref="snowpre" />
...@@ -67,14 +69,12 @@ ...@@ -67,14 +69,12 @@
<field field_ref="e3u" /> <field field_ref="e3u" />
<field field_ref="ssu" name="uos" /> <field field_ref="ssu" name="uos" />
<field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field> <field field_ref="uoce" name="uo" operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
<field field_ref="utau" name="tauuo" />
</file> </file>
<file id="file13" name_suffix="_grid_V" description="ocean V grid variables" > <file id="file13" name_suffix="_grid_V" description="ocean V grid variables" >
<field field_ref="e3v" /> <field field_ref="e3v" />
<field field_ref="ssv" name="vos" /> <field field_ref="ssv" name="vos" />
<field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field> <field field_ref="voce" name="vo" operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
<field field_ref="vtau" name="tauvo" />
</file> </file>
<file id="file14" name_suffix="_grid_W" description="ocean W grid variables" > <file id="file14" name_suffix="_grid_W" description="ocean W grid variables" >
......
sette/BATCH_TEMPLATE/batch-X64_JEANZAY
View file @ 5bc9e5ca
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#SBATCH -A GROUP_IDRIS@cpu #SBATCH -A GROUP_IDRIS@cpu
#SBATCH --job-name=SETTE_JOB # nom du job #SBATCH --job-name=SETTE_JOB # nom du job
#SBATCH --partition=cpu_p1 # Nom de la partition d'exécution #SBATCH --partition=cpu_p1 # Nom de la partition d'exécution
#SBATCH --qos=qos_cpu-dev # quality of service
#SBATCH --ntasks=NPROCS # Nombre total de processus MPI #SBATCH --ntasks=NPROCS # Nombre total de processus MPI
#SBATCH --ntasks-per-node=40 # Nombre de processus MPI par noeud #SBATCH --ntasks-per-node=40 # Nombre de processus MPI par noeud
# /!\ Attention, la ligne suivante est trompeuse mais dans le vocabulaire # /!\ Attention, la ligne suivante est trompeuse mais dans le vocabulaire
......
sette/all_functions.sh
View file @ 5bc9e5ca
...@@ -172,7 +172,8 @@ clean_config() { ...@@ -172,7 +172,8 @@ clean_config() {
# define validation dir # define validation dir
set_valid_dir () { set_valid_dir () {
if [ ${DETACHED_HEAD} == "no" ] ; then if [ ${DETACHED_HEAD} == "no" ] ; then
REVISION_NB=`git -C ${MAIN_DIR} rev-list --abbrev-commit origin | head -1l` branchname=$( git branch --show-current )
REVISION_NB=$( git -C ${MAIN_DIR} rev-list --abbrev-commit origin/$branchname | head -1l )
else else
REVISION_NB=${DETACHED_CMIT} REVISION_NB=${DETACHED_CMIT}
fi fi
......
sette/sette_eval.sh
View file @ 5bc9e5ca
...@@ -272,7 +272,7 @@ if [[ $? == 0 ]] ; then ...@@ -272,7 +272,7 @@ if [[ $? == 0 ]] ; then
branchname="Unknown" branchname="Unknown"
fi fi
else else
revision=`git rev-list --abbrev-commit origin | head -1l` revision=$( git rev-list --abbrev-commit origin/$branchname | head -1l )
fi fi
else else
branchname="Unknown" branchname="Unknown"
......
sette/sette_rpt.sh
View file @ 5bc9e5ca
...@@ -584,7 +584,7 @@ if [[ $? == 0 ]] ; then ...@@ -584,7 +584,7 @@ if [[ $? == 0 ]] ; then
branchname="Unknown" branchname="Unknown"
fi fi
else else
revision=`git rev-list --abbrev-commit origin | head -1l` revision=$( git rev-list --abbrev-commit origin/$branchname | head -1l )
fi fi
else else
branchname="Unknown" branchname="Unknown"
......
src/ABL/ablmod.F90
View file @ 5bc9e5ca
...@@ -98,8 +98,8 @@ CONTAINS ...@@ -98,8 +98,8 @@ CONTAINS
REAL(wp) , INTENT(in ), DIMENSION(:,: ) :: pevp_ice ! Ce x Du over ice (T-point) REAL(wp) , INTENT(in ), DIMENSION(:,: ) :: pevp_ice ! Ce x Du over ice (T-point)
REAL(wp) , INTENT(in ), DIMENSION(:,: ) :: pwndm_ice ! ||uwnd - uice|| REAL(wp) , INTENT(in ), DIMENSION(:,: ) :: pwndm_ice ! ||uwnd - uice||
REAL(wp) , INTENT(in ), DIMENSION(:,: ) :: pfrac_oce ! ocean fraction REAL(wp) , INTENT(in ), DIMENSION(:,: ) :: pfrac_oce ! ocean fraction
REAL(wp) , INTENT( out), DIMENSION(:,: ) :: ptaui_ice ! ice-surface taux stress (U-point) REAL(wp) , INTENT( out), DIMENSION(:,: ) :: ptaui_ice ! ice-surface taux stress (T-point)
REAL(wp) , INTENT( out), DIMENSION(:,: ) :: ptauj_ice ! ice-surface tauy stress (V-point) REAL(wp) , INTENT( out), DIMENSION(:,: ) :: ptauj_ice ! ice-surface tauy stress (T-point)
#endif #endif
! !
REAL(wp), DIMENSION(1:jpi,1:jpj ) :: zwnd_i, zwnd_j REAL(wp), DIMENSION(1:jpi,1:jpj ) :: zwnd_i, zwnd_j
...@@ -617,25 +617,17 @@ CONTAINS ...@@ -617,25 +617,17 @@ CONTAINS
zwnd_i(ji,jj) = zztmp * zwnd_i(ji,jj) zwnd_i(ji,jj) = zztmp * zwnd_i(ji,jj)
zwnd_j(ji,jj) = zztmp * zwnd_j(ji,jj) zwnd_j(ji,jj) = zztmp * zwnd_j(ji,jj)
END_2D END_2D
! ... utau, vtau at U- and V_points, resp. ! ... utau, vtau at T-points
! Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
! Note the use of MAX(tmask(i,j),tmask(i+1,j) is to mask tau over ice shelves ptaui(ji,jj) = zwnd_i(ji,jj) * msk_abl(ji,jj) !!clem tau: check
DO_2D( 0, 0, 0, 0 ) ptauj(ji,jj) = zwnd_j(ji,jj) * msk_abl(ji,jj) !!clem tau: check
zcff = 0.5_wp * ( 2._wp - msk_abl(ji,jj)*msk_abl(ji+1,jj) )
zztmp = MAX(msk_abl(ji,jj),msk_abl(ji+1,jj))
ptaui(ji,jj) = zcff * zztmp * ( zwnd_i(ji,jj) + zwnd_i(ji+1,jj ) )
zcff = 0.5_wp * ( 2._wp - msk_abl(ji,jj)*msk_abl(ji,jj+1) )
zztmp = MAX(msk_abl(ji,jj),msk_abl(ji,jj+1))
ptauj(ji,jj) = zcff * zztmp * ( zwnd_j(ji,jj) + zwnd_j(ji ,jj+1) )
END_2D END_2D
!
CALL lbc_lnk( 'ablmod', ptaui(:,:), 'U', -1.0_wp, ptauj(:,:), 'V', -1.0_wp )
CALL iom_put( "taum_oce", ptaum ) CALL iom_put( "taum_oce", ptaum )
IF(sn_cfctl%l_prtctl) THEN IF(sn_cfctl%l_prtctl) THEN
CALL prt_ctl( tab2d_1=ptaui , clinfo1=' abl_stp: utau : ', mask1=umask, & CALL prt_ctl( tab2d_1=ptaui , clinfo1=' abl_stp: utau : ', mask1=tmask, &
& tab2d_2=ptauj , clinfo2=' vtau : ', mask2=vmask ) & tab2d_2=ptauj , clinfo2=' vtau : ', mask2=tmask )
CALL prt_ctl( tab2d_1=pwndm , clinfo1=' abl_stp: wndm : ' ) CALL prt_ctl( tab2d_1=pwndm , clinfo1=' abl_stp: wndm : ' )
ENDIF ENDIF
...@@ -657,23 +649,14 @@ CONTAINS ...@@ -657,23 +649,14 @@ CONTAINS
! ------------------------------------------------------------ ! ! ------------------------------------------------------------ !
! Wind stress relative to the moving ice ( U10m - U_ice ) ! ! Wind stress relative to the moving ice ( U10m - U_ice ) !
! ------------------------------------------------------------ ! ! ------------------------------------------------------------ !
DO_2D( 0, 0, 0, 0 ) DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
ptaui_ice(ji,jj) = rhoa(ji,jj) * pCd_du_ice(ji,jj) * ( u_abl(ji,jj,2,nt_a) - pssu_ice(ji,jj) * rn_vfac )
zztmp1 = 0.5_wp * ( u_abl(ji+1,jj ,2,nt_a) + u_abl(ji,jj,2,nt_a) ) ptauj_ice(ji,jj) = rhoa(ji,jj) * pCd_du_ice(ji,jj) * ( v_abl(ji,jj,2,nt_a) - pssv_ice(ji,jj) * rn_vfac )
zztmp2 = 0.5_wp * ( v_abl(ji ,jj+1,2,nt_a) + v_abl(ji,jj,2,nt_a) )
ptaui_ice(ji,jj) = 0.5_wp * ( rhoa(ji+1,jj) * pCd_du_ice(ji+1,jj) &
& + rhoa(ji ,jj) * pCd_du_ice(ji ,jj) ) &
& * ( zztmp1 - pssu_ice(ji,jj) * rn_vfac )
ptauj_ice(ji,jj) = 0.5_wp * ( rhoa(ji,jj+1) * pCd_du_ice(ji,jj+1) &
& + rhoa(ji,jj ) * pCd_du_ice(ji,jj ) ) &
& * ( zztmp2 - pssv_ice(ji,jj) * rn_vfac )
END_2D END_2D
CALL lbc_lnk( 'ablmod', ptaui_ice, 'U', -1.0_wp, ptauj_ice,'V', -1.0_wp )
! !
IF(sn_cfctl%l_prtctl) THEN IF(sn_cfctl%l_prtctl) THEN
CALL prt_ctl( tab2d_1=ptaui_ice , clinfo1=' abl_stp: utau_ice : ', mask1=umask, & CALL prt_ctl( tab2d_1=ptaui_ice , clinfo1=' abl_stp: utau_ice : ', mask1=tmask, &
& tab2d_2=ptauj_ice , clinfo2=' vtau_ice : ', mask2=vmask ) & tab2d_2=ptauj_ice , clinfo2=' vtau_ice : ', mask2=tmask )
END IF END IF
#endif #endif
! !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ! !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
......