| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/seaice: |
o pkg/seaice: |
| 8 |
|
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
| 9 |
|
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
| 10 |
|
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
| 11 |
|
Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY |
| 12 |
|
but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp |
| 13 |
|
unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h) |
| 14 |
|
o pkg aim (2010/10/26): |
| 15 |
|
- Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation |
| 16 |
|
formulation with obliquity, eccentricity, ... as run-time parameters, |
| 17 |
|
- Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and |
| 18 |
|
upward shortwave radition at the surface (all-sky and clear-sky). |
| 19 |
|
o pkg/obcs: |
| 20 |
|
- writing sections with globalFiles=T does not work: switch to tiled-files |
| 21 |
|
when writing sections for OBCS (change pkg/rw/write_rec.F accordingly). |
| 22 |
|
- fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F |
| 23 |
|
- apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs |
| 24 |
|
|
| 25 |
|
checkpoint62m (2010/10/21) |
| 26 |
|
o pkg/seaice: vectorize seaice_solve4temp.F |
| 27 |
|
- move iterations loops outside of i/j-loops |
| 28 |
|
- requires 2D arrays for TB and effConduct |
| 29 |
|
- add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is |
| 30 |
|
modified in this routine |
| 31 |
|
- a little bit of clean up, adjusting indentation, etc. |
| 32 |
|
- replaced a few TEN**a by exp(a*log(10.)) in new code for better |
| 33 |
|
performance and '**TWO' by '**2' (because TWO is a float), |
| 34 |
|
replaced ONE, ZERO |
| 35 |
|
o eesupp/src: |
| 36 |
|
fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube |
| 37 |
|
o pkg/seaice/seaice_growth.F |
| 38 |
|
Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and |
| 39 |
|
merging process. The merged routine has two branches, and one activates the 'evolution' |
| 40 |
|
branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now). |
| 41 |
|
In summary, here is what the '10/10 revision' did consist of |
| 42 |
|
part 1: seaice_growth.F revisions 1.71 to 1.75 |
| 43 |
|
- Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged. |
| 44 |
|
The emphasis here was on improving readability (e.g. by trying to use meaningful |
| 45 |
|
variable names) and modularity (e.g. by adding arrays to store heff etc. updates). |
| 46 |
|
part 1.5: |
| 47 |
|
- revising the lab_sea experiment to make it a more useful (i.e. stable |
| 48 |
|
and representative of an actual model run). This was done by generating a |
| 49 |
|
(winter) pickup to start from, switching back the main experiment dynamic |
| 50 |
|
solver from evp to lsr, having one of the experiments use the free drift solution. |
| 51 |
|
part 2: seaice_growth.F revisions 1.76 to 1.85 |
| 52 |
|
- Sorting out hard-coded constants that prevented heat and fresh water conservation. |
| 53 |
|
- Sorting out the various fields units and sign (set early on and reset at the end) |
| 54 |
|
to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and |
| 55 |
|
fresh water stock is 'effective ice meters', and >0 implies more ice/snow. |
| 56 |
|
- Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks, |
| 57 |
|
and simplifying logical expressions to further improve readibility. |
| 58 |
|
part 3: seaice_growth.F revisions 1.86 to 1.89 |
| 59 |
|
- Re-organize the blocks of code more logically. |
| 60 |
|
- Merging the '_if.F' pieces that add something new. |
| 61 |
|
o pkg/thsice: |
| 62 |
|
- vectorize thsice_solve4temp and thsice_get_exf. |
| 63 |
|
Problem: thsice_solve4temp has an unvectorizable statement that |
| 64 |
|
might also be problematic for TAF |
| 65 |
|
- thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This |
| 66 |
|
does not change the verifcation experiment, but will change all |
| 67 |
|
experiments that have this flag undefined (not tested in verification); |
| 68 |
|
a little reorganization to save a few 2D fields and recomputations |
| 69 |
|
- 1st step of revisiting thsice adjoint (major recomp. sorted out) |
| 70 |
|
- 2nd step: fix some store dirs |
| 71 |
|
o seems to work somewhat, i.e. using ifort but not g77 |
| 72 |
|
o likely cause are incomplete init. or recomputation |
| 73 |
|
o start verification/global_ocean.cs32x15/input_ad.thsice |
| 74 |
|
o pkg/obcs: add support for exch2 |
| 75 |
|
- the position of the boundary and prescribed values are specified using |
| 76 |
|
a global domain with exch2 facets stacked |
| 77 |
|
- in x for N,S boundaries (like W2_mapIO=-1) |
| 78 |
|
- in y for E,W boundaries (so E,W boundaries do not overlap) |
| 79 |
|
o pkg/mdsio: add support for writing global sections with exch2 |
| 80 |
|
file layout is as for obcs described above: |
| 81 |
|
- for x-z sections, facets are stacked in x (like W2_mapIO=-1) |
| 82 |
|
- for y-z sections, facets are stacked in y |
| 83 |
|
o pkg/thsice: |
| 84 |
|
- change a few routines for better vectorization: thsice_albedo.F, |
| 85 |
|
thsice_step_temp.F, and in thsice_calc_thickn.F. Results are |
| 86 |
|
not affected, but in particular the latter routine has changed |
| 87 |
|
dramatically (not necessarily easier to read now). |
| 88 |
|
- re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops |
| 89 |
|
iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF. |
| 90 |
|
o verification/lab_sea: |
| 91 |
|
- overhaul of the forward model experiments. The main motivation |
| 92 |
|
for this revision is that lab_sea has proven quite fragile (when |
| 93 |
|
changing the sea-ice code, and switching platforms) to a point |
| 94 |
|
when failures were very hard to attribute to specific code problems. |
| 95 |
|
- the suspected reason for this fragility is noise amplification by evp so, |
| 96 |
|
to start with, we decided to replace evp with lsr in the main experiment. |
| 97 |
|
- the input.lsr experiment thus became obsolete and was removed. |
| 98 |
|
- it was replaced with the input.fd experiment that uses an |
| 99 |
|
analytical "free drift" solution as the ice velocity field. |
| 100 |
|
- Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp) |
| 101 |
|
will hopefully allow us to discriminate problems due to dynamic solvers |
| 102 |
|
from problems due to the thermodynamic code. input.salt_plume (lsr) allows |
| 103 |
|
us to test additional options, along with the salt plume package. |
| 104 |
|
- Finally a pickup was generated (at the end of a one year run) to |
| 105 |
|
make the tests more representative of an actual model run. Previously |
| 106 |
|
the tests starting point was a 1m thickness of ice everywhere. |
| 107 |
|
o pkg/seaice: |
| 108 |
|
- introducing S\R seaice_freedrift.F that compute the |
| 109 |
|
analytical solution to an approximate ice momentum |
| 110 |
|
equation (i.e. the simple stress/coriolis balance). |
| 111 |
|
- define SEAICE_ALLOW_FREEDRIFT to trigger the computation |
| 112 |
|
of the free drift velocity field, and enable its use. |
| 113 |
|
To actually use the free drift solution as the model ice |
| 114 |
|
velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice. |
| 115 |
|
o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata" |
| 116 |
|
|
| 117 |
|
checkpoint62l (2010/10/04) |
| 118 |
|
o pkg/seaice: |
| 119 |
|
-fix the USE_ORIGINAL_SBI version (for variable freezing point); |
| 120 |
|
-use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new |
| 121 |
|
version (with USE_ORIGINAL_SBI undef); |
| 122 |
|
o add hooks for new packages OASIS, the package will follow |
| 123 |
|
(hooks exclude the seaice pkg for now) |
| 124 |
|
o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO |
| 125 |
|
Option to use mdsio_read_whalos.F/mdsio_write_whalos.F, |
| 126 |
|
rather than mdsio_readvector.F/mdsio_writevector.F, within |
| 127 |
|
adread_adwrite.F to read/write adjoint-related tapes to disk. |
| 128 |
|
o eesupp and pkg/mdsio: ALLOW_WHIO |
| 129 |
|
Option to write/read 2D fields to files including tiles halos. |
| 130 |
|
The main purpose is for adjoint related "tape I/O". |
| 131 |
|
The secondary purpose is for debugging phases. |
| 132 |
|
A word on those rather specifically intended purposes. |
| 133 |
|
The code was meant to be stripped down to the bare minimum. |
| 134 |
|
Typically, there is a unique and basic mapping to the global |
| 135 |
|
buffer (tile by tile, then proc by proc, then level by level), and |
| 136 |
|
byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not |
| 137 |
|
meant to generate user friendly outputs of various shapes and forms. |
| 138 |
|
Rather it is intended, for the knowledgeabale developers, |
| 139 |
|
to be largely independent of the many mdsio options, to allow |
| 140 |
|
outputs of tiles+halos in debugging phases and in adjoint runs, |
| 141 |
|
and to allow some flexibility in tuning (adoint) I/O depending on each |
| 142 |
|
file system behavior. With regard to tuning, most of the potential knobs |
| 143 |
|
(to leave files open, to allocate the I/O indep. of usesinglecpuio, |
| 144 |
|
to specify directories, to specify the typical size of I/O calls, etc.) |
| 145 |
|
are not yet included, and will be added if they prove useful. |
| 146 |
|
o pkg/seaice: |
| 147 |
fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F |
fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F |
| 148 |
o pkg/seaice: |
o pkg/seaice: |
| 149 |
new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty |
new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty |
| 432 |
but keep the former optfile for few weeks for smooth transition |
but keep the former optfile for few weeks for smooth transition |
| 433 |
o pkg/ecco |
o pkg/ecco |
| 434 |
- allow user defined cost function contributions |
- allow user defined cost function contributions |
| 435 |
CPP: ALLOW_USERCOST_CONTRIBUTION |
CPP: ALLOW_USERCOST_CONTRIBUTION |
| 436 |
USAGE: compute contributions in cost_usercost_all.F |
USAGE: compute contributions in cost_usercost_all.F |
| 437 |
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
| 438 |
the two options are complementary. |
the two options are complementary. |
| 439 |
o pkg/smooth |
o pkg/smooth |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch