| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/seaice: |
o pkg/seaice: |
| 8 |
|
fix masking in free-drift S/R ; update results of exp. lab_sea.fd |
| 9 |
|
o pkg/obcs: |
| 10 |
|
New S/R to copy tracer value from the OB location to narrow band region |
| 11 |
|
(width = same as overlap) beyond the OB: preserve OB value (needed for |
| 12 |
|
high-order scheme) which were overwritten by EXCH call if in overlap |
| 13 |
|
region. Applied to theta, salt, ptracer and advected seaice variables. |
| 14 |
|
With seaice: use maskInC in similar way as in gad_advection.F, |
| 15 |
|
in seaice_advection.F and advect.F. |
| 16 |
|
Update output of experiment seaice_obcs and change exp4 to test OBCS with |
| 17 |
|
4th order Adv.Scheme. for pasive salt and ptracer. |
| 18 |
|
o tools/genmake2: |
| 19 |
|
- when looking for an optfile (not specified), only search for Fortran compiler |
| 20 |
|
(remove sym-link test + setting of CPP + makedepend check + C-compiler check) |
| 21 |
|
- in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm |
| 22 |
|
(instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong) |
| 23 |
|
- set default for CPP to "cpp -traditional -P" (was the case without specifying |
| 24 |
|
an optfile, but otherwise default was just "cpp". |
| 25 |
|
- comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from) |
| 26 |
|
- when "CC" is not set in the optfile, look for possible C compiler |
| 27 |
|
(instead of just setting CC=cc) |
| 28 |
|
- put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes: |
| 29 |
|
=> add a ".F" to ".o" rule for source files with no "#include" (such as |
| 30 |
|
port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS. |
| 31 |
|
- move gfortran before g77 in list of possible Fortran compiler (consistent |
| 32 |
|
with reference compiler switch from g77 to gfortran) |
| 33 |
|
o pkg/seaice: |
| 34 |
|
o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to |
| 35 |
|
seaice_check that stops the model, when the CPP flag is used. |
| 36 |
|
o seaice_growth.F: make capping of ice volume conserving by returning the |
| 37 |
|
capped ice as freshwater to EmPmR. This does not change the verification |
| 38 |
|
experiments but will change runs where the capping is acutally active |
| 39 |
|
o change reference platform+compiler from faulks+g77 to baudelaire+gfortran |
| 40 |
|
(except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5, |
| 41 |
|
global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD), |
| 42 |
|
lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd) |
| 43 |
|
o tools/genmake2: |
| 44 |
|
- merge genmake_warnings & genmake_errors into 1 log file: "genmake.log") |
| 45 |
|
- change DUMPSTATE default to false (can use "-ds" option to switch it to T) |
| 46 |
|
- clean previous genmake log files before anything else. |
| 47 |
|
- change Makefile to remove testreport log files (*.tr_log) and genmake log |
| 48 |
|
files only with "CLEAN" target (instead of "Clean"); |
| 49 |
|
o pkg/generic_advdiff: |
| 50 |
|
Change OBCS in multiDim advection (gad_advection.F): |
| 51 |
|
Use maskInC to prevent intermediate update of tracer-field in OB regions, |
| 52 |
|
thus keeping current-time-step OB values; and remove the call to OBCS_APPLY |
| 53 |
|
which were applying future time-step OB values. |
| 54 |
|
This way, all explicit calculations use current-time-step OB values |
| 55 |
|
(simpler and more consistent). |
| 56 |
|
Affects results when set-up uses time-varying OBC and multi-dim advection; |
| 57 |
|
update output of experiment seaice_obcs. |
| 58 |
|
o pkg/seaice: |
| 59 |
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
| 60 |
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
| 61 |
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