| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/seaice: |
o pkg/seaice: |
| 8 |
|
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
| 9 |
|
1. introduce fields for time step (N-1) |
| 10 |
|
2. do not use levels 2 and 3 anymore (but keep them) |
| 11 |
|
3. replace 3D versions of UICE,VICE,HEFF,AREA by 2D versions. This |
| 12 |
|
includes changes to pkg/thsice/thsice_get_velocity.F, |
| 13 |
|
model/src/external_forcing_surf.F, pkg/obcs/obcs_apply_seaice.F, and |
| 14 |
|
pkg/obcs/obcs_apply_uvice.F. |
| 15 |
|
- completely remove code for leap-frog time stepping for second order |
| 16 |
|
advection |
| 17 |
|
|
| 18 |
|
checkpoint61q |
| 19 |
|
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
| 20 |
|
- the boundary conditions along open boundaries are unclear, because the |
| 21 |
|
associated masks are set to zero and are thus treated as closed when |
| 22 |
|
applying the slip-boundary conditions. |
| 23 |
|
- move initialisation of grid variables from seaice_init_varia to _fixed |
| 24 |
|
o adding doc/diags_changes.txt |
| 25 |
|
o model/src: |
| 26 |
|
do_the_model_io: rename few pkg S/R which are called from do_the_model_io, |
| 27 |
|
to avoid "_diags" naming if no relation to pkg/diagnostics. |
| 28 |
|
ini_theta,ini_salt: fix (at least compile the code) reading from NetCDF |
| 29 |
|
file and only call PLOT_FIELD_XYZ if debugMode=T. |
| 30 |
|
remove few PLOT_FIELD_XY calls outside initialisation. |
| 31 |
|
remove few unnecessary BARRIER. |
| 32 |
|
o pkg/salt_plume: add SaltPlumeSouthernOcean to allow disabling |
| 33 |
|
of salt_plume package in Southern Ocean |
| 34 |
|
o pkg/thsice: |
| 35 |
|
- fix hOceMxL in overlap (needed for sea-ice advection); |
| 36 |
|
update output of experiment global_ocean.cs32x15.icedyn. |
| 37 |
|
o pkg/seaice: |
| 38 |
|
- make the (placeholder-)tracer IceAge a little more meaningful |
| 39 |
|
by avoiding ridging of age due to convergent ice flow |
| 40 |
|
- add diagnostics for surface temperature, atmospheric and oceanic |
| 41 |
|
heat flux, and atmospheric and oceanic ice growth |
| 42 |
|
|
| 43 |
|
checkpoint61p |
| 44 |
|
o eesupp (global_max & global_sum): |
| 45 |
|
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
| 46 |
|
- remove starting & endding barrier (no longer needed) |
| 47 |
|
o pkg/mdsio, writelocal: |
| 48 |
|
works also in multi-threaded when LOCBIN_IO_THREAD_SAFE is undefined |
| 49 |
|
(remove the STOP): uses shared buffer IO to store data from all threads |
| 50 |
|
and then let master-thread write nThreads tiles. |
| 51 |
|
o pkg/mdsio (read/write field): |
| 52 |
|
- tiled IO done in 1 piece (all levels at a time); |
| 53 |
|
- new header file "MDSIO_BUFF_3D.h" with 3-D buffers. |
| 54 |
|
- multi-threaded: allow to read/write local (non-shared) array |
| 55 |
|
(was already working with singleCpuIO ; now works also without); |
| 56 |
|
=> no longer needs barrier call after reading a file (added inside |
| 57 |
|
mds_read/write field). |
| 58 |
|
- move barrier calls outside gather/scatter_2d to mds_read/write_field |
| 59 |
|
o pkg/obcs/exf |
| 60 |
|
- exf_getffieldrec.F: add a few ". _d 0" and |
| 61 |
|
add code to catch the case fldperiod = 0. |
| 62 |
|
- obcs_precribe_read.F: change if statements so that they match |
| 63 |
|
the variable type (_RL) |
| 64 |
|
- add a separate exf_iprec_obcs to exf_set_obcs (by default equal to |
| 65 |
|
exf_iprec) as part of namelist EXF_NML_01 |
| 66 |
|
o pkg/mdsio: |
| 67 |
|
- read/write tiled (local) files: read/write 1-level tile chunk at a time |
| 68 |
|
(instead of segment of length sNx); expected to speed up tiled IO. |
| 69 |
|
o pkg/exch2: |
| 70 |
|
- take buffer copy from/to array out of S/R exch2_send/recv into new |
| 71 |
|
S/R exch2_put/get ; Exch of local variable now works with MPI+MTH |
| 72 |
|
(tested by removing commom block statement in SOLVE_FOR_PRESSURE.h). |
| 73 |
|
- ad version of send/recv no longer needed (but needs exch2_ad_put/ad_get) |
| 74 |
|
- simplify argument list of S/R exch2_get_uv_bounds and exch2_get_scal_bounds |
| 75 |
|
(which replaces exch2_get_recv_bounds & exch2_get_send_bounds) by |
| 76 |
|
including Topology header file (and common blocks). |
| 77 |
|
- implement EXCH_IGNORE_CORNERS in scalar exchange (rx1); |
| 78 |
|
remove 2nd exch call in exch2_s3d_rx (no longer needed). |
| 79 |
|
- document S/R arg. list (+ update some comments) |
| 80 |
|
o pkg/seaice: |
| 81 |
|
- added SEAICE_CLIM_AIR code, which permits modulation of surface air |
| 82 |
|
temperature and humidity over sea ice based on climatological values. |
| 83 |
|
- clean up computation of Hibler+Bryan (1987) stress coupling for the case |
| 84 |
|
of LSR (this change is expected to change the results slightly because now |
| 85 |
|
it uses slightly difference moduli from the second last LSR solution, but |
| 86 |
|
that is more consistent with the stress computations; this part of the code |
| 87 |
|
is not tested in the verification experiments) |
| 88 |
|
- fix diagnostics for flux of ice in case of B-grid |
| 89 |
|
- turn strain rates eij and press into global fields within global |
| 90 |
|
common block in SEAICE.h for more straighforward diagnostics |
| 91 |
|
- fix diagnostics for principal stress components, press, zeta, eta |
| 92 |
|
to give something meaning full |
| 93 |
|
o change tiling of global_ocean.cs32x15 (12 tiles, 32x16) and generate |
| 94 |
|
new output (all 4 tests) using default rotationPeriod. |
| 95 |
|
o pkg KPP: |
| 96 |
|
- add flag (LimitHblStable) to avoid limiting BL depth under stable conditions |
| 97 |
|
- fix vertical indices in RI_IWMIX (match between KPP grid from 0 to Nr+1 |
| 98 |
|
and normal grid from 1 to Nr) |
| 99 |
|
o Fix computations of L4rdt in mom_calc_visc.F |
| 100 |
|
o eesupp: |
| 101 |
|
new S/R ALL_PROC_DIE (like EEDIE, without irrelevant threads err msg): |
| 102 |
|
should be called before a "stop" if we know that all process are going |
| 103 |
|
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
| 104 |
|
|
| 105 |
|
checkpoint61o |
| 106 |
|
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
| 107 |
|
o model/src/ini_curvilinear_grid.F: |
| 108 |
|
compute angleSin/CosC when they are not read from a file |
| 109 |
|
o pkg/seaice: |
| 110 |
|
add pseudo time stepping for LSOR |
| 111 |
|
o pkg/exch2: |
| 112 |
|
temporary fix for exch2_s3d_rx; update results of exp. hs94.cs-32x32x5.impIGW |
| 113 |
|
o pkg/seaice: |
| 114 |
|
Adding separate sea ice albedo, drag coefficients, and HO in Southern |
| 115 |
|
Ocean from those in Arctic Ocean. See *_south in SEAICE_PARAMS.h |
| 116 |
|
o SingleCpuIO: |
| 117 |
|
fix bug put before chkp61n (May 11), when more than 2 MPI cpu are used. |
| 118 |
|
o pkg/seaice: |
| 119 |
|
put exchanged variable in (local) common block for MPI+Multi-Threads |
| 120 |
|
to work (necessary with exch1, and for now with exch2 too). |
| 121 |
|
o verification: to get more experiments tested with mpi, mth and mpi+mth, |
| 122 |
|
change tiling of: |
| 123 |
|
aim.5l_Equatorial_Channel, aim.5l_LatLon, dome, exp4, global_ocean.90x40x15, |
| 124 |
|
hs94.cs-32x32x5, MLAdjust, offline_exf_seaice & tutorial_plume_on_slope |
| 125 |
|
update output of exp: |
| 126 |
|
exp4, global_ocean.90x40x15(+.dwslp), MLAdjust(all 5), |
| 127 |
|
tutorial_plume_on_slope and hs94.cs-32x32x5 (use default rotationPeriod) |
| 128 |
|
+ ideal_2D_ocean: use default rotation period + test Global_Sum_SINGLECPU |
| 129 |
|
(note: output.txt generated on faulks using only 1 tile) |
| 130 |
|
o eesupp & mdsio (SingleCpuIO): |
| 131 |
|
- remove MISSING_TILE_IO (from MDSIO_OPTIONS.h), replaced by run-time |
| 132 |
|
parameter "W2_useE2ioLayOut" (read from file "data.exch2"). |
| 133 |
|
Note: was not effective for globalFile & useSingleCpuIO=F; now fixed. |
| 134 |
|
- move MDSIO_SCPU.h (pkg/mdsio) to EEBUFF_SCPU.h (eesupp/inc). |
| 135 |
|
- fix GLOBAL_SUM_SINGLECPU when using Exch2; re-use same buffers and same |
| 136 |
|
gather/scatter S/R as with SingleCpuIO (=> 1 less 2D global RL array). |
| 137 |
|
o pkg/exch2: |
| 138 |
|
- new code to set-up W2-Exch2 topology (replace matlab-topology-generator): |
| 139 |
|
read parameter file "data.exch2" if it exists; otherwise try default regular |
| 140 |
|
cube without blank-tile; new header file "W2_EXCH2_SIZE.h"; |
| 141 |
|
- update matlab-topology-generator (exch2_setup_cs6_print.m) to be compatible |
| 142 |
|
with new code (not to be used, just as a backup solution). |
| 143 |
|
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
| 144 |
|
in utils/exch2/input. |
| 145 |
|
|
| 146 |
|
checkpoint61n |
| 147 |
|
o eesupp & mdsio (SingleCpuIO): |
| 148 |
|
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
| 149 |
|
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
| 150 |
|
receive real*4 array (instead of real*8) to read/write 32.bit files. |
| 151 |
|
(new template for gather_2d/scater_2d, new set of S/R MDS_PASS_R4,8toRL,S |
| 152 |
|
and remove new mapping S/R) |
| 153 |
|
o pkg/mdsio: in preparation for topology-generator within pkg/exch2: |
| 154 |
|
- Change declaration of SingleCpuIO buffer, reduced to only 1 dim.: |
| 155 |
|
xyBuffer_size, which is set to W2_ioBufferSize from W2_EXCH2_PARAMS.h |
| 156 |
|
when using exch2. Add S/R to map global io-buffer to global model array. |
| 157 |
|
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
| 158 |
|
|
| 159 |
|
checkpoint61m |
| 160 |
|
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
| 161 |
|
and add 3 other S/R for other types (R4,R8,RS). |
| 162 |
|
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
| 163 |
|
o eesupp/inc/CPP_EEMACROS.h (EXCH & GLOBAL_SUM/MAX macros): |
| 164 |
|
- ensure suffix (_R4,_R8,_RS,_RL) correspondance between macro and S/R ; |
| 165 |
|
- reduce number of macro definitions (keep only those which are used); |
| 166 |
|
can always call directly the corrresponding S/R if needed. |
| 167 |
|
- everywhere in the code: change macros (EXCH & GLOBAL_SUM/MAX) suffix |
| 168 |
|
_R4/_R8 to _RS/_RL when applied to _RS/_RL variable. |
| 169 |
|
Fixed wrong type of arg in: |
| 170 |
|
atm2d/put_ocnvars.F cheapaml/cheapaml.F ocn_compon_interf/ocn_apply_import.F |
| 171 |
|
ctrl/ctrl_map_ini_ecco.F seaice/seaice_do_diags.F seaice/seaice_model.F |
| 172 |
|
To fix: global_sum of var in common block is wrong (multi-threaded) in: |
| 173 |
|
dic/dic_atmos.F ebm/ebm_area_t.F ebm/ebm_zonalmean.F sbo/sbo_calc.F |
| 174 |
|
To fix: aim_v23/aim_do_co2.F (BARRIER & GLOBAL_SUM within bi,bj loops) |
| 175 |
|
o adjustment.cs-32x32x1: test "blank tiles" when compiling with mpi; 2nd |
| 176 |
|
"nlfs" mpi test is going to stop when checking for unconnected tile egdes. |
| 177 |
|
o eesupp/src: new S/R to stop everyone when 1 (or more) Proc. find an error |
| 178 |
|
o pkg/exch2: new S/R EXCH2_CHECK_DEPTHS to check that unconnected tile |
| 179 |
|
edges are closed (zero depth); might happen with "blank tiles"; |
| 180 |
|
for now, disabled if using OBCS. |
| 181 |
|
o tools/gemake2: delete modifs from March 27-29 2009 (with option "-mpi": |
| 182 |
|
link *_mpi files from "MODS" dir) to return to a strait-forward behavior. |
| 183 |
|
o move read_write.F to write_utils.F ; new parameter (maxLengthPrt1D) |
| 184 |
|
to reduce length of 1.D array print in STDOUT. |
| 185 |
|
o adjustment.cs-32x32x1: changed to oceanic test with 1 continent |
| 186 |
|
+ use 48 tiles (16x8): this will allow to test "blank tiles". |
| 187 |
|
o start to test MPI + multi-threaded (change testreport to skip tests |
| 188 |
|
where number of tiles do not match). |
| 189 |
|
o genmake2: add option "-omp" to turn on Open-MP ; |
| 190 |
|
passed to testreport (if using -mth) ; merge few (*+mth) optfiles. |
| 191 |
|
o pkg/exch2 (+ utils/exch2): ignore blank tiles (instead of removing them) |
| 192 |
|
and keep the original tile numbering. Note: compatible with old |
| 193 |
|
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
| 194 |
|
|
| 195 |
|
checkpoint61l |
| 196 |
|
o Overlaps had been forgotten in calculating ijk keys : fixed |
| 197 |
|
o fix cyrus makedepend for gcc 4.4 |
| 198 |
|
o experiment fizhi-cs-aqualev20: |
| 199 |
|
switching to new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE) |
| 200 |
|
and generate new output. Note: new output is much closer to the old |
| 201 |
|
one (v1.8) generated with pgf77 -O2 on Mar 14 2007 than it is from |
| 202 |
|
the previous one (v1.9) generated with pgf77 -O0 on Jun 13 2007. |
| 203 |
|
o pkg/fizhi: |
| 204 |
|
- change to avoid indices going deliberately over array-bounds |
| 205 |
|
- remove unnecessary MPI stuff |
| 206 |
|
- perpetual spring equinox with "#define FIZHI_USE_FIXED_DAY" |
| 207 |
|
- new version of S/R GETPWHERE available with #define TRY_NEW_GETPWHERE: |
| 208 |
|
does not go over array-bounds and therefore returns reliable output. |
| 209 |
|
- in fizhi_driver.F & fizhi_turb.F, fix "get_alarm" calls: |
| 210 |
|
this S/R has 4 output arguments, which are used inside "get_alarm"; |
| 211 |
|
when it is called with the same variable "ndum" in place of several |
| 212 |
|
output arguments, this produces weird side effect inside "get_alarm" |
| 213 |
|
(e.g., datein=dates(n) is overwritten by timein=times(n) since both |
| 214 |
|
datein & timein, resp. 2nd and 3rd arg., are pointed to the same "ndum" |
| 215 |
|
address) and produces error. |
| 216 |
|
o tools/gemake2: (March 27-29 2009) |
| 217 |
|
with option "-mpi": link *_mpi files from "MODS" dir (this is what |
| 218 |
|
testreport does). |
| 219 |
|
o lab_sea experiment: change from 2x1 tiles to 2x2 tiles and regenerate output |
| 220 |
|
o pkg/seaice: fix bug in new version of S/R SEAICE_LSR.F: |
| 221 |
|
update lab_sea.lsr & lab_sea.salt_plume results |
| 222 |
|
o pkg/seaice: |
| 223 |
Major overhaul of the LSOR solver: change discretization from original |
Major overhaul of the LSOR solver: change discretization from original |
| 224 |
finite differences to finite volume. The old routine is still in the |
finite differences to finite volume. The old routine is still in the |
| 225 |
file seaice_lsr.F and can be turned on with the CPP-flag |
file seaice_lsr.F and can be turned on with the CPP-flag |
| 231 |
results by setting the above flag. |
results by setting the above flag. |
| 232 |
Further changes involve changes in defaults: |
Further changes involve changes in defaults: |
| 233 |
- ALLOW_FLOODING is defined and turned on by default |
- ALLOW_FLOODING is defined and turned on by default |
| 234 |
- SEAICE_advSnow = .true. is now the default |
- SEAICEadvSnow = .true. is now the default |
| 235 |
- SEAICE_advSalt = .true. is now the default |
- SEAICEadvSalt = .true. is now the default |
| 236 |
- SEAICE_advAge = .true. is now the default |
- SEAICEadvAge = .true. is now the default |
| 237 |
|
- SEAICE_clipVelocities = .false. is now the default |
| 238 |
|
(as per J. Zhang's recommendation) |
| 239 |
- B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE |
- B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE |
| 240 |
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
| 241 |
- seaice_growth: replace computation of UG by a simple copy from wspeed |
- seaice_growth: replace computation of UG by a simple copy from wspeed |
| 254 |
seaice_calc_strainrates: fixed a bug in no-slip boundary conditions, |
seaice_calc_strainrates: fixed a bug in no-slip boundary conditions, |
| 255 |
they were effectively only half slip |
they were effectively only half slip |
| 256 |
affects lab_sea.hb87 |
affects lab_sea.hb87 |
| 257 |
updated all relevant verification experiments |
updated all relevant verification experiments (except lab_sea//output_adm.txt |
| 258 |
|
which was left over, but fails at level 7 & 6) |
| 259 |
|
|
| 260 |
checkpoint61j |
checkpoint61j |
| 261 |
o pkg/seaice: turn a few hard wired parameters into run time parameters |
o pkg/seaice: turn a few hard wired parameters into run time parameters |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch