Changeset 15264 for NEMO/branches/2020/ticket2487/doc
- Timestamp:
- 2021-09-16T12:42:20+02:00 (3 years ago)
- Location:
- NEMO/branches/2020/ticket2487
- Files:
-
- 29 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/ticket2487
- Property svn:externals
-
old new 1 ^/utils/build/arch@12130 arch2 ^/utils/build/makenemo@12191 makenemo3 ^/utils/build/mk@11662 mk4 ^/utils/tools_r4.0-HEAD@1 2672tools5 ^/vendors/AGRIF/ dev@10586ext/AGRIF6 ^/vendors/FCM@10134 ext/FCM7 ^/vendors/IOIPSL@9655 ext/IOIPSL1 ^/utils/build/arch@12130 arch 2 ^/utils/build/makenemo@12191 makenemo 3 ^/utils/build/mk@11662 mk 4 ^/utils/tools_r4.0-HEAD@14974 tools 5 ^/vendors/AGRIF/stable@14105 ext/AGRIF 6 ^/vendors/FCM@10134 ext/FCM 7 ^/vendors/IOIPSL@9655 ext/IOIPSL 8 8 9 9 # SETTE mapping (inactive)
-
- Property svn:externals
-
NEMO/branches/2020/ticket2487/doc/latex/NEMO/subfiles/apdx_triads.tex
r11693 r15264 1 1 \documentclass[../main/NEMO_manual]{subfiles} 2 3 %% Local cmds4 \newcommand{\rML}[1][i]{\ensuremath{_{\mathrm{ML}\,#1}}}5 \newcommand{\rMLt}[1][i]{\tilde{r}_{\mathrm{ML}\,#1}}6 %% Move to ../../global/new_cmds.tex to avoid error with \listoffigures7 %\newcommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}8 \newcommand{\triadd}[5]{\ensuremath{{}_{#1}^{#2}{\mathbb{#3}}_{#4}^{\,#5}}}9 \newcommand{\triadt}[5]{\ensuremath{{}_{#1}^{#2}{\tilde{\mathbb{#3}}}_{#4}^{\,#5}}}10 \newcommand{\rtriad}[2][]{\ensuremath{\triad[#1]{i}{k}{#2}{i_p}{k_p}}}11 \newcommand{\rtriadt}[1]{\ensuremath{\triadt{i}{k}{#1}{i_p}{k_p}}}12 2 13 3 \begin{document} -
NEMO/branches/2020/ticket2487/doc/latex/NEMO/subfiles/chap_ZDF.tex
r11693 r15264 1 1 \documentclass[../main/NEMO_manual]{subfiles} 2 3 %% Custom aliases4 \newcommand{\cf}{\ensuremath{C\kern-0.14em f}}5 2 6 3 \begin{document} -
NEMO/branches/2020/ticket2487/doc/latex/TOP/subfiles/model_description.tex
r11694 r15264 1 1 \documentclass[../main/TOP_manual]{subfiles} 2 3 \newcommand{\cd}{\mathrm{CO_2}}4 \newcommand{\Ct}{\mathrm{C_T}}5 \newcommand{\pacd}{\mathrm{p^a_{CO_2}}}6 \newcommand{\cq}{\mathrm{^{14}C}}7 \newcommand{\Dcq}{\Delta ^{14}\mathrm{C}}8 \newcommand{\Rq}{\mathrm{^{14}{R}}}9 \newcommand{\CODE}[1]{\textsc{#1}}10 %\newcommand{\CODE}[1]{\textcolor{black}{\textsc{#1}}\xspace}11 2 12 3 \begin{document} -
NEMO/branches/2020/ticket2487/doc/latex/global/document.tex
r12390 r15264 6 6 %% NEMO release version 7 7 \def \version{4.0-HEAD} 8 \def \date{Month YYYY} 8 9 9 10 %% Preamble -
NEMO/branches/2020/ticket2487/doc/latex/global/frontpage.tex
r12389 r15264 32 32 \begin{center} 33 33 \LARGE Version \version\ -\ \today \\ 34 %\medskip35 %\href{http://doi.org/10.5281/zenodo.\zid}{ \includegraphics{badges/zenodo.\zid} }34 \medskip 35 \href{http://doi.org/10.5281/zenodo.\zid}{ \includegraphics{badges/zenodo.\zid} } 36 36 \end{center} 37 37 -
NEMO/branches/2020/ticket2487/doc/latex/global/info_page.tex
r11515 r15264 72 72 \hfill 73 73 \begin{minipage}[c]{0.25\textwidth} 74 \href{http://www.cmc.ipsl.fr}{\includegraphics[width=\textwidth]{logos/IPSL_ upright}}74 \href{http://www.cmc.ipsl.fr}{\includegraphics[width=\textwidth]{logos/IPSL_master}} 75 75 \end{minipage} 76 76 \end{figure} -
NEMO/branches/2020/ticket2487/doc/latex/global/new_cmds.tex
r11693 r15264 58 58 \newcommand{\orcid}[1]{\href{http://orcid.org/#1}{\textcolor{orcidcolor}\aiOrcidSquare}} 59 59 60 %% Workaround for \listoffigures 61 \DeclareRobustCommand{\triad}[6][]{\ensuremath{ {}_{#2}^{#3} { \mathbb{#4}_{#1} }_{#5}^{\,#6} }} 60 %% Custom aliases 61 \newcommand{\cf}{\ensuremath{C\kern-0.14em f}} 62 \newcommand{\rML}[1][i]{\ensuremath{_{\mathrm{ML}\,#1}}} 63 \newcommand{\rMLt}[1][i]{\tilde{r}_{\mathrm{ML}\,#1}} 64 \newcommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}} 65 \newcommand{\triadd}[5]{\ensuremath{{}_{#1}^{#2}{\mathbb{#3}}_{#4}^{\,#5}}} 66 \newcommand{\triadt}[5]{\ensuremath{{}_{#1}^{#2}{\tilde{\mathbb{#3}}}_{#4}^{\,#5}}} 67 \newcommand{\rtriad}[2][]{\ensuremath{\triad[#1]{i}{k}{#2}{i_p}{k_p}}} 68 \newcommand{\rtriadt}[1]{\ensuremath{\triadt{i}{k}{#1}{i_p}{k_p}}} 69 \newcommand{\cd}{\mathrm{CO_2}} 70 \newcommand{\Ct}{\mathrm{C_T}} 71 \newcommand{\pacd}{\mathrm{p^a_{CO_2}}} 72 \newcommand{\cq}{\mathrm{^{14}C}} 73 \newcommand{\Dcq}{\Delta ^{14}\mathrm{C}} 74 \newcommand{\Rq}{\mathrm{^{14}{R}}} 75 \newcommand{\CODE}[1]{\textsc{#1}} 62 76 63 77 %% New command for ToC -
NEMO/branches/2020/ticket2487/doc/latex/global/styles.tex
r11687 r15264 72 72 } 73 73 74 %% Temporary fix75 \def\set@curr@file#1{%76 \begingroup77 \escapechar\m@ne78 \xdef\@curr@file{\expandafter\string\csname #1\endcsname}%79 \endgroup80 }81 \def\quote@name#1{"\quote@@name#1\@gobble""}82 \def\quote@@name#1"{#1\quote@@name}83 \def\unquote@name#1{\quote@@name#1\@gobble"}84 85 74 \makeatother -
NEMO/branches/2020/ticket2487/doc/manual_build.sh
r11594 r15264 38 38 for model in $models; do 39 39 echo $model 40 #clean $model40 clean $model 41 41 build $model 42 42 printf "\t¤ End of building run\n" -
NEMO/branches/2020/ticket2487/doc/namelists/nambdy_dta
r11703 r15264 29 29 bn_aip = 'NOT USED' , 24. , 'siapnd' , .true. , .false., 'daily' , '' , '' , '' 30 30 bn_hip = 'NOT USED' , 24. , 'sihpnd' , .true. , .false., 'daily' , '' , '' , '' 31 bn_hil = 'NOT USED' , 24. , 'sihlid' , .true. , .false., 'daily' , '' , '' , '' 31 32 ! if bn_t_i etc are "not used", then define arbitrary temperatures and salinity and ponds 32 33 rn_ice_tem = 270. ! arbitrary temperature of incoming sea ice … … 35 36 rn_ice_apnd = 0.2 ! -- pond fraction = a_ip/a_i -- 36 37 rn_ice_hpnd = 0.05 ! -- pond depth -- 38 rn_ice_hlid = 0.0 ! -- pond lid depth -- 37 39 / -
NEMO/branches/2020/ticket2487/doc/namelists/namdia
r11703 r15264 8 8 ln_icediahsb = .false. ! output the heat, mass & salt budgets (T) or not (F) 9 9 ln_icectl = .false. ! ice points output for debug (T or F) 10 iiceprt = 10 !i-index for debug11 jiceprt = 10 !j-index for debug10 iiceprt = 10 ! i-index for debug 11 jiceprt = 10 ! j-index for debug 12 12 / -
NEMO/branches/2020/ticket2487/doc/namelists/namdrg
r10075 r15264 2 2 &namdrg ! top/bottom drag coefficient (default: NO selection) 3 3 !----------------------------------------------------------------------- 4 ln_ OFF= .false. ! free-slip : Cd = 0 (F => fill namdrg_bot4 ln_drg_OFF = .false. ! free-slip : Cd = 0 (F => fill namdrg_bot 5 5 ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top) 6 6 ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U| … … 8 8 ! 9 9 ln_drgimp = .true. ! implicit top/bottom friction flag 10 ln_drgice_imp = .false. ! implicit ice-ocean drag 10 11 / -
NEMO/branches/2020/ticket2487/doc/namelists/namdrg_bot
r10075 r15264 1 1 !----------------------------------------------------------------------- 2 &namdrg_bot ! BOTTOM friction (ln_ OFF =F)2 &namdrg_bot ! BOTTOM friction (ln_drg_OFF =F) 3 3 !----------------------------------------------------------------------- 4 4 rn_Cd0 = 1.e-3 ! drag coefficient [-] -
NEMO/branches/2020/ticket2487/doc/namelists/namdrg_top
r10075 r15264 1 1 !----------------------------------------------------------------------- 2 &namdrg_top ! TOP friction (ln_ OFF =F & ln_isfcav=T)2 &namdrg_top ! TOP friction (ln_drg_OFF =F & ln_isfcav=T) 3 3 !----------------------------------------------------------------------- 4 4 rn_Cd0 = 1.e-3 ! drag coefficient [-] -
NEMO/branches/2020/ticket2487/doc/namelists/namdyn
r11703 r15264 10 10 rn_ishlat = 2. ! lbc : free slip (0) ; partial slip (0-2) ; no slip (2) ; strong slip (>2) 11 11 ln_landfast_L16 = .false. ! landfast: parameterization from Lemieux 2016 12 rn_ depfra= 0.125 ! fraction of ocean depth that ice must reach to initiate landfast12 rn_lf_depfra = 0.125 ! fraction of ocean depth that ice must reach to initiate landfast 13 13 ! recommended range: [0.1 ; 0.25] 14 rn_ icebfr = 15. ! maximum bottom stress per unit volume [N/m3]15 rn_lf relax= 1.e-5 ! relaxation time scale to reach static friction [s-1]16 rn_ tensile= 0.05 ! isotropic tensile strength [0-0.5??]14 rn_lf_bfr = 15. ! maximum bottom stress per unit volume [N/m3] 15 rn_lf_relax = 1.e-5 ! relaxation time scale to reach static friction [s-1] 16 rn_lf_tensile = 0.05 ! isotropic tensile strength [0-0.5??] 17 17 / -
NEMO/branches/2020/ticket2487/doc/namelists/namdyn_rhg
r11025 r15264 9 9 rn_relast = 0.333 ! ratio of elastic timescale to ice time step: Telast = dt_ice * rn_relast 10 10 ! advised value: 1/3 (rn_nevp=120) or 1/9 (rn_nevp=300) 11 ln_rhg_chkcvg = .false. ! check convergence of rheology (outputs: file ice_cvg.nc & variable uice_cvg) 11 12 / -
NEMO/branches/2020/ticket2487/doc/namelists/namini
r11703 r15264 3 3 !------------------------------------------------------------------------------ 4 4 ln_iceini = .true. ! activate ice initialization (T) or not (F) 5 ln_iceini_file = .false. ! netcdf file provided for initialization (T) or not (F) 5 nn_iceini_file = 0 ! 0 = Initialise sea ice based on SSTs 6 ! 1 = Initialise sea ice from single category netcdf file 7 ! 2 = Initialise sea ice from multi category restart file 6 8 rn_thres_sst = 2.0 ! max temp. above Tfreeze with initial ice = (sst - tfreeze) 7 9 rn_hti_ini_n = 3.0 ! initial ice thickness (m), North … … 23 25 rn_hpd_ini_n = 0.05 ! initial pond depth (m), North 24 26 rn_hpd_ini_s = 0.05 ! " " South 25 ! -- for ln_iceini_file = T 27 rn_hld_ini_n = 0.0 ! initial pond lid depth (m), North 28 rn_hld_ini_s = 0.0 ! " " South 29 ! -- for nn_iceini_file = 1 26 30 sn_hti = 'Ice_initialization' , -12 ,'hti' , .false. , .true., 'yearly' , '' , '', '' 27 31 sn_hts = 'Ice_initialization' , -12 ,'hts' , .false. , .true., 'yearly' , '' , '', '' … … 34 38 sn_apd = 'NOT USED' , -12 ,'apd' , .false. , .true., 'yearly' , '' , '', '' 35 39 sn_hpd = 'NOT USED' , -12 ,'hpd' , .false. , .true., 'yearly' , '' , '', '' 40 sn_hld = 'NOT USED' , -12 ,'hld' , .false. , .true., 'yearly' , '' , '', '' 36 41 cn_dir='./' 37 42 / -
NEMO/branches/2020/ticket2487/doc/namelists/namsbc_blk
r11703 r15264 31 31 sn_snow = 'ncar_precip.15JUNE2009_fill', -1. , 'SNOW' , .false. , .true. , 'yearly' , 'weights_core_orca2_bilinear_noc.nc' , '' , '' 32 32 sn_slp = 'slp.15JUNE2009_fill' , 6. , 'SLP' , .false. , .true. , 'yearly' , 'weights_core_orca2_bilinear_noc.nc' , '' , '' 33 sn_cc = 'NOT USED' , 24 , 'CC' , .false. , .true. , 'yearly' , 'weights_core_orca2_bilinear_noc.nc' , '' , '' 33 34 sn_tdif = 'taudif_core' , 24 , 'taudif' , .false. , .true. , 'yearly' , 'weights_core_orca2_bilinear_noc.nc' , '' , '' 34 35 / -
NEMO/branches/2020/ticket2487/doc/namelists/namsbc_cpl
r10075 r15264 2 2 &namsbc_cpl ! coupled ocean/atmosphere model ("key_oasis3") 3 3 !----------------------------------------------------------------------- 4 nn_cplmodel = 1 ! Maximum number of models to/from which NEMO is potentially sending/receiving data5 ln_usecplmask = .false. ! use a coupling mask file to merge data received from several models6 ! ! -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel)7 nn_cats_cpl = 5 ! Number of sea ice categories over which coupling is to be carried out (if not 1)8 4 nn_cplmodel = 1 ! Maximum number of models to/from which NEMO is potentially sending/receiving data 5 ln_usecplmask = .false. ! use a coupling mask file to merge data received from several models 6 ! ! -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel) 7 ln_scale_ice_flux = .false. ! use ice fluxes that are already "ice weighted" ( i.e. multiplied ice concentration) 8 nn_cats_cpl = 5 ! Number of sea ice categories over which coupling is to be carried out (if not 1) 9 9 !_____________!__________________________!____________!_____________!______________________!________! 10 10 ! ! description ! multiple ! vector ! vector ! vector ! -
NEMO/branches/2020/ticket2487/doc/namelists/namthd
r11025 r15264 6 6 ln_icedO = .true. ! activate ice growth in open-water (T) or not (F) 7 7 ln_icedS = .true. ! activate brine drainage (T) or not (F) 8 ! 9 ln_leadhfx = .true. ! heat in the leads is used to melt sea-ice before warming the ocean 8 10 / -
NEMO/branches/2020/ticket2487/doc/namelists/namthd_pnd
r11536 r15264 2 2 &namthd_pnd ! Melt ponds 3 3 !------------------------------------------------------------------------------ 4 ln_pnd = .false. ! activate melt ponds or not 5 ln_pnd_H12 = .false. ! activate evolutive melt ponds (from Holland et al 2012) 6 ln_pnd_CST = .false. ! activate constant melt ponds 7 rn_apnd = 0.2 ! prescribed pond fraction, at Tsu=0 degC 8 rn_hpnd = 0.05 ! prescribed pond depth, at Tsu=0 degC 9 ln_pnd_alb = .false. ! melt ponds affect albedo or not 4 ln_pnd = .false. ! activate melt ponds or not 5 ln_pnd_LEV = .false. ! level ice melt ponds (from Flocco et al 2007,2010 & Holland et al 2012) 6 rn_apnd_min = 0.15 ! minimum ice fraction that contributes to melt pond. range: 0.0 -- 0.15 ?? 7 rn_apnd_max = 0.85 ! maximum ice fraction that contributes to melt pond. range: 0.7 -- 0.85 ?? 8 ln_pnd_CST = .false. ! constant melt ponds 9 rn_apnd = 0.2 ! prescribed pond fraction, at Tsu=0 degC 10 rn_hpnd = 0.05 ! prescribed pond depth, at Tsu=0 degC 11 ln_pnd_lids = .true. ! frozen lids on top of the ponds (only for ln_pnd_LEV) 12 ln_pnd_alb = .true. ! effect of melt ponds on ice albedo 10 13 / -
NEMO/branches/2020/ticket2487/doc/namelists/namthd_zdf
r11025 r15264 7 7 rn_cnd_s = 0.31 ! thermal conductivity of the snow (0.31 W/m/K, Maykut and Untersteiner, 1971) 8 8 ! Obs: 0.1-0.5 (Lecomte et al, JAMES 2013) 9 rn_kappa_i = 1.0 ! radiation attenuation coefficient in sea ice [1/m] 9 rn_kappa_i = 1.0 ! radiation attenuation coefficient in sea ice [1/m] 10 rn_kappa_s = 10.0 ! nn_qtrice = 0: radiation attenuation coefficient in snow [1/m] 11 rn_kappa_smlt = 7.0 ! nn_qtrice = 1: radiation attenuation coefficient in melting snow [1/m] 12 rn_kappa_sdry = 10.0 ! radiation attenuation coefficient in dry snow [1/m] 13 ln_zdf_chkcvg = .false. ! check convergence of heat diffusion scheme (output variable: tice_cvg) 10 14 / -
NEMO/branches/2020/ticket2487/doc/namelists/namzdf_gls
r9355 r15264 13 13 nn_z0_met = 2 ! Method for surface roughness computation (0/1/2/3) 14 14 ! ! =3 requires ln_wave=T 15 nn_z0_ice = 1 ! attenutaion of surface wave breaking under ice 16 ! ! = 0 no impact of ice cover 17 ! ! = 1 roughness uses rn_hsri and is weigthed by 1-TANH(10*fr_i) 18 ! ! = 2 roughness uses rn_hsri and is weighted by 1-fr_i 19 ! ! = 3 roughness uses rn_hsri and is weighted by 1-MIN(1,4*fr_i) 15 20 nn_bc_surf = 1 ! surface condition (0/1=Dir/Neum) 16 21 nn_bc_bot = 1 ! bottom condition (0/1=Dir/Neum) -
NEMO/branches/2020/ticket2487/doc/namelists/namzdf_tke
r10075 r15264 15 15 ln_mxl0 = .true. ! surface mixing length scale = F(wind stress) (T) or not (F) 16 16 rn_mxl0 = 0.04 ! surface buoyancy lenght scale minimum value 17 ln_drg = .false. ! top/bottom friction added as boundary condition of TKE18 17 ln_lc = .true. ! Langmuir cell parameterisation (Axell 2002) 19 18 rn_lc = 0.15 ! coef. associated to Langmuir cells … … 26 25 ! = 0 constant 10 m length scale 27 26 ! = 1 0.5m at the equator to 30m poleward of 40 degrees 28 rn_eice = 4 ! below sea ice: =0 ON ; =4 OFF when ice fraction > 1/4 27 nn_eice = 1 ! attenutaion of langmuir & surface wave breaking under ice 28 ! ! = 0 no impact of ice cover on langmuir & surface wave breaking 29 ! ! = 1 weigthed by 1-TANH(10*fr_i) 30 ! ! = 2 weighted by 1-fr_i 31 ! ! = 3 weighted by 1-MIN(1,4*fr_i) 29 32 / -
NEMO/branches/2020/ticket2487/doc/rst/source/conf.py
r12390 r15264 43 43 # General information about the project. 44 44 project = u'NEMO' 45 copyright = u'20 19, NEMO Consortium'45 copyright = u'2020, NEMO Consortium' 46 46 47 47 # The version info for the project you're documenting, acts as replacement for … … 246 246 247 247 # Timestamping 248 import datetime 249 year = datetime.date.today().year 250 copyright = '2008-' + str( year ) + ', NEMO Consortium' 248 copyright = '2008-YYYY, NEMO Consortium' 251 249 252 250 # Link aliases … … 279 277 # Default language to highlight set to fortran 280 278 highlight_language = 'fortran' 279 280 # Extra setting for sphinxcontrib.bibtex upgrade to 2.X.X branche 281 bibtex_bibfiles = ['cfgs.bib', 'ref.bib', 'tests.bib', 'zooms.bib'] -
NEMO/branches/2020/ticket2487/doc/rst/source/guide.rst
r11761 r15264 66 66 67 67 :Release: |release| 68 69 .. only:: draft 70 71 .. Only on draft 72 73 :*Date*: |today| 74 :*SVN rev*: |revision| 68 :SVN rev: |revision| 75 69 76 70 .. include:: readme.rst -
NEMO/branches/2020/ticket2487/doc/tools/check_pkg.py
r11008 r15264 1 #!/usr/bin/env python 1 #!/usr/bin/env python2 2 2 3 3 import sys, importlib -
NEMO/branches/2020/ticket2487/doc/tools/shr_func.sh
r11598 r15264 11 11 printf "\t¤ Generation of the PDF format\n" 12 12 latexmk -r ./latex/global/latexmk.pl -pdfxe ./latex/$1/main/$1_manual \ 13 #1> /dev/null13 1> /dev/null 14 14 [ -f ./latex/$1/build/$1_manual.pdf ] && mv ./latex/$1/build/$1_manual.pdf . 15 15 echo
Note: See TracChangeset
for help on using the changeset viewer.