Context Navigation

Alter ABL, ICE and TOP timestepping variables to be consistent with new schema: rdt_abl —> rDt_abl rdt_ice —> rDt_ice r1_rdt_ice —> r1_Dt_ice rdttrc —> rn_Dt (always equal to ocean timestep parameter in namelist) r2dttrc —> rDt_trc (current tracer timestep)
Reinstate rn_scal_load (revert previous change): rn_load —> rn_scal_load

Passes SETTE and bit compares with the trunk@12436.

11:00 Changeset [12467] by cguiavarch

Bug fix. Revert sbcrnf change

10:33 Changeset [12466] by jcastill

Copy of the branch r8395_restart_datestamp to add a datestamp to restart files, but updated to vn4.1 for CO8 configurations

10:27 Changeset [12465] by jcastill

Changes as in the original branch but updated to vn4.1

10:22 Changeset [12464] by cguiavarch

Stop ICB melting if surface temperature below the freezing point.

10:15 Changeset [12463] by cguiavarch

Branch to change iceberg melting temperature

2020-02-25:

18:48 Changeset [12462] by jcastill: Copy branch r8395_coupling_sequence@10764 and update to vn4.1 for CO8 configuration
18:24 Changeset [12461] by jcastill: Changes as the original branch updated to vn4.1
17:32 Changeset [12460] by techene: branch for vertical scale factor management in leap frog associated with #2385
17:16 Ticket #2387 (use uninitialized variable in sbcblk) closed by smasson: fixed: fixed in [12459]
17:14 Changeset [12459] by smasson: trunk: fix uninitialized variable in sbcblk, see #2387
16:53 Ticket #2387 (use uninitialized variable in sbcblk) created by smasson: ==== Context Following the merge of 2019 developments, we use …
16:45 Changeset [12458] by mathiot: change XIO_HOME in batch-XC40_METO*
16:42 Changeset [12457] by mathiot: change due to icb restart name change (consistent with ice/trc restart name) (ticket #1927)
16:38 Changeset [12456] by mathiot: branch of sette related to nemo branch ticket1927 (ticket 1927)
16:36 Changeset [12455] by mathiot: add cn_icbrst_indir, cn_icbrst_in , cn_icbrst_outdir , cn_icbrst_out in namelist. Default being restart_icb
16:34 Changeset [12454] by jcastill: Copy of branch r8395_cpl-pressure@11345 for running in vn4.1, CO8 configuration
16:29 Changeset [12453] by jcastill: First implementation of the branch - compiling after merge
11:21 Changeset [12452] by andmirek: sette for ticket #2386
11:14 Changeset [12451] by andmirek: Branch for ticket #2386
10:26 Ticket #2386 (tidy up restart read/write with XIOS) created by andmirek: ==== Context This ticket is to tidy up XIOS restart read/write for NEMO to …
09:52 Changeset [12450] by jcastill: Copy of branch branches/UKMO/r8395_India_uncoupled@11080 updated to vn4.1 for CO8-type configuration

2020-02-24:

18:45 2020WP/KERNEL-06_techene_better_e3_management edited by techene

(diff)

18:44 Ticket #2385 (KERNEL-06_techene_better_e3_management) created by techene

[…] ==== Workplan action KERNEL-06 Better and faster implementation of …

18:04 Changeset [12449] by dancopsey

Snow into meltponds contributes to snow to ice diagnostics affecting thickness and salinity of the ice.
Avoid divide by zero errors by:
- Removing meltponds from small ice areas.
- Removing divide by pond fractions apart from lid shrinking there a minimum pond fraction is imnposed
Ponds leaking into the ocean have a salinity flux to the ocean (also a new diagnostic).
Add vertical fluxing of pond water.

17:39 Changeset [12448] by dford

Update to head of AMM15_v3_6_STABLE_package_collate (12437).

17:19 Changeset [12447] by davestorkey

2020/KERNEL-03_Storkey_Coward_RK3_stage2: Update to head of trunk to pick up new externals definitions.

16:49 Ticket #2384 (ORCA2_OFF_PISCES sette test) created by andmirek

==== Context There is a problem with sette test for ORCA2_OFF_PISCES …

16:04 Changeset [12446] by mathiot

branch for ticket #1927 (iceberg restart name)

15:33 Ticket #2304 (SETTE failed to update some namelist parameter) reopened by mathiot

Ticket closed by mistake during the branch creation.

15:17 Changeset [12445] by mathiot

update to the head of sette (ticket #2304)

15:14 Changeset [12444] by mathiot

Corrections after Simon review: add AGRIF context file in the synchronisation, update sette_rpt.sh to keep old and new usage available, update sette comments and issue with old set as revision in get_dorv (ticket #2304)

14:00 Changeset [12443] by davestorkey

2020/KERNEL-03_Storkey_Coward_RK3_stage2: More variable renaming:
atfp → rn_atfp (use namelist parameter everywhere)
rdtbt → rDt_e
nn_baro → nn_e
rn_scal_load → rn_load
rau0 → rho0

2020-02-21:

17:59 Changeset [12442] by mathiot

changes required in tools after the merge of 2019 branche

17:29 Changeset [12441] by smueller

Record of the appropriate SETTE revision for the current NEMO version-4.0 point-release candidate and removal of SETTE tag sette_release-4.0-HEAD

This changeset includes an inactive externals definition in the svn:externals property of ^{/NEMO/releases-4.0-HEAD; if activated, this externals definition would map subdirectory sette to the appropriate SETTE revision (}/utils/CI/sette@12135) for testing this NEMO version-4.0 point-release candidate. It also removes the tag ^{/utils/CI/sette_release-4.0-HEAD for the same SETTE revision.}

16:11 Changeset [12440] by kingr

Create a branch

15:43 Changeset [12439] by dancopsey

Provide maximum limits to how big ponds can get. If they exceep this they leak water into the ocean.
Water going into melt ponds does not affect ice thickness until it leaks inot the ocean.
Deep snow on sea ice can cover up the ponds by forming a lid.

15:02 Changeset [12438] by jcastill

Remove because it has been merged to the parent branch, AMM15_v3_6_STABLE_package_collate. See Met Office utils ticket 333

14:59 Changeset [12437] by jcastill

Merge changes in branch AMM15_v3_6_STABLE_package_collate_utils333, see Met Office utils ticket 333.

14:55 Changeset [12436] by smueller

Addition of an externals definition to map subdirectory sette to ^{/utils/CI/sette@HEAD}

14:54 Changeset [12435] by jcastill

Remove because changes have been merged to the parent branch AMM15_v3_6_STABLE_package_collate, see Met Office utils ticket 325

14:51 Changeset [12434] by jcastill

Merge development branch AMM15_v3_6_STABLE_package_collate_utils325, see Met Office utils branch 325. As per reviewer's comments, indentation has been included for the added if sentence

14:46 Changeset [12433] by jcastill

Remove because changes have been merged to the parent branch AMM15_v3_6_STABLE_package_collate. See Met Office utils ticket 326

14:42 Changeset [12432] by jcastill

Merge changes in AMM15_v3_6_STABLE_package_collate_utils326, see Met Office utils ticket 326

11:49 Changeset [12431] by mathiot

add option to specify the compiler used in sette_rpt.sh and to specify the number of pass in param.cfg

11:08 Changeset [12430] by mathiot

add option to select compiler in sette_list_avail_rev.sh

10:44 Changeset [12429] by mathiot

remove sette_top_pisces_lbc

10:25 Changeset [12428] by mathiot

merge sette_top_pisces_lbc into sette + add ifort bathc template for MetO computer

10:21 Changeset [12427] by mathiot

copy sette to sette_release-4.0-HEAD before include changes needed to test the trunk in sette

2020-02-20:

18:38 Changeset [12426] by mathiot

synchronisation of sette_top_pisces_lbc with sette

16:19 Changeset [12425] by smueller

Removal of disused 2019 development branches in ^{/utils and}/vendors

16:06 Changeset [12424] by davestorkey

Rename r2dt → rDt
Rename r1_2dt → r1_Dt
Reorganise management of initial Euler timestep for leapfrogging.

This version passes all SETTE tests and bit-compares with the trunk @ 12377

15:29 Changeset [12423] by dancopsey

Correct pond melting.

15:25 Changeset [12422] by mathiot

merge sync_mysrc and sync_expcfg into sync_config, add a clean_config function and add option in sette.sh to activate synchronisation of MY_SCR/EXPREF with CONFIG_ST/EXP00/MY_SRC (-s option) or to clean a config with makenemo clean (-c option)

14:06 Changeset [12421] by smueller

Update of the AGRIF external definition following the reintegration of AGRIF development associated with a 2019 NEMO development into ^{/vendors/AGRIF/dev}

13:42 Changeset [12420] by smueller

Reintegration of the AGRIF development branch associated with NEMO development branch 2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles (^{/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif) into}/vendors/AGRIF/dev

12:27 Ticket #2383 (reproducibility issue with Agrif (likely)) created by clem

==== Analysis I think there is a reproducibility issue when using Agrif …

11:53 Scientific Advisory Board edited by clevy

(diff)

11:52 MembersOfCommittees.update2020.pdf attached to Scientific Advisory Board by clevy

11:13 Changeset [12419] by jcastill

Changes for Met Office utils ticket 325: do inverse barometer correction in coupled mode only if ln_apr_dyn=true

10:52 Changeset [12418] by jcastill

Branch to implement changes for Met Office utils ticket 325

10:25 Changeset [12417] by jcastill

Fix crashes in bgc runs in coupled mode: perform radiation daily cycle for bgc tracers only when ln_dm2dc=.true. in both coupled and uncoupled mode

09:57 Changeset [12416] by jcastill

Branch to implement fixes to biogeochemistry in coupled mode

2020-02-19:

21:29 Changeset [12415] by smueller

Reintegration of 2019 development branch ^{/utils/build_MERGE_2019 into the build directory (}/utils/build)

21:13 Changeset [12414] by smueller

Reintegration of 2019 development branch ^{/utils/tools_MERGE_2019 into the tools directory (}/utils/tools)

19:12 Changeset [12413] by smueller

Synchronisation of the branch for 2019 developments of the build directory with ^{/utils/build@12191}

18:48 Changeset [12412] by smueller

Synchronisation of the 2019 development branch for the tools directory (^{/utils/tools) with}/utils/tools@12273

16:57 Changeset [12411] by jpalmier

new cleaned external version

16:50 New reply on Jobs created by mathiot

[post-doc] Ice/Ocean? Modeller (BAS, Cambridge, UK)

16:46 New topic on Jobs created by mathiot

[post-doc] Ice/Ocean? Modeller (BAS, Cambridge, UK)

16:27 Changeset [12410] by jcastill

Changes necessary for solving utils ticket #333: timestamp for bgc restart

16:18 Changeset [12409] by jcastill

Branch to implement timestamp in biogeochemistry restarts, see utils ticket #333

16:16 Changeset [12408] by jpalmier

update External tested and approuved versions

16:14 Changeset [12407] by frrh

Apply fix for DMS coupling in MEDUSA from Met Office
GMED ticket 514. Merge command:
svn merge -r 12215:12308 svn+ssh://frrh@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/NERC/dev_r5518_GO6_DmsOutFix

10:22 Changeset [12406] by davestorkey

Rename the namelist timestep parameter: rn_rdt → rn_Dt
Use the namelist parameter instead of the non-DOCTOR parameter: rdt → rn_Dt

This version has same SETTE results as the last version. Passes all tests but some
tests don't bit compare with the trunk.

2020-02-18:

18:00 Changeset [12405] by jpalmier: add external on the right release version
17:55 Changeset [12404] by jpalmier: Create branch
17:30 Changeset [12403] by dancopsey: Fix compile errors.
16:53 Changeset [12402] by dancopsey: Add melt pond lid code.
16:21 Changeset [12401] by dancopsey: Add melt pond lid code.
15:09 Changeset [12400] by dancopsey: Make branch to add pond lids
12:43 Ticket #2380 (issues in fld_bdy_interp) closed by clem: fixed
12:40 Changeset [12399] by clem: apply the same improvement (as for bdy) to the init of ice. See revision r12395
12:40 Changeset [12398] by clem: apply the same improvement (as for bdy) to the init of ice. See revision r12395
11:58 Changeset [12397] by davestorkey: 2020/KERNEL-03_Storkey_Coward_RK3_stage2 : Consolidation of code to
handle initial Euler timestep in the context of leapfrog
timestepping. This version passes all SETTE tests but fails to bit
compare with the control for several tests (ORCA2_ICE_PISCES, AMM12,
ISOMIP, AGRIF_DEMO, SPITZ12).
11:24 Changeset [12396] by clem: correct heat diffusion in the ice in case of Jules coupling (Met Office), and add a small improvement when reading ice temperature with bdy
11:23 Changeset [12395] by clem: correct heat diffusion in the ice in case of Jules coupling (Met Office), and add a small improvement when reading ice temperature with bdy
10:44 Changeset [12394] by dancopsey: Fix compile and XIOS errors.

2020-02-17:

12:31 Changeset [12393] by jpalmier: correct External def
12:27 Changeset [12392] by jpalmier: Add new externals definition
11:51 Changeset [12391] by davestorkey: Branch for preliminary work on implementation of new timestepping scheme.
wiki page: https://forge.ipsl.jussieu.fr/nemo/wiki/2020WP/KERNEL-03_Storkey_Coward_RK3_stage2

2020-02-14:

18:17 Changeset [12390] by smueller: 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 smueller: 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 dancopsey: 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 cguiavarch: corrections to tramle & zdfosm to avoid division by 0 and restored OSMOSIS variables in output.abort
14:53 Changeset [12386] by cguiavarch: corrections to tramle & zdfosm to avoid division by 0 and restored OSMOSIS variables in output.abort
14:17 Changeset [12385] by jpalmier: 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 smueller: ==== 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 smueller: ==== Context After changing the freshwater budget correction to option 1 …
17:21 Changeset [12384] by agn: corrections to tramle & zdfosm to avoid division by 0
17:21 Changeset [12383] by agn: restored OSMOSIS vriables in output.abort if ln_zdfosm=.t. & hmle if ln_mle_osm=.t.
16:36 Changeset [12382] by dancopsey: Add pond lid code that does most of the science.
15:15 Changeset [12381] by dcarneir: Updating GO6 branch with G06 version in the apps trunk
15:10 Changeset [12380] by dcarneir: 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 jchanut: fixed

2020-02-12:

17:57 Changeset [12379] by dancopsey: Add meltpond lid thickness as a new prognostic.
15:57 Changeset [12378] by acc: Create 2020 branches directory
15:39 Changeset [12377] by acc: 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 acc: 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 acc: Copied trunk@12367 to releases/release-4.0-HEAD before merging in 2019 developments
13:58 Changeset [12374] by dancopsey: Get skin temperature to be passed from the atmosphere
13:39 Changeset [12373] by dancopsey: Revert last change
13:37 Changeset [12372] by acc: 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 dancopsey: Add changes to match CICE settings.
13:09 Changeset [12370] by dancopsey: Add coupling changes.
13:06 Changeset [12369] by dancopsey: Add print statements
12:46 Changeset [12368] by dancopsey: 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 clem: solve ticket #2380
17:12 Ticket #2380 (issues in fld_bdy_interp) created by clem: ==== Context Running regional configuration when the number of vertical …
12:17 Changeset [12366] by jchanut: #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 jchanut
11:38 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by clevy: (diff)
11:32 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by clevy: (diff)
11:24 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by clevy: (diff)
11:12 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by clevy: (diff)
10:34 2020WP/VALID-11_clevy_OASIS_TESTCASE edited by clevy: (diff)
10:34 Ticket #2379 (VALID-11_clevy_OASIS_TESTCASE) created by clevy: […] ==== Workplan action Wikipage: …
10:24 Changeset [12365] by timgraham: Bug fix for iceberg restart files

2020-02-10:

18:21 Changeset [12364] by dcarneir: Modifications in diaobs.F90 to include SIT flags
14:59 rblod_download-3.jpg attached to User Manager Plugin Pictures by rblod: rblod's Avatar
14:57 Ticket #2378 (numnul with Agrif) created by rblod: ==== Context Trying to run Vortex test case or Agrif Demo fails (compiled …
10:54 Changeset [12363] by kingr: 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 kingr: Minor edit to allow merging of obs branch with (amm15 and GO6) package branches.

2020-02-07:

18:15 Changeset [12361] by aumont: add refernce namelist for the sediment module
18:13 Changeset [12360] by aumont: various bugfixes on the sediment module and on p4zmeso

2020-02-06:

16:41 Changeset [12359] by kingr: 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 kingr: 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 kingr: Create a branch for PS44 (AMM15 and AMM7).
16:29 Changeset [12356] by kingr: Create a branch for PS44 (AMM15 and AMM7).
15:28 Changeset [12355] by kingr: 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 kingr: Reverted change made when merging branches at r10268. Removing this line avoids introducing spurious near surface freshening when assimilating SSH obs.

2020-02-05:

11:00 Tag change on System Team/Agenda/2020-02-06 by gsamson: Tags VC added

2020-02-01:

18:00 Working Groups/SI3 edited by vancop: (diff)
17:42 Working Groups/SI3 edited by vancop: (diff)
17:39 Working Groups/SI3 edited by vancop: (diff)

2020-01-31:

20:00 Ticket #2377 (Incorrect restart after the first year of the model run when option 2 of ...) created by smueller: ==== 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 smueller: ==== Context Output from the model in a variant of the ORCA2_ICE_PISCES …

2020-01-29:

17:15 Changeset [12353] by acc: 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 dford: 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 mathiot: […] ==== Context After a grep on lbc_lnk (by curiousity), I found …
12:12 Changeset [12351] by smueller: 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 smueller: 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 aumont: update of the quota version of PISCES + some corrections of the GGE of zooplankton
17:16 Changeset [12348] by aumont: update of the pisces reference namelist
17:14 Ticket #2113 (Restoring restart ability with icebergs) closed by mathiot: fixed
17:13 Changeset [12347] by mathiot: change comments about lbc_lnk for icb (#2113)
17:08 Changeset [12346] by mathiot: 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 acc: ==== 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 acc: fixed
15:28 Ticket #2372 (dev_r12072_MERGE_OPTION2_2019 does not compile without key_iomput) closed by acc: fixed
15:26 Changeset [12345] by acc: Branch dev_r12072_MERGE_OPTION2_2019. Fixed ticket #2372. Changes to enable compilation without key_iomput
15:17 Changeset [12344] by acc: 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 mathiot: 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 acc: fixed
11:31 Ticket #2370 (dev_r12072_MERGE_OPTION2_2019 does not compile with gcc) closed by acc: fixed
11:13 Changeset [12343] by acc: Branch 2019/dev_r11943_MERGE_2019. Implement recommended changes to fix ticket #2371
11:10 Changeset [12342] by acc: 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 smasson: the model does not compile without iomput… same as #2372 but for …
01:38 Ticket #2372 (dev_r12072_MERGE_OPTION2_2019 does not compile without key_iomput) created by smasson: ==== 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 smasson: ==== Context the model does not compile with gcc… same as #2370 but …
20:45 Ticket #2370 (dev_r12072_MERGE_OPTION2_2019 does not compile with gcc) created by smasson: ==== Context the model does not compile with gcc… ==== Analysis …
18:26 Changeset [12341] by acc: Branch 2019/dev_r11943_MERGE_2019. Minor style changes to do_loop_substitute.h90
15:31 Changeset [12340] by acc: 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 cetlod: MG2019 : defining ice transport component on U/V grid ; otherwise grid transformation fails when trying to compute strait
14:49 Changeset [12338] by cetlod: MG2019_OPT2 : defining ice transport component on U/V grid ; otherwise grid transformation fails when trying to compute strait
14:47 Changeset [12337] by cetlod: trunk : defining ice transport component on U/V grid ; otherwise grid transformation fails when trying to compute strait

Note: See TracTimeline for information about the timeline view.

Download in other formats:

RSS Feed