Timeline
2020-02-14:
- 18:17 Changeset [12390] by
-
Adjustments of the documentation (version numbers, download URL) of the candidate for the next point release of NEMO version 4.0
- 17:56 Changeset [12389] by
-
Pinning of revision numbers in externals definitions and adjustments of the documentation (version numbers, download URL, etc.) for the latest point release of NEMO version 4.0
These changes should have been made in NEMO/releases/release-4.0-HEAD prior to creating the tag NEMO/releases/release-4.0.2.
- 17:41 Changeset [12388] by
-
Add in Ed's code to get sea ice skin temperatures from JULES and use that in the melt pond refreezing code.
- 14:55 Changeset [12387] by
-
corrections to tramle & zdfosm to avoid division by 0 and restored OSMOSIS variables in output.abort
- 14:53 Changeset [12386] by
-
corrections to tramle & zdfosm to avoid division by 0 and restored OSMOSIS variables in output.abort
- 14:17 Changeset [12385] by
-
create branch to test NERC externals
2020-02-13:
- 19:44 Ticket #2382 (Faulty option 1 of the freshwater budget adjustment mechanism (`nn_fwb = ...) created by
-
==== Context
The bug described in ticket #2381 is also present in the …
- 19:16 Ticket #2381 (Faulty option 1 of the freshwater budget adjustment mechanism (`nn_fwb = ...) created by
-
==== Context
After changing the freshwater budget correction to option 1 …
- 17:21 Changeset [12384] by
-
corrections to tramle & zdfosm to avoid division by 0
- 17:21 Changeset [12383] by
-
restored OSMOSIS vriables in output.abort if ln_zdfosm=.t. & hmle if ln_mle_osm=.t.
- 16:36 Changeset [12382] by
-
Add pond lid code that does most of the science.
- 15:15 Changeset [12381] by
-
Updating GO6 branch with G06 version in the apps trunk
- 15:10 Changeset [12380] by
-
Updating obs_oper with obs_oper version in the apps trunk
- 14:38 Ticket #2317 (Wrong asselin correction due to runoffs for vertical scale factors - non ...) closed by
-
fixed
2020-02-12:
- 17:57 Changeset [12379] by
-
Add meltpond lid thickness as a new prognostic.
- 15:57 Changeset [12378] by
-
Create 2020 branches directory
- 15:39 Changeset [12377] by
-
The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.
This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:
svn merge —ignore-ancestry \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./
The —ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.
The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.
2020 developments can be started from any trunk revision later than this one.
- 15:06 Changeset [12376] by
-
Immediate tag copy of 4.0-HEAD as release-4.0.2. From now on point releases (such as this) should remain unchanged. Bug fixes or additions in response to tickets should be done on the 4.0-HEAD branch and a new point release made when appropriate
- 15:00 Changeset [12375] by
-
Copied trunk@12367 to releases/release-4.0-HEAD before merging in 2019 developments
- 13:58 Changeset [12374] by
-
Get skin temperature to be passed from the atmosphere
- 13:39 Changeset [12373] by
-
Revert last change
- 13:37 Changeset [12372] by
-
Branch 2019/dev_r11943_MERGE_2019. A few changes to align the option 1 branch with the trunk@12371. These include a fix for #2317 (changes for LFRA freshwater correction) which was done at changeset 12279 on the trunk. These affect dynatf.F90, traatf.F90 and isfdynatf.F90 and pass SETTE but change results in all tests that use freshwater input (expected). All other changes on the trunk are present (where applicable) up to and including changeset 12367 (Solve #2380)
- 13:13 Changeset [12371] by
-
Add changes to match CICE settings.
- 13:09 Changeset [12370] by
-
Add coupling changes.
- 13:06 Changeset [12369] by
-
Add print statements
- 12:46 Changeset [12368] by
-
Make a branch to add melt pond lids. This is the version with lots of print statements (do not use in long runs).
2020-02-11:
- 19:37 Changeset [12367] by
-
solve ticket #2380
- 17:12 Ticket #2380 (issues in fld_bdy_interp) created by
-
==== Context
Running regional configuration when the number of vertical …
- 12:17 Changeset [12366] by
-
#2317, revert to the correct sign for asselin term on e3t and runoffs
- 12:13 Ticket #2317 (Wrong asselin correction due to runoffs for vertical scale factors - non ...) reopened by
-
- 11:38 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by
-
(diff)
- 11:32 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by
-
(diff)
- 11:24 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by
-
(diff)
- 11:12 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by
-
(diff)
- 10:34 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by
-
(diff)
- 10:34 Ticket #2379 (VALID-11_clevy_OASIS_TESTCASE) created by
-
[…]
==== Workplan action
Wikipage: …
- 10:24 Changeset [12365] by
-
Bug fix for iceberg restart files
2020-02-10:
- 18:21 Changeset [12364] by
-
Modifications in diaobs.F90 to include SIT flags
-
rblod's Avatar - 14:57 Ticket #2378 (numnul with Agrif) created by
-
==== Context
Trying to run Vortex test case or Agrif Demo fails (compiled …
- 10:54 Changeset [12363] by
-
Removing line which subtracts SSH inc in dynspg_ts (not used in GO6). This avoids introducing spurious near surface freshening when assimilating SSH obs.
- 10:52 Changeset [12362] by
-
Minor edit to allow merging of obs branch with (amm15 and GO6) package branches.
2020-02-07:
- 18:15 Changeset [12361] by
-
add refernce namelist for the sediment module
- 18:13 Changeset [12360] by
-
various bugfixes on the sediment module and on p4zmeso
2020-02-06:
- 16:41 Changeset [12359] by
-
Removing line which subtracts SSH inc in dynspg_ts. This avoids introducing spurious near surface freshening when assimilating SSH obs.
- 16:40 Changeset [12358] by
-
Removing line which subtracts SSH inc in dynspg_ts. This avoids introducing spurious near surface freshening when assimilating SSH obs.
- 16:31 Changeset [12357] by
-
Create a branch for PS44 (AMM15 and AMM7).
- 16:29 Changeset [12356] by
-
Create a branch for PS44 (AMM15 and AMM7).
- 15:28 Changeset [12355] by
-
Removing line which subtracts SSH inc in dynspg_ts. This avoids introducing spurious near surface freshening when assimilating SSH obs.
- 14:58 Changeset [12354] by
-
Reverted change made when merging branches at r10268. Removing this line avoids introducing spurious near surface freshening when assimilating SSH obs.
2020-02-05:
-
Tags VC added
2020-02-01:
- 18:00 Working Groups/SI3 edited by
-
(diff)
- 17:42 Working Groups/SI3 edited by
-
(diff)
- 17:39 Working Groups/SI3 edited by
-
(diff)
2020-01-31:
- 20:00 Ticket #2377 (Incorrect restart after the first year of the model run when option 2 of ...) created by
-
==== Context
The defect described in ticket #2376 was also found in the …
- 19:40 Ticket #2376 (Incorrect restart after the first year of the model run when option 2 of ...) created by
-
==== Context
Output from the model in a variant of the ORCA2_ICE_PISCES …
2020-01-29:
- 17:15 Changeset [12353] by
-
Branch 2019/dev_r11943_MERGE_2019. Additions to the do loop macro implementation: converted a few loops previously missed because they used jpi-1 instead of jpim1 etc.; changed internal macro names in do_loop_substitute.h90 to strings that are much more unlikely to appear in any future code elsewhere and removed the key_vectopt_loop option (and all related code) since the do loop macros have suppressed this option. These changes have been fully SETTE-tested and this branch should now be ready to go back to the trunk.
- 13:24 Changeset [12352] by
-
Update biogeochemical BDY code, and fix a couple of bugs in FABM coupling code. See Met Office utils ticket 305.
- 12:57 Ticket #2375 (Check useless lbc_lnk in icb code) created by
-
[…]
==== Context
After a grep on lbc_lnk (by curiousity), I found …
- 12:12 Changeset [12351] by
-
Rectification of a defect that halved the maximum length of the interval between restarts in model runs with enabled temporal interpolation of forcing fields (field-information flag ln_tint set to .true.)
- 12:08 Changeset [12350] by
-
Rectification of a defect that halved the maximum length of the interval between restarts in model runs with enabled temporal interpolation of forcing fields (field-information flag ln_tint set to .true.)
2020-01-28:
- 17:17 Changeset [12349] by
-
update of the quota version of PISCES + some corrections of the GGE of zooplankton
- 17:16 Changeset [12348] by
-
update of the pisces reference namelist
- 17:14 Ticket #2113 (Restoring restart ability with icebergs) closed by
-
fixed
- 17:13 Changeset [12347] by
-
change comments about lbc_lnk for icb (#2113)
- 17:08 Changeset [12346] by
-
change comments about lbc_lnk for icb (#2113)
- 16:16 Ticket #2374 (changes in option 2 version of iom.F90 which are not in the option 1 ...) created by
-
==== Context
Whilst fixing iom.F90 for another ticket I noticed …
- 15:29 Ticket #2373 (dev_r11943_MERGE_2019 does not compile without key_iomput) closed by
-
fixed
- 15:28 Ticket #2372 (dev_r12072_MERGE_OPTION2_2019 does not compile without key_iomput) closed by
-
fixed
- 15:26 Changeset [12345] by
-
Branch dev_r12072_MERGE_OPTION2_2019. Fixed ticket #2372. Changes to enable compilation without key_iomput
- 15:17 Changeset [12344] by
-
Branch dev_r11943_MERGE_2019. Fixed ticket #2373. Changes to enable compilation without key_iomput
- 12:17 Ticket #2113 (Restoring restart ability with icebergs) reopened by
-
I don't understand how icbergs can affect emp over the haloes as before …
- 11:32 Ticket #2371 (dev_r11943_MERGE_2019 does not compile with gcc) closed by
-
fixed
- 11:31 Ticket #2370 (dev_r12072_MERGE_OPTION2_2019 does not compile with gcc) closed by
-
fixed
- 11:13 Changeset [12343] by
-
Branch 2019/dev_r11943_MERGE_2019. Implement recommended changes to fix ticket #2371
- 11:10 Changeset [12342] by
-
Branch 2019/dev_r12072_MERGE_OPTION2_2019. Implement recommended changes to fix ticket #2370
- 01:40 Ticket #2373 (dev_r11943_MERGE_2019 does not compile without key_iomput) created by
- 01:38 Ticket #2372 (dev_r12072_MERGE_OPTION2_2019 does not compile without key_iomput) created by
-
==== Context
the model does not compile without key_iomput…
==== …
2020-01-27:
- 20:50 Ticket #2371 (dev_r11943_MERGE_2019 does not compile with gcc) created by
- 20:45 Ticket #2370 (dev_r12072_MERGE_OPTION2_2019 does not compile with gcc) created by
-
==== Context
the model does not compile with gcc…
==== Analysis
…
- 18:26 Changeset [12341] by
-
Branch 2019/dev_r11943_MERGE_2019. Minor style changes to do_loop_substitute.h90
- 15:31 Changeset [12340] by
-
Branch 2019/dev_r11943_MERGE_2019. This commit introduces basic do loop macro
substitution to the 2019 option 1, merge branch. These changes have been SETTE
tested. The only addition is the do_loop_substitute.h90 file in the OCE directory but
the macros defined therein are used throughout the code to replace identifiable, 2D-
and 3D- nested loop opening and closing statements with single-line alternatives. Code
indents are also adjusted accordingly.
The following explanation is taken from comments in the new header file:
This header file contains preprocessor definitions and macros used in the do-loop
substitutions introduced between version 4.0 and 4.2. The primary aim of these macros
is to assist in future applications of tiling to improve performance. This is expected
to be achieved by alternative versions of these macros in selected locations. The
initial introduction of these macros simply replaces all identifiable nested 2D- and
3D-loops with single line statements (and adjusts indenting accordingly). Do loops
are identifiable if they comform to either:
DO jk = ….
DO jj = …. DO jj = …
DO ji = …. DO ji = …
. OR .
. .
END DO END DO
END DO END DO
END DO
and white-space variants thereof.
Additionally, only loops with recognised jj and ji loops limits are treated; these are:
Lower limits of 1, 2 or fs_2
Upper limits of jpi, jpim1 or fs_jpim1 (for ji) or jpj, jpjm1 or fs_jpjm1 (for jj)
The macro naming convention takes the form: DO_2D_BT_LR where:
B is the Bottom offset from the PE's inner domain;
T is the Top offset from the PE's inner domain;
L is the Left offset from the PE's inner domain;
R is the Right offset from the PE's inner domain
So, given an inner domain of 2,jpim1 and 2,jpjm1, a typical example would replace:
DO jj = 2, jpj
DO ji = 1, jpim1
.
.
END DO
END DO
with:
DO_2D_01_10
.
.
END_2D
similar conventions apply to the 3D loops macros. jk loop limits are retained
through macro arguments and are not restricted. This includes the possibility of
strides for which an extra set of DO_3DS macros are defined.
In the example definition below the inner PE domain is defined by start indices of
(kIs, kJs) and end indices of (kIe, KJe)
#define DO_2D_00_00 DO jj = kJs, kJe ; DO ji = kIs, kIe
#define END_2D END DO ; END DO
TO DO:
Only conventional nested loops have been identified and replaced by this step. There are constructs such as:
DO jk = 2, jpkm1
z2d(:,
= z2d(:, + e3w(:,:,jk,Kmm) * z3d(:,:,jk) * wmask(:,:,jk)
END DO
which may need to be considered.
- 14:50 Changeset [12339] by
-
MG2019 : defining ice transport component on U/V grid ; otherwise grid transformation fails when trying to compute strait
- 14:49 Changeset [12338] by
-
MG2019_OPT2 : defining ice transport component on U/V grid ; otherwise grid transformation fails when trying to compute strait
- 14:47 Changeset [12337] by
-
trunk : defining ice transport component on U/V grid ; otherwise grid transformation fails when trying to compute strait
2020-01-24:
- 17:25 Changeset [12336] by
-
Branch 2019/dev_r11943_MERGE_2019. A few neutral changes to loop statements so that the perl scripts to perform the upcoming DO LOOP macros substitutions will recognise a few loops that diverge from the common coding convention. These include loops where ji and jj are unnecessarily swapped in order; loops that use jpi-1 (for example) instead of jpim1 and loops with comments between the END DO statements
2020-01-23:
-
setup's Avatar
2020-01-22:
- 15:44 Scientific Advisory Board/Agenda/2020-01-08 edited by
-
(diff)
- 11:41 2020WP/TOP-01_rlod_Antarctic_ice_Sheet_Fe_Source edited by
-
(diff)
- 10:29 2020WP/KERNEL-06_techene_better_e3_management edited by
-
(diff)
- 10:27 2020WP/KERNEL-06_techene_better_e3_management edited by
-
(diff)
- 08:56 2020WP/PUB-05_SI3_documentation edited by
-
(diff)
- 08:31 2020WP/PUB-03_NDS_CHAPTER edited by
-
(diff)
- 08:27 2020WP/SI3-03_VP_rheology edited by
-
(diff)
- 08:27 2020WP/SI3-04_lagrangian_drifters edited by
-
(diff)
- 08:21 2020WP/SI3-03_VP_rheology edited by
-
(diff)
2020-01-21:
- 22:14 2020WP/ENHANCE-04_dford_OBSOP_BGC edited by
-
(diff)
- 19:07 2020WP/HPC-07_mocavero_mpi3 edited by
-
(diff)
- 18:41 2020WP/KERNEL-05_jchanut_ztilde edited by
-
(diff)
- 18:30 2020WP/KERNEL-05_jchanut_ztilde edited by
-
(diff)
- 18:23 2020WP/PHYPRO-03_jchanut_IWdrag edited by
-
(diff)
- 18:21 2020WP/PHYPRO-03_jchanut_IWdrag edited by
-
(diff)
- 18:10 2020WP/AGRIF-05_rblod_CMEMS edited by
-
(diff)
- 17:54 2020WP/AGRIF-03_jchanut_vert_coord_interp edited by
-
(diff)
- 17:52 Ticket #2308 (Optimization of the communications in DYN) closed by
-
duplicate: Replying to girrmann:
> ==== Summary
>
> ||=Action || …
- 16:32 2020WP/ENHANCE-09_rbourdal_massfluxconvection edited by
-
(diff)
- 16:31 2020WP/VALID-08_gsamson_ORCA-ABL-BLK edited by
-
(diff)
- 16:21 2020WP/ENHANCE-13_gsamson_ABL_TOOLS edited by
-
(diff)
- 16:04 Changeset [12335] by
-
Copy of GO8 package branch to fix bugs
revealed by intel compiler.
- 16:04 Changeset [12334] by
-
Make isnow a fraction of the sea ice that is snow covered.
- 15:59 2020WP edited by
-
(diff)
- 15:10 2020WP/ENHANCE-08_davestorkey_fix_2D_vorticity_trends edited by
-
(diff)
- 15:08 2020WP/ENHANCE-01_davestorkey_fix_3D_momentum_trends edited by
-
(diff)
- 15:01 2020WP/ASINTER-04_laurent_bulk_ice edited by
-
(diff) - 14:59 2020WP/ASINTER-04_laurent_bulk_ice edited by
-
(diff)
- 14:56 2020WP/ASINTER-04_laurent_bulk_ice edited by
-
(diff)
- 14:53 2020WP/ASINTER-04_laurent_bulk_ice edited by
-
(diff)
- 14:52 2020WP/ASINTER-03_laurent_bulk_and_wave edited by
-
(diff)
- 14:52 2020WP/ASINTER-03_laurent_bulk_and_wave edited by
-
(diff)
- 14:50 2020WP/ASINTER-03_laurent_bulk_and_wave edited by
-
(diff)
- 14:50 2020WP/ASINTER-03_laurent_bulk_and_wave edited by
-
(diff)
- 12:29 2020WP/HPC-10_mcastril_HPDAonline DiagGPU edited by
-
(diff)
- 12:09 Ticket #2133 (HPC-09_Maisonnave-ATOS-ESIWACE) closed by
-
fixed
- 12:08 Ticket #2150 (TOP-06_emalod_OASIS_interface_between_TOP_and_NEMO) closed by
-
duplicate
- 11:55 2020WP/HPC-04_mcastril_Mixed_Precision_implementation edited by
-
(diff)
- 11:54 2020WP/HPC-04_mcastril_Mixed_Precision_implementation edited by
-
(diff)
- 11:46 Ticket #2195 (HPC-08_XXX_fldread_with_XIOS) closed by
-
wontfix
- 11:45 2019WP/HPC-08_Mirek Andrejczuk_fldread_with_XIOS edited by
-
(diff)
- 11:43 2019WP/HPC-11_Mirek_Andrejczuk_IO_with_XIOS edited by
-
(diff)
- 11:41 2019WP/HPC-05_Mirek Andrejczuk_IOdev edited by
-
(diff)
- 11:37 Ticket #2050 (read namelists using single processor) closed by
-
duplicate
- 11:37 2020WP/PUB-01_cbricaud_crs edited by
-
(diff)
- 11:37 Ticket #2067 (Open namelists in read only mode) closed by
-
wontfix
- 11:36 Ticket #2320 (Improvements in text output) closed by
-
wontfix: To be part of 2020WP
- 11:35 Ticket #2176 (ENHANCE-07_JamesH-sigma_under_ISF) closed by
-
wontfix: This work ended up being delayed as several modifications to the ISF code …
- 11:35 Ticket #2323 (read/write SI3 restart with XIOS) closed by
-
wontfix
- 11:27 2020WP/ASINTER-02_emanuelaclementi_Waves edited by
-
(diff)
- 11:17 2020WP/ENHANCE-05_mathiot_REBUILD edited by
-
(diff)
2020-01-20:
- 17:56 2020WP/ASINTER-03_laurent_bulk_and_wave edited by
-
(diff)
- 17:45 2020WP/ASINTER-04_laurent_bulk_ice edited by
-
(diff)
2020-01-17:
- 17:33 Changeset [12333] by
-
Remove outer IF test that tests for snow thicknesses greater than 0.1. This is already delt with by using the isnow method further up in the code.
- 17:14 Changeset [12332] by
-
Make branch.
- 09:00 Changeset [12331] by
-
trunk : Minor changes on grid_def
2020-01-16:
- 17:34 Changeset [12330] by
-
Pass t_i as the layer 1 sea ice temperature.
- 13:28 Changeset [12329] by
-
restored modernised diahth w/o key
- 10:35 Changeset [12328] by
-
dev_r11943_MERGE_2019 : minor fix to avoid compilation error when using an OCE+TOP configuration without key_top enabled
- 10:34 Changeset [12327] by
-
dev_r12072_MERGE_OPTION2_2019: minor fix to avoid compilation error when using an OCE+TOP configuration without key_top enabled
- 07:56 Changeset [12326] by
-
Adjusted to account for flux form advection
should now work with both types of advection and enveloping bathymetry
moved one off caluculations of depth scales to domain.F90
2020-01-15:
- 16:50 2020WP edited by
-
(diff)
- 16:41 2020WP edited by
-
(diff)
- 16:39 2020WP edited by
-
(diff)
- 16:03 2020WP/ENHANCE-14_smueller_OSMOSIS_streamlining edited by
-
(diff)
- 15:40 2020WP/PHYPRO-01_agn_OSMOSIS_science edited by
-
(diff)
- 15:17 2020WP edited by
-
(diff)
- 14:13 2020WP edited by
-
(diff)
- 14:06 2020WP edited by
-
(diff)
- 13:26 Changeset [12325] by
-
replace halo-copy routines - ticket #2009
- 12:47 Ticket #2188 (SI3-07_tsamados_drags) closed by
-
wontfix
- 12:47 Changeset [12324] by
-
Update with George's latest changes for restartability and reproducibility
( Merge changes 12310:12321 from NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser)
- 12:47 Ticket #2029 (SI3-01(2018WP)_topographic_meltponds) closed by
-
wontfix
- 12:29 2020WP edited by
-
(diff)
- 12:22 Ticket #2369 (ASINTER-04_laurent_bulk_ice) created by
-
[…]
==== Workplan action
Wikipage: …
- 12:19 2020WP/ASINTER-04_laurent_bulk_ice created by
-
-
Tags WP added
- 12:14 2020WP edited by
-
(diff)
- 12:11 2020WP edited by
-
(diff)
- 10:59 Changeset [12323] by
-
Merge changes from /NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser:12178-12226
- 10:33 Changeset [12322] by
-
Update with George's latest changes for restartability and reproducibility
