Context Navigation

Timeline

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:

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

2020-01-24:

17:25 Changeset [12336] by acc: 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:

2020-01-22:

2020-01-21:

2020-01-20:

2020-01-17:

17:33 Changeset [12333] by dancopsey: 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 dancopsey: Make branch.
09:00 Changeset [12331] by cetlod: trunk : Minor changes on grid_def

2020-01-16:

17:34 Changeset [12330] by dancopsey: Pass t_i as the layer 1 sea ice temperature.
13:28 Changeset [12329] by agn: restored modernised diahth w/o key
10:35 Changeset [12328] by cetlod: 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 cetlod: 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 deazer: 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:

2020-01-14:

18:28 Changeset [12321] by agn: added blank namelist sections namtra_mle, namzdf_osm, namosm_mle to cfgs/{GYRE_PISCES,ORCA2_ICE_PISCES}/EXPREF/namelist_cfg
18:28 Changeset [12320] by agn: When key_top and ln_zdfosm chosen, relax ctl_stop to ctl_warn in zdfphy.F90
18:28 Changeset [12319] by agn: FKOSM reproducible after wrapping hbl, hble, dh with ln_lnk_multi & calc ibld over halo points
17:55 2020WP edited by laurent: (diff)
17:53 2020WP edited by laurent: (diff)
14:20 Changeset [12318] by cguiavarch: Create a branch for FKOSM (Fox-Kemper OSMOSIS)
13:40 Changeset [12317] by agn: hmle is now restartable
13:40 Changeset [12316] by agn: added extra trends to field_def_nemo-oce.xml
13:40 Changeset [12315] by agn: define grid_T_SFC in grid_def_nemo.xml
13:40 Changeset [12314] by agn: new namsbc_blk variable ln_humi_dpt added to namelist_ref
13:40 Changeset [12313] by agn: Modify sbcblk.F90 to accept humidity as dewpoint
13:40 Changeset [12312] by agn: restored option to output zd[tsb]dz_pyc
12:49 Ticket #2197 (HPC-09_Mireck_OpenACC) closed by mathiot: wontfix: postpone in 2020 as part of HPC-01_daley_GPU
12:19 2020WP edited by mathiot: (diff)
11:18 Changeset [12311] by cguiavarch: Corrected reversion in tramle.F90 whereby ikmax set too late
10:00 Tag change on System Team/Agenda/2020-01-16 by gsamson: Tags VC added

2020-01-13:

2020-01-11:

2020-01-10:

2020-01-09:

2020-01-08:

2020-01-07:

2020-01-06:

2020-01-03:

2020-01-02:

2019-12-31:

11:28 Changeset [12299] by kingr: Create a branch for testing IAU changes for shelf SLA assimilation.

2019-12-30:

Note: See TracTimeline for information about the timeline view.

Context Navigation

Timeline

2020-01-29:

2020-01-28:

2020-01-27:

2020-01-24:

2020-01-23:

2020-01-22:

2020-01-21:

2020-01-20:

2020-01-17:

2020-01-16:

2020-01-15:

2020-01-14:

2020-01-13:

2020-01-11:

2020-01-10:

2020-01-09:

2020-01-08:

2020-01-07:

2020-01-06:

2020-01-03:

2020-01-02:

2019-12-31:

2019-12-30:

Download in other formats: