####### Commits ####### ------------------------------------------------------------------------ r14605 | jchanut | 2021-03-09 17:34:00 +0100 (Tue, 09 Mar 2021) | 2 lines #2636, correct definition of TOP variables in AGRIF ------------------------------------------------------------------------ r14685 | clem | 2021-04-08 17:35:36 +0200 (Thu, 08 Apr 2021) | 1 line 4.0-HEAD: solve negative sublimation problems (ticket #2649) ------------------------------------------------------------------------ r14715 | clem | 2021-04-15 13:41:16 +0200 (Thu, 15 Apr 2021) | 1 line solve ticket #2641 ------------------------------------------------------------------------ r14717 | clem | 2021-04-16 11:42:56 +0200 (Fri, 16 Apr 2021) | 1 line 4.0-HEAD: correctly handle diagnostics of mass, salt and heat budgets (see ticket #2652). And fix Pierre ticket #2642 ------------------------------------------------------------------------ r14719 | clem | 2021-04-16 14:57:38 +0200 (Fri, 16 Apr 2021) | 1 line 4.0-HEAD: forgotten output from previous commit ------------------------------------------------------------------------ r14722 | clem | 2021-04-16 16:47:39 +0200 (Fri, 16 Apr 2021) | 1 line 4.0-HEAD: add a comment related to ticket #2657 ------------------------------------------------------------------------ r14766 | clem | 2021-04-30 11:08:19 +0200 (Fri, 30 Apr 2021) | 1 line 4.0-HEAD: solve ticket #2660 ------------------------------------------------------------------------ r14772 | clem | 2021-04-30 12:22:29 +0200 (Fri, 30 Apr 2021) | 1 line 4.0-HEAD: correct units of some icb diags ------------------------------------------------------------------------ r14777 | clem | 2021-05-03 10:57:28 +0200 (Mon, 03 May 2021) | 1 line 4.0-HEAD: avoid roundoff error (it does not change results, it is only important for online diags) ------------------------------------------------------------------------ r14885 | clem | 2021-05-19 11:10:11 +0200 (Wed, 19 May 2021) | 1 line 4.0-HEAD ICE: the diagnostic of heat flux for ice surface melt was not outputed because of initialization problem ------------------------------------------------------------------------ r15002 | clem | 2021-06-16 11:57:37 +0200 (Wed, 16 Jun 2021) | 1 line Set sette revision to HEAD in svn:externals property ------------------------------------------------------------------------ r15039 | jchanut | 2021-06-22 11:27:55 +0200 (Tue, 22 Jun 2021) | 2 lines #2698, Repro/restart potential issue with AGRIF and passive tracers ------------------------------------------------------------------------ r15045 | clem | 2021-06-23 12:43:59 +0200 (Wed, 23 Jun 2021) | 1 line 4.0-HEAD: bug found by ecmwf: do not do ice remapping if, by some mystery and in very rare occasion, hR=hL=hice. ------------------------------------------------------------------------ r15092 | clem | 2021-07-06 17:16:05 +0200 (Tue, 06 Jul 2021) | 1 line ldf_eiv: probably a typo but the wrong field was masked ------------------------------------------------------------------------ r15110 | clem | 2021-07-08 14:58:54 +0200 (Thu, 08 Jul 2021) | 1 line 4.0-HEAD: change nn_qtrice from 1 to 0 since option 1 seems to be unphysical ------------------------------------------------------------------------ r15214 | timgraham | 2021-08-31 15:29:53 +0200 (Tue, 31 Aug 2021) | 2 lines Fix for #2716 ------------------------------------------------------------------------ r15231 | clem | 2021-09-08 09:58:57 +0200 (Wed, 08 Sep 2021) | 1 line 4.0-HEAD: small bug fixes following tickets #2644 #2679 #2688 ------------------------------------------------------------------------ r15236 | clem | 2021-09-08 16:45:24 +0200 (Wed, 08 Sep 2021) | 1 line 4.0-HEAD: solve ticket #2719 ------------------------------------------------------------------------ r15269 | clem | 2021-09-17 11:47:48 +0200 (Fri, 17 Sep 2021) | 1 line 4.0-HEAD: change FCM revision number for compilation with JEAN-ZAY. See ticket #2622 ------------------------------------------------------------------------ r15364 | smasson | 2021-10-13 18:19:50 +0200 (Wed, 13 Oct 2021) | 1 line r4.0-HEAD: bdy minor bugfix for some domain decomposition ------------------------------------------------------------------------ r15367 | davestorkey | 2021-10-14 10:00:58 +0200 (Thu, 14 Oct 2021) | 2 lines r4.0-HEAD : fix for wind forcing of icebergs #2728 ------------------------------------------------------------------------ r15369 | davestorkey | 2021-10-14 15:11:28 +0200 (Thu, 14 Oct 2021) | 3 lines r4.0-HEAD : modification for last change (#2728). Change to an IF block rather than single line IF(x) do this;do that. Seems to work for me but probably not safe. Thanks to Pierre for spotting that. ------------------------------------------------------------------------ r15371 | smueller | 2021-10-14 17:02:36 +0200 (Thu, 14 Oct 2021) | 2 lines Optional replacement of non-standard intrinsic function ISNAN (ticket #2720) ------------------------------------------------------------------------ r15393 | cetlod | 2021-10-18 12:51:51 +0200 (Mon, 18 Oct 2021) | 1 line r4.0-HEAD : bugfix in passive tracer surface boundary condition trend of flux, see ticket #2733 ------------------------------------------------------------------------ r15405 | smueller | 2021-10-19 20:29:49 +0200 (Tue, 19 Oct 2021) | 2 lines Correction of the initial vertical-scale-factor adjustment due to embedded sea ice (ticket #2729) ------------------------------------------------------------------------ r15438 | clem | 2021-10-22 16:56:07 +0200 (Fri, 22 Oct 2021) | 1 line 4.0-HEAD: freshwater budget is now corrected for option nn_fwb=2. The option could be improved. There is a drift the 1st year and the correction applied can lead to oscillations in the solution. It is related to tickets #2718 and part of #2487 though the fix is somewhat different than proposed in the tickets. ------------------------------------------------------------------------ r15451 | clem | 2021-10-27 16:46:28 +0200 (Wed, 27 Oct 2021) | 1 line 4.0-HEAD only: change vertical scale factors for embedded sea ice as proposed in ticket #2487. ------------------------------------------------------------------------ r15458 | clem | 2021-10-28 17:12:05 +0200 (Thu, 28 Oct 2021) | 1 line 4.0-HEAD: recalculate vertical scale factors in istate.F90 for wetting and drying and user defined configurations (related to change of ssh). Should solve ticket #2736 for 4.0. Not sure we also need to change the trunk? ------------------------------------------------------------------------ r15493 | clem | 2021-11-10 17:02:17 +0100 (Wed, 10 Nov 2021) | 1 line 4.0-HEAD: correct output for rheology ------------------------------------------------------------------------ r15495 | clem | 2021-11-10 17:18:22 +0100 (Wed, 10 Nov 2021) | 1 line 4.0-HEAD: solve ticket #2737. The ssh is now adjusted to the init of sea ice, hence the total oce+ice mass remains unchanged across simulations. This applies to both levitating and embedded sea ice. Therefore, results from the configurations with sea ice are changed ------------------------------------------------------------------------ r15518 | edblockley | 2021-11-16 17:57:25 +0100 (Tue, 16 Nov 2021) | 3 lines Correction to rheology convergence timeseries output to ensure that all iterations on last time-step are output and that the time-axis only includes point from the current run cycle (i.e., starting from nit000+1) ------------------------------------------------------------------------ r15562 | clem | 2021-12-01 09:55:00 +0100 (Wed, 01 Dec 2021) | 1 line 4.0-HEAD: forgotten commit to make VORTEX work ------------------------------------------------------------------------ r15563 | jchanut | 2021-12-01 16:50:19 +0100 (Wed, 01 Dec 2021) | 2 lines #1791, correct bottom scale factors interpolation at U/V/F points with non-linear free surface ------------------------------------------------------------------------ r15564 | jchanut | 2021-12-01 17:35:59 +0100 (Wed, 01 Dec 2021) | 2 lines #2751, fixes small constancy preservation issue with AGRIF ------------------------------------------------------------------------ r15565 | jchanut | 2021-12-01 18:10:11 +0100 (Wed, 01 Dec 2021) | 2 lines #2594, move AGRIF boundary conditions on avm_k (cosmetic) ------------------------------------------------------------------------ r15593 | cetlod | 2021-12-13 12:01:58 +0100 (Mon, 13 Dec 2021) | 1 line v40-HEAD : bugfix in output of Kz for Offline configuration's purposes, see ticket #2747 ------------------------------------------------------------------------ r15594 | cetlod | 2021-12-13 12:05:33 +0100 (Mon, 13 Dec 2021) | 1 line v40-HEAD : bugfix in 1D configuration, see ticket #2746 ------------------------------------------------------------------------ r15596 | acc | 2021-12-13 17:28:47 +0100 (Mon, 13 Dec 2021) | 1 line Changes to restart.F90 and trcrst.F90 to address #2735 and cope with requests in nn_stocklist outside the simulation period. These changes also enable a restart file to be generated on nit000, if requested, and will force a restart at nitend even if it is not explicitly listed in nn_stocklist. This closes #2735 ------------------------------------------------------------------------ r15599 | emmafiedler | 2021-12-14 17:07:32 +0100 (Tue, 14 Dec 2021) | 1 line Bug fix: initialise zperc to avoid being uninitialised when ztot==0, ticket #2752 ------------------------------------------------------------------------ r15609 | jchanut | 2021-12-17 15:32:14 +0100 (Fri, 17 Dec 2021) | 2 lines correct AMM12 setup ------------------------------------------------------------------------ r15610 | jchanut | 2021-12-17 16:09:23 +0100 (Fri, 17 Dec 2021) | 2 lines #1791: add namelist parameter nn_vvl_interp to control how scale factors are set at U-V-F points. nn_vvl_interp=0 is the old interpolation scheme that do not account for steps. nn_vvl_interp=1, corrects the bottom thicknesses, but does not ensure that they get too small for stability. nn_vvl_interp=2 is a "qco like" formulation, for which scale factors anomalies are set proportional to the scale factors at rest. Set nn_vvl_interp=2 as the default. ------------------------------------------------------------------------ r15613 | cetlod | 2021-12-22 10:35:54 +0100 (Wed, 22 Dec 2021) | 1 line r4.0-HEAD : bugfix to better manage the diurnal cycle in TOP, see ticket #2739 ------------------------------------------------------------------------ r15618 | clem | 2021-12-27 16:56:45 +0100 (Mon, 27 Dec 2021) | 2 lines change tools revision number for python3 compatibility ------------------------------------------------------------------------ ####### Changes ####### M INSTALL.rst M cfgs/AMM12/EXPREF/namelist_cfg M cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg M cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg M cfgs/SHARED/field_def_nemo-ice.xml M cfgs/SHARED/field_def_nemo-oce.xml M cfgs/SHARED/namelist_ice_ref M cfgs/SHARED/namelist_ref M cfgs/SHARED/namelist_top_ref M doc/latex/global/document.tex M doc/rst/source/conf.py M src/ICE/icedia.F90 M src/ICE/icedyn_rhg_evp.F90 M src/ICE/iceistate.F90 M src/ICE/iceitd.F90 M src/ICE/icestp.F90 M src/ICE/icethd.F90 M src/ICE/icethd_dh.F90 M src/ICE/icethd_ent.F90 M src/ICE/iceupdate.F90 M src/NST/agrif_oce_update.F90 M src/NST/agrif_top_update.F90 M src/NST/agrif_user.F90 M src/OCE/BDY/bdydta.F90 M src/OCE/BDY/bdyice.F90 M src/OCE/C1D/step_c1d.F90 M src/OCE/DIA/diahth.F90 M src/OCE/DIA/diawri.F90 M src/OCE/DOM/dom_oce.F90 M src/OCE/DOM/domain.F90 M src/OCE/DOM/domvvl.F90 M src/OCE/DOM/istate.F90 M src/OCE/FLO/flodom.F90 M src/OCE/ICB/icbdia.F90 M src/OCE/ICB/icbini.F90 M src/OCE/ICB/icbthm.F90 M src/OCE/ICB/icbutl.F90 M src/OCE/IOM/restart.F90 M src/OCE/LDF/ldftra.F90 M src/OCE/SBC/sbc_oce.F90 M src/OCE/SBC/sbcblk.F90 M src/OCE/SBC/sbccpl.F90 M src/OCE/SBC/sbcflx.F90 M src/OCE/SBC/sbcfwb.F90 M src/OCE/SBC/sbcisf.F90 M src/OCE/SBC/sbcmod.F90 M src/OCE/SBC/sbcrnf.F90 M src/OCE/SBC/sbcssr.F90 M src/OCE/TRA/tradmp.F90 M src/OCE/TRA/traqsr.F90 M src/OCE/ZDF/zdfphy.F90 M src/OCE/lib_fortran.F90 M src/OCE/step.F90 M src/OCE/stpctl.F90 M src/OCE/timing.F90 M src/OCE/trc_oce.F90 M src/OFF/dtadyn.F90 M src/TOP/PISCES/P4Z/p4zopt.F90 M src/TOP/PISCES/SED/sedchem.F90 M src/TOP/PISCES/SED/seddta.F90 M src/TOP/TRP/trcsbc.F90 M src/TOP/trc.F90 M src/TOP/trcnam.F90 M src/TOP/trcrst.F90 M src/TOP/trcstp.F90 M tests/CANAL/MY_SRC/domvvl.F90 M tests/VORTEX/MY_SRC/domvvl.F90 M tests/VORTEX/MY_SRC/usrdef_nam.F90