Skip to content
Snippets Groups Projects
Commit 6ed07824 authored by Guillaume Samson's avatar Guillaume Samson :snowman2:
Browse files

Merge branch... 

Merge branch '229-remove-wrongly-introduced-orca2_ice_abl-configuration-in-cfgs-directory_branch_4.2' into 'branch_4.2'

remove wrongly introduced "ORCA2_ICE_ABL" configuration in cfgs directory

See merge request !280
parents 4591b3ed 004dba70
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 812 deletions
cfgs/ORCA2_ICE_ABL/EXPREF/context_nemo.xml deleted 100644 → 0
+ 0
− 41
View file @ 4591b3ed
<!--
==============================================================================================
NEMO context
==============================================================================================
-->
<context id="nemo">
<!-- $id$ -->
<!-- Fields definition -->
<field_definition src="./field_def_nemo-oce.xml"/> <!-- NEMO ocean dynamics -->
<field_definition src="./field_def_nemo-ice.xml"/> <!-- NEMO sea-ice model -->
<!-- Files definition -->
<file_definition src="./file_def_nemo-oce.xml"/> <!-- NEMO ocean dynamics -->
<file_definition src="./file_def_nemo-ice.xml"/> <!-- NEMO sea-ice model -->
<!--
============================================================================================================
= grid definition = = DO NOT CHANGE =
============================================================================================================
-->
<axis_definition>
<axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
<axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
<axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
<axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
<axis id="profsed" long_name="Vertical S levels" unit="cm" positive="down" />
<axis id="nfloat" long_name="Float number" unit="-" />
<axis id="icbcla" long_name="Iceberg class" unit="1" />
<axis id="ncatice" long_name="Ice category" unit="1" />
<axis id="iax_20C" long_name="20 degC isotherm" unit="degC" />
<axis id="iax_28C" long_name="28 degC isotherm" unit="degC" />
<!-- ABL vertical axis definition -->
<axis id="ght_abl" long_name="ABL Vertical T levels" unit="m" positive="up" />
<axis id="ghw_abl" long_name="ABL Vertical W levels" unit="m" positive="up" />
</axis_definition>
<domain_definition src="./domain_def_nemo.xml"/>
<grid_definition src="./grid_def_nemo.xml"/>
</context>
cfgs/ORCA2_ICE_ABL/EXPREF/domain_def_nemo.xml deleted 120000 → 0
+ 0
− 1
View file @ 4591b3ed
../../SHARED/domain_def_nemo.xml
\ No newline at end of file
cfgs/ORCA2_ICE_ABL/EXPREF/field_def_nemo-ice.xml deleted 120000 → 0
+ 0
− 1
View file @ 4591b3ed
../../SHARED/field_def_nemo-ice.xml
\ No newline at end of file
cfgs/ORCA2_ICE_ABL/EXPREF/field_def_nemo-oce.xml deleted 120000 → 0
+ 0
− 1
View file @ 4591b3ed
../../SHARED/field_def_nemo-oce.xml
\ No newline at end of file
cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-ice.xml deleted 100644 → 0
+ 0
− 136
View file @ 4591b3ed
<?xml version="1.0"?>
<!-- $id$ -->
<!--
============================================================================================================
= output files definition =
= Define your own files for sea ice =
= put the variables you want... =
============================================================================================================
-->
<file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1mo" min_digits="4">
<file_group id="5d" output_freq="5d" output_level="10" enabled=".TRUE."> <!-- 5d files -->
<file id="file21" name_suffix="_icemod" description="ice variables" enabled=".true." >
<!-- ice mask -->
<field field_ref="icemask" name="simsk" />
<field field_ref="icemask05" name="simsk05" />
<field field_ref="icemask15" name="simsk15" />
<!-- general -->
<field field_ref="snwvolu" name="snvolu" />
<field field_ref="icethic" name="sithic" />
<field field_ref="icevolu" name="sivolu" />
<field field_ref="iceconc" name="siconc" />
<field field_ref="icesalt" name="sisali" />
<field field_ref="iceapnd" name="siapnd" />
<field field_ref="icevpnd" name="sivpnd" />
<field field_ref="sst_m" name="sst_m" />
<field field_ref="sss_m" name="sss_m" />
<!-- heat -->
<field field_ref="icetemp" name="sitemp" />
<field field_ref="snwtemp" name="sntemp" />
<field field_ref="icettop" name="sittop" />
<field field_ref="icetbot" name="sitbot" />
<field field_ref="icetsni" name="sitsni" />
<!-- momentum -->
<field field_ref="uice" name="sivelu" />
<field field_ref="vice" name="sivelv" />
<field field_ref="icevel" name="sivelo" />
<field field_ref="utau_ai" name="utau_ai" />
<field field_ref="vtau_ai" name="vtau_ai" />
<field field_ref="utau_oi" name="utau_oi" />
<field field_ref="vtau_oi" name="vtau_oi" />
<!-- rheology -->
<field field_ref="icediv" name="sidive" />
<field field_ref="iceshe" name="sishea" />
<field field_ref="icestr" name="sistre" />
<field field_ref="normstr" name="normstr" />
<field field_ref="sheastr" name="sheastr" />
<field field_ref="sig1_pnorm" name="sig1_pnorm"/>
<field field_ref="sig2_pnorm" name="sig2_pnorm"/>
<!-- heat fluxes -->
<field field_ref="qt_oce_ai" name="qt_oce_ai" />
<field field_ref="qt_atm_oi" name="qt_atm_oi" />
<field field_ref="qtr_ice_top" name="qtr_ice_top"/>
<field field_ref="qtr_ice_bot" name="qtr_ice_bot"/>
<field field_ref="qt_ice" name="qt_ice" />
<field field_ref="qsr_ice" name="qsr_ice" />
<field field_ref="qns_ice" name="qns_ice" />
<field field_ref="qemp_ice" name="qemp_ice" />
<field field_ref="albedo" name="albedo" />
<field field_ref="hfxcndtop" name="hfxcndtop" />
<field field_ref="hfxcndbot" name="hfxcndbot" />
<field field_ref="hfxsensib" name="hfxsensib" />
<!-- salt fluxes -->
<field field_ref="sfxice" name="sfxice" />
<!-- mass fluxes -->
<field field_ref="vfxice" name="vfxice" />
<field field_ref="vfxsnw" name="vfxsnw" />
<!-- categories -->
<field field_ref="icemask_cat" name="simskcat"/>
<field field_ref="snwthic_cat" name="snthicat"/>
<field field_ref="iceconc_cat" name="siconcat"/>
<field field_ref="icethic_cat" name="sithicat"/>
<field field_ref="icesalt_cat" name="sisalcat"/>
<field field_ref="icetemp_cat" name="sitemcat"/>
<field field_ref="snwtemp_cat" name="sntemcat"/>
<field field_ref="icettop_cat" name="sitopcat"/>
</file>
<file id="file22" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." >
<!-- global contents -->
<field field_ref="ibgvol_tot" name="ibgvol_tot" />
<field field_ref="sbgvol_tot" name="sbgvol_tot" />
<field field_ref="ibgarea_tot" name="ibgarea_tot" />
<field field_ref="ibgsalt_tot" name="ibgsalt_tot" />
<field field_ref="ibgheat_tot" name="ibgheat_tot" />
<field field_ref="sbgheat_tot" name="sbgheat_tot" />
<!-- global drifts (conservation checks) -->
<field field_ref="ibgvolume" name="ibgvolume" />
<field field_ref="ibgsaltco" name="ibgsaltco" />
<field field_ref="ibgheatco" name="ibgheatco" />
<field field_ref="ibgheatfx" name="ibgheatfx" />
<!-- global forcings -->
<field field_ref="ibgfrcvoltop" name="ibgfrcvoltop" />
<field field_ref="ibgfrcvolbot" name="ibgfrcvolbot" />
<field field_ref="ibgfrctemtop" name="ibgfrctemtop" />
<field field_ref="ibgfrctembot" name="ibgfrctembot" />
<field field_ref="ibgfrcsal" name="ibgfrcsal" />
<field field_ref="ibgfrchfxtop" name="ibgfrchfxtop" />
<field field_ref="ibgfrchfxbot" name="ibgfrchfxbot" />
</file>
</file_group>
<file_group id="1ts" output_freq="1ts" output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
<file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> <!-- 1h files -->
<file_group id="2h" output_freq="2h" output_level="10" enabled=".TRUE."/> <!-- 2h files -->
<file_group id="3h" output_freq="3h" output_level="10" enabled=".TRUE."/> <!-- 3h files -->
<file_group id="4h" output_freq="4h" output_level="10" enabled=".TRUE."/> <!-- 4h files -->
<file_group id="6h" output_freq="6h" output_level="10" enabled=".TRUE."/> <!-- 6h files -->
<file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files -->
<file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
<file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
<file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
<file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
<file_group id="1y" output_freq="1y" output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
<file_group id="2y" output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
<file_group id="5y" output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
<file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
</file_definition>
cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml deleted 100644 → 0
+ 0
− 73
View file @ 4591b3ed
<?xml version="1.0"?>
<!--
============================================================================================================
= output files definition =
= Define your own filesfor ocean dynamics context =
= put the variables you want... =
============================================================================================================
-->
<file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="5d" min_digits="4">
<file_group id="5d" output_freq="5d" output_level="10" enabled=".TRUE."> <!-- 5d files -->
<file id="file11" name_suffix="_grid_T" description="ocean T grid variables" >
<field field_ref="e3t" />
<field field_ref="toce" name="thetao" />
<field field_ref="soce" name="so" />
<field field_ref="sst" name="tos" />
<field field_ref="sss" name="sos" />
<field field_ref="ssh" name="zos" />
<field field_ref="mldkz5" />
<field field_ref="mldr10_1" />
<field field_ref="sbt" />
<field field_ref="heatc" name="heatc" />
<field field_ref="saltc" name="saltc" />
<field field_ref="empmr" name="wfo" />
<field field_ref="qsr_oce" name="qsr_oce" />
<field field_ref="qns_oce" name="qns_oce" />
<field field_ref="qt_oce" name="qt_oce" />
<field field_ref="saltflx" name="sfx" />
<field field_ref="taum" name="taum" />
<field field_ref="wspd" name="windsp" />
<field field_ref="precip" name="precip" />
<!-- ice and snow -->
<field field_ref="snowpre" />
</file>
<file id="file12" name_suffix="_grid_U" description="ocean U grid variables" >
<field field_ref="e3u" />
<field field_ref="ssu" name="uos" />
<field field_ref="uoce" name="uo" />
<field field_ref="utau" name="tauuo" />
</file>
<file id="file13" name_suffix="_grid_V" description="ocean V grid variables" >
<field field_ref="e3v" />
<field field_ref="ssv" name="vos" />
<field field_ref="voce" name="vo" />
<field field_ref="vtau" name="tauvo" />
</file>
<file id="file14" name_suffix="_grid_ABL" description="ABL grid variables" >
<field field_ref="u_abl" />
<field field_ref="v_abl" />
<field field_ref="t_abl" />
<field field_ref="q_abl" />
<field field_ref="uvz1_abl" />
<field field_ref="tz1_abl" />
<field field_ref="qz1_abl" />
<field field_ref="uvz1_dta" />
<field field_ref="tz1_dta" />
<field field_ref="qz1_dta" />
<field field_ref="pblh" />
</file>
</file_group>
</file_definition>
cfgs/ORCA2_ICE_ABL/EXPREF/grid_def_nemo.xml deleted 120000 → 0
+ 0
− 1
View file @ 4591b3ed
../../SHARED/grid_def_nemo.xml
\ No newline at end of file
cfgs/ORCA2_ICE_ABL/EXPREF/iodef.xml deleted 100644 → 0
+ 0
− 26
View file @ 4591b3ed
<?xml version="1.0"?>
<simulation>
<!-- ============================================================================================ -->
<!-- XIOS context -->
<!-- ============================================================================================ -->
<context id="xios" >
<variable_definition>
<variable id="info_level" type="int">10</variable>
<variable id="using_server" type="bool">false</variable>
<variable id="using_oasis" type="bool">false</variable>
<variable id="oasis_codes_id" type="string" >oceanx</variable>
</variable_definition>
</context>
<!-- ============================================================================================ -->
<!-- NEMO CONTEXT add and suppress the components you need -->
<!-- ============================================================================================ -->
<context id="nemo" src="./context_nemo.xml"/> <!-- NEMO -->
</simulation>
cfgs/ORCA2_ICE_ABL/EXPREF/namelist_cfg deleted 100644 → 0
+ 0
− 444
View file @ 4591b3ed
This diff is collapsed.
cfgs/ORCA2_ICE_ABL/EXPREF/namelist_ice_cfg deleted 100644 → 0
+ 0
− 84
View file @ 4591b3ed
!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
!! SI3 configuration namelist: Overwrites SHARED/namelist_ice_ref
!! 1 - Generic parameters (nampar)
!! 2 - Ice thickness discretization (namitd)
!! 3 - Ice dynamics (namdyn)
!! 4 - Ice ridging/rafting (namdyn_rdgrft)
!! 5 - Ice rheology (namdyn_rhg)
!! 6 - Ice advection (namdyn_adv)
!! 7 - Ice surface boundary conditions (namsbc)
!! 8 - Ice thermodynamics (namthd)
!! 9 - Ice heat diffusion (namthd_zdf)
!! 10 - Ice lateral melting (namthd_da)
!! 11 - Ice growth in open water (namthd_do)
!! 12 - Ice salinity (namthd_sal)
!! 13 - Ice melt ponds (namthd_pnd)
!! 14 - Ice initialization (namini)
!! 15 - Ice/snow albedos (namalb)
!! 16 - Ice diagnostics (namdia)
!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
!
!------------------------------------------------------------------------------
&nampar ! Generic parameters
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namitd ! Ice discretization
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namdyn ! Ice dynamics
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namdyn_rdgrft ! Ice ridging/rafting
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namdyn_rhg ! Ice rheology
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namdyn_adv ! Ice advection
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namsbc ! Ice surface boundary conditions
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namthd ! Ice thermodynamics
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namthd_zdf ! Ice heat diffusion
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namthd_da ! Ice lateral melting
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namthd_do ! Ice growth in open water
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namthd_sal ! Ice salinity
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namthd_pnd ! Melt ponds
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namini ! Ice initialization
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namalb ! albedo parameters
!------------------------------------------------------------------------------
/
!------------------------------------------------------------------------------
&namdia ! Diagnostics
!------------------------------------------------------------------------------
/
cfgs/ORCA2_ICE_ABL/EXPREF/namelist_ice_ref deleted 120000 → 0
+ 0
− 1
View file @ 4591b3ed
../../SHARED/namelist_ice_ref
\ No newline at end of file
cfgs/ORCA2_ICE_ABL/EXPREF/namelist_ref deleted 120000 → 0
+ 0
− 1
View file @ 4591b3ed
../../SHARED/namelist_ref
\ No newline at end of file
cfgs/ORCA2_ICE_ABL/cpp_ORCA2_ICE_ABL.fcm deleted 100644 → 0
+ 0
− 1
View file @ 4591b3ed
bld::tool::fppkeys key_si3 key_xios key_qco
cfgs/ref_cfgs.txt
+ 0
− 1
View file @ 6ed07824
......@@ -7,6 +7,5 @@ ORCA2_OFF_PISCES OCE TOP OFF
ORCA2_OFF_TRC OCE TOP OFF
ORCA2_SAS_ICE OCE ICE NST SAS
ORCA2_ICE_PISCES OCE TOP ICE NST ABL
ORCA2_ICE_ABL OCE ICE ABL
SPITZ12 OCE ICE
WED025 OCE ICE
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment