| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/seaice: |
o pkg/seaice: |
| 8 |
|
- for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's. |
| 9 |
|
- the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to also melt ice. |
| 10 |
|
o pkg/seaice: |
| 11 |
|
- McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty). |
| 12 |
|
- can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h |
| 13 |
|
o pkg/cheapaml: |
| 14 |
|
- from Nico Wienders: New version of this package. |
| 15 |
|
o pkg/flt: |
| 16 |
|
- add CPP options to prevent floats to re-enter the opposite side of |
| 17 |
|
a periodic domain (default: keep periodicity) |
| 18 |
|
o pkg/gmredi: |
| 19 |
|
- apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners |
| 20 |
|
(needed for multi-dim advection). |
| 21 |
|
- switch on GM Advective form in global_ocean.cs32x15 and update output.txt |
| 22 |
|
o model/src: |
| 23 |
|
- fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run. |
| 24 |
|
o tutorial_tracer_adjsens |
| 25 |
|
- extend to NLFS and replace maskC by hFacC |
| 26 |
|
(change reference output accordingly) |
| 27 |
|
|
| 28 |
|
checkpoint62r (2011/01/24) |
| 29 |
|
o testreport: |
| 30 |
|
- add option -deloutp (-do) to remove output file after successful run |
| 31 |
|
- add option -mfile (-mf) for MPI machile-file and for each test-exp, |
| 32 |
|
extract exact list of procs from this file ; adjust COMMAND by |
| 33 |
|
replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs. |
| 34 |
|
o pkg/ecco: replace old ineffective way of penalizing deviations from |
| 35 |
|
first guess (of obcs) with code by Matt Mazloff |
| 36 |
|
o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without |
| 37 |
|
exf/cal |
| 38 |
|
- ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl |
| 39 |
|
and handle case of obcs?period == 0 |
| 40 |
|
Not affected by these changes: There is still an inconsistency in |
| 41 |
|
the computation of start/endrec for the obcs variables for ALLOW_CAL |
| 42 |
|
defined (see comment by Menemenlis, 7-Mar-2003) |
| 43 |
|
- make S/R ctrl_get_gen_rec return something meaningful even if |
| 44 |
|
ALLOW_CAL is not defined |
| 45 |
|
- ctrl_getobcs?: simplify code so that it does not need to use |
| 46 |
|
S/R exf_swapfields |
| 47 |
|
o testreport: |
| 48 |
|
allow to test MPI with different number of processors for each experiment: |
| 49 |
|
create file "SIZE.h.mpi" in each build dir. |
| 50 |
|
Note: update of "-command" argument not yet implemented. |
| 51 |
|
o model/src, pkg/autodiff, pkg/ecco, pkg/seaice: |
| 52 |
|
alleviate the need for additional 3D tapes when using |
| 53 |
|
the non-inear free surface in the adjoint. This is done |
| 54 |
|
by adding an 'update' of hfacc etc. to their current |
| 55 |
|
value at the beginning of forward_step.F. |
| 56 |
|
o pkg/seaice |
| 57 |
|
seaice_lsr: move stress-divergence computations out of outer pseudo- |
| 58 |
|
timestepping loop |
| 59 |
|
o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD' |
| 60 |
|
up, so that the calls of the ctrl_* subroutines are really at the end |
| 61 |
|
of the routine. |
| 62 |
|
o pkg/gmredi: |
| 63 |
|
allow to specify a 2-D horizontal map and a 1-D vertical profil |
| 64 |
|
as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity. |
| 65 |
|
o pkg/seaice: |
| 66 |
|
move lsr iterations from seaice_dynsolver to seaice_lsr. |
| 67 |
|
o pkg/seaice: |
| 68 |
|
reduce memory footprint of seaice mutldim advection tapes, |
| 69 |
|
by using a 2D tape independent of the generic_advdiff ones, |
| 70 |
|
and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc. |
| 71 |
|
|
| 72 |
|
checkpoint62q (2010/12/29) |
| 73 |
|
o model/src: |
| 74 |
|
- check horizontal grid-spacing for unset or zero/negative values. |
| 75 |
|
- change AD test hs94.1x64x5 to be truly a 2-D set-up. |
| 76 |
|
o pkg/flt: |
| 77 |
|
- use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR |
| 78 |
|
- precision of input and output files set according to readBinaryPrec |
| 79 |
|
and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits. |
| 80 |
|
- initial float position from tiled file was not converted to index space |
| 81 |
|
(looks like a bug): fixed to make it similar to initial pos. global file. |
| 82 |
|
o global_ocean.cs32x15: |
| 83 |
|
change SIZE.h of AD set-up to get same tiling as with MPI. |
| 84 |
|
Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11) |
| 85 |
|
o model/src: |
| 86 |
|
add flag to control printing of domain fields (bathymetry, hFac ...) in |
| 87 |
|
ini_mask_etc (call to plot_fieds_xy*). |
| 88 |
|
o pkg/thsice: |
| 89 |
|
if useEXF, some forcing fields are not valid in overlap: fixed by computing |
| 90 |
|
over the interior only + apply EXCH at the end (like with SEAICE advection). |
| 91 |
|
o pkg/mdsio: |
| 92 |
|
- add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer |
| 93 |
|
to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS. |
| 94 |
|
- change barrier call for safe multi-threads access to 3-D shared buffer. |
| 95 |
|
- MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones) |
| 96 |
|
- replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and |
| 97 |
|
remove the 4 S/R MDS_PASS_WH_R4/8toRL/S. |
| 98 |
|
o pkg/flt: |
| 99 |
|
- add fourth-order Runge-Kutta integration |
| 100 |
|
- add basic exch2 support (only 1 facet supported so far!) |
| 101 |
|
o pkg/mdsio+rw: |
| 102 |
|
new S/R to read local (or tile independent) vector (read counterpart of |
| 103 |
|
mds_writevec_loc, and front-end write_glvec_rl/rs). |
| 104 |
|
o global_ocean.cs32x15: additional input_ad.seaice experiment |
| 105 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 106 |
|
(using multidim advection for seaice) |
| 107 |
|
o towards more F95 syntax for array specification in namelist: |
| 108 |
|
- change "data.diagnostics" (data.ptracers was changed before checkpoint62p) |
| 109 |
|
of all verification experiments. |
| 110 |
|
e.g.: line: fields(1,3)='ETAN ','ETANSQ ', |
| 111 |
|
was changed to: fields(1:2,3)='ETAN ','ETANSQ ', |
| 112 |
|
- finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles |
| 113 |
|
o global_ocean.cs32x15: additional input.seaice experiment |
| 114 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 115 |
|
|
| 116 |
|
checkpoint62p (2010/12/17) |
| 117 |
|
o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it |
| 118 |
|
to THSICE_SIZE.h to avoid conflict with pkg/seaice. |
| 119 |
|
o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint. |
| 120 |
|
allow for use of multim. advection in seaice adjoint. |
| 121 |
|
o pkg/seaice: add diagnostics for snow precipitation and sublimation flux |
| 122 |
|
- first attempt to close budgets by taking into account the freshwater |
| 123 |
|
flux implied by the sublimation of snow and ice. So far only the |
| 124 |
|
volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag |
| 125 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET |
| 126 |
|
o eesupp/src: |
| 127 |
|
new S/R with new option (NML_EXTENDED_F77) to change array specification |
| 128 |
|
from F95 standard to commonly accepted extended F77 form. |
| 129 |
|
This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5) |
| 130 |
|
and to revert back to the original syntax (with -DNML_EXTENDED_F77) |
| 131 |
|
for less tolerant f77 compiler (e.g., pgf77, g77). |
| 132 |
|
o globalFiles: |
| 133 |
|
commented out in parameter file "data" since it's not safe with MPI |
| 134 |
|
(e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much |
| 135 |
|
in this case); no longer commented out in restart test (tst_2+2). |
| 136 |
|
o add adTapeDir to specify a special directory where adjoint tapes are |
| 137 |
|
written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05 |
| 138 |
|
and cannot be used together with mdsioLocalDir. |
| 139 |
|
o nesting pkgs: |
| 140 |
|
- packages_init_variables : put call to OBCS_INIT_VARIABLES in last position |
| 141 |
|
- update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
| 142 |
|
- add parameter files + utils dir + output from short run on beagle. |
| 143 |
|
o pkg/seaice: |
| 144 |
|
fix seaice_growth.F store directives; update results of exp. lab_sea.ad |
| 145 |
|
o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid |
| 146 |
|
unnecessary copying in adjoint code, requires new parameter NMAX_ITER |
| 147 |
|
|
| 148 |
|
checkpoint62o (2010/11/25) |
| 149 |
|
o pkg/exf: |
| 150 |
|
- change CPP option EXF_VERBOSE to run-time logical param exf_verbose. |
| 151 |
|
o pkg/seaice: |
| 152 |
|
- seaice_ocean_stress: split a loop for better vectorization of the |
| 153 |
|
adjoint code |
| 154 |
|
- seaice_growth.F: fix bug in conservation of freshwater connected to |
| 155 |
|
capping of heff, put contribution into d_HEFFbyNEG |
| 156 |
|
- replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat |
| 157 |
|
by something more sensible (parameters that are what their name implies) |
| 158 |
|
- change some defaults, so that by default exf-parameters are used for |
| 159 |
|
things like rhoAir, cpAir,latent/sensible heat parameters, in order |
| 160 |
|
to reproduce the old results, many data.seaice now contain funny values |
| 161 |
|
for cpAir and latent heat of sublimation |
| 162 |
|
o packages_readparms.F: move exf_readparms up in line so that |
| 163 |
|
exf-parameters are visible for other packages (e.g. seaice) |
| 164 |
|
o debugMode & debugLevel=2: |
| 165 |
|
- differentiate between debugMode & debugLevel=2: |
| 166 |
|
debugMode: controls printing of debug messages (sequence of S/R calls). |
| 167 |
|
debugLevel: controls printing of algorithm intermediate results and stats. |
| 168 |
|
- remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2"; |
| 169 |
|
=> allows to print debug-stats without all sequence of call messages. |
| 170 |
|
- switch control of debug print from debugLevel to debugMode in many S/R. |
| 171 |
|
o pkg/obcs (obcs-sponge): |
| 172 |
|
fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the |
| 173 |
|
call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge) |
| 174 |
|
o pkg/generic_advdiff: |
| 175 |
|
- record overlap minimum size for each advection scheme; |
| 176 |
|
- refine criteria on overlap minimum size; |
| 177 |
|
- check and stop (in gad_check) if overlap size is too small. |
| 178 |
|
o pkg/obcs: |
| 179 |
|
- with ptracers: remove multiple calls to obcs_apply_ptracer (only done |
| 180 |
|
once, in ptracers_implicit.F) |
| 181 |
|
- with seaice: remove test on empty file name in obcs_apply_seaice (always |
| 182 |
|
apply OB values when tile has OB) |
| 183 |
|
o model/src, coriolis setting: |
| 184 |
|
- integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical |
| 185 |
|
useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from |
| 186 |
|
files (selectCoriMap=3) with any grid. |
| 187 |
|
- add parameter "fPrime" for constant second Coriolis coeff (default=0). |
| 188 |
|
o pkg/seaice/seaice_growth.F: |
| 189 |
|
a few cosmetic changes that reduce the number of lines of code |
| 190 |
|
o pkg/obcs: add boundary conditions following Stevens (1990) |
| 191 |
|
- the code follows old MOM/NAOSIM code |
| 192 |
|
- so far it is only implemented for the eastern and western boundaries |
| 193 |
|
and NOT for pTracers |
| 194 |
|
o pkg/rbcs: |
| 195 |
|
- replace rbcsInIter by rbcsForcingOffset, the time in seconds at the |
| 196 |
|
beginning of the first rbcs forcing period. |
| 197 |
|
- add option rbcsSingleTimeFiles that makes rbcs read forcing data like the |
| 198 |
|
offline package, i.e., one file per time, labeled by iteration number; |
| 199 |
|
deltaTrbcs sets the timestep with which the data was generated; |
| 200 |
|
rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset. |
| 201 |
|
- rbcsForcingCycle=0 makes forcing non-cyclic. |
| 202 |
|
- make arithmetic safe for negative times and odd forcing periods. |
| 203 |
|
|
| 204 |
|
checkpoint62n (2010/11/09) |
| 205 |
|
o pkg/seaice: |
| 206 |
|
fix masking in free-drift S/R ; update results of exp. lab_sea.fd |
| 207 |
|
o pkg/obcs: |
| 208 |
|
New S/R to copy tracer value from the OB location to narrow band region |
| 209 |
|
(width = same as overlap) beyond the OB: preserve OB value (needed for |
| 210 |
|
high-order scheme) which were overwritten by EXCH call if in overlap |
| 211 |
|
region. Applied to theta, salt, ptracer and advected seaice variables. |
| 212 |
|
With seaice: use maskInC in similar way as in gad_advection.F, |
| 213 |
|
in seaice_advection.F and advect.F. |
| 214 |
|
Update output of experiment seaice_obcs and change exp4 to test OBCS with |
| 215 |
|
4th order Adv.Scheme. for pasive salt and ptracer. |
| 216 |
|
o tools/genmake2: |
| 217 |
|
- when looking for an optfile (not specified), only search for Fortran compiler |
| 218 |
|
(remove sym-link test + setting of CPP + makedepend check + C-compiler check) |
| 219 |
|
- in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm |
| 220 |
|
(instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong) |
| 221 |
|
- set default for CPP to "cpp -traditional -P" (was the case without specifying |
| 222 |
|
an optfile, but otherwise default was just "cpp". |
| 223 |
|
- comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from) |
| 224 |
|
- when "CC" is not set in the optfile, look for possible C compiler |
| 225 |
|
(instead of just setting CC=cc) |
| 226 |
|
- put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes: |
| 227 |
|
=> add a ".F" to ".o" rule for source files with no "#include" (such as |
| 228 |
|
port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS. |
| 229 |
|
- move gfortran before g77 in list of possible Fortran compiler (consistent |
| 230 |
|
with reference compiler switch from g77 to gfortran) |
| 231 |
|
o pkg/seaice: |
| 232 |
|
o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to |
| 233 |
|
seaice_check that stops the model, when the CPP flag is used. |
| 234 |
|
o seaice_growth.F: make capping of ice volume conserving by returning the |
| 235 |
|
capped ice as freshwater to EmPmR. This does not change the verification |
| 236 |
|
experiments but will change runs where the capping is acutally active |
| 237 |
|
o change reference platform+compiler from faulks+g77 to baudelaire+gfortran |
| 238 |
|
(except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5, |
| 239 |
|
global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD), |
| 240 |
|
lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd) |
| 241 |
|
o tools/genmake2: |
| 242 |
|
- merge genmake_warnings & genmake_errors into 1 log file: "genmake.log") |
| 243 |
|
- change DUMPSTATE default to false (can use "-ds" option to switch it to T) |
| 244 |
|
- clean previous genmake log files before anything else. |
| 245 |
|
- change Makefile to remove testreport log files (*.tr_log) and genmake log |
| 246 |
|
files only with "CLEAN" target (instead of "Clean"); |
| 247 |
|
o pkg/generic_advdiff: |
| 248 |
|
Change OBCS in multiDim advection (gad_advection.F): |
| 249 |
|
Use maskInC to prevent intermediate update of tracer-field in OB regions, |
| 250 |
|
thus keeping current-time-step OB values; and remove the call to OBCS_APPLY |
| 251 |
|
which were applying future time-step OB values. |
| 252 |
|
This way, all explicit calculations use current-time-step OB values |
| 253 |
|
(simpler and more consistent). |
| 254 |
|
Affects results when set-up uses time-varying OBC and multi-dim advection; |
| 255 |
|
update output of experiment seaice_obcs. |
| 256 |
|
o pkg/seaice: |
| 257 |
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
| 258 |
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
| 259 |
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch