Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint66m: | (view) (download) (annotate) |
| Sticky Tag: |
add option for wet-point average of velocity at grid-cell center in uStar expression. Note: should be run-time switch but for now, just a CPP option.
redefining uLoc/vLoc to u/v, instead of 2u/v
limit effects of shelficeboundarylayer to where hFacC(kTopC)<1
fix previous modif (missing #ifdef SHI_ALLOW_GAMMAFRICT)
fix previous code addition
introduce diagnostics for friction velocity uStar (in case of SHELFICEuseGammaFrict)
remove global variable recip_SHELFICElatentHeat and replace by a local variable recip_latentHeat
from Dan Goldberg: rename some recently added variables and move update of shelficeMass by pkg/streamice into shelfice_step_icemass.F (previously in shelfice_thermodynamics.F)
update files to update shelficemass based on either (a) melt rate and file for ice dyn or (b) thickness of ice from STREAMICE, and also update shelficeLoadAnomaly
- pkg/shelfice/shelfice_thermodynamics.F : add useCTRL switch
o pkg/shelfice/shelfice_thermodynamics.F : add wshifwflx in CTRL_GET_GEN call
- Include explicitly AUTODIFF_OPTIONS.h & CTRL_OPTIONS.h (in case we don't use ECCO_CPPOPTIONS.h) - Replace ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for tape/storage which are specific to TAF/TAMC).
define "recip_Cp" as local variable (no longer in common block)
Replace ALLOW_AUTODIFF_OPENAD by ALLOW_OPENAD: because ALLOW_OPENAD is defined in PACKAGES_CONFIG.h (any time pkg/openad is compiled), this simplifies/reduces which *_OPTIONS.h file to include.
update shelficeLoadAnomaly (in case the ice-shelf mass was updated), but disabled when ALLOW_AUTODIFF is defined
Small modifications required for OpenAD
continue cleaning up inclusions of CTRL_SIZE.h
- simply eps3/3a computation - add debugging output
add parameterisation of advective-diffusive flux into the ice shelf according to Holland and Jenkins (1999), eq.22-33, as suggested by Jan De Ryd Add some comments in SHELFICE.h about useGammaFrict
- improve computation of friction velocity for velocity dependent exchange coefficients: use similar schematic as for "boundary layer scheme" to average velocities vertically in order to avoid jumps near layers boundaries - add TAF store directives for SHI_ALLOW_GAMMAFRICT
- fix the fix of the fix: move computation of transfer coefficients down to where ploc is defined, and also fix gammaTurbConst - add diagnostics for the transfer coefficients
fix previous fix
- fix exponents for velocity dependent exchange coefficients: change
from 2/3(=0) to 0.66666666666666667
- move computation of velocity dependent exchange coefficients into
separate loop, so that it applies to both thermodynamics
- move some divisions by constants out of loops
Change Prandtl and Schmidt numbers from generic formulations (in terms of model diffus. and visc.) to separate runtime parameters, with Holland and Jenkins (1999) default values.
Implement friction velocity-dependent transfer coefficients following Holland and Jenkins, JPO, 1999 Original code by M. Losch with small modifs.
re-work previous modif (put parenthesis) to get same truncation as before in Fwd run, but keep previous AD simplification.
Slight rewrite of two expressions of the form (x-const)/x to simplify AD
add new control variables xx_shifwflx to freshWaterFlux here
fix a CPP comment (#endif ALLOW_ISOMIP_TD)
uses the right type of S/R for diagnostic filling
Adding diagnostics SHIForcT and SHIForcS, the ice shelf forcing for T and S.
fix bug with SHELFICEconserve flag, prepare for real fresh water flux (not yet) this simplifies the code considerable, but does not have too large an effect and the model solutions
- convert potential temperature into in-situ temperature. This changes the
isomip tests => update tests
- rearrange computation of tLoc, sLoc, pLoc to make code more efficient
- sort out freshwater flux; convert freshwater fluxes to mass fluxes
(kg/m^2/s), does not break tests, because in verification/isomip,
rhoConstFresh=rhoConst (by accident)
clean up recent check-in with too comments only meant for myself
how embarrassing: total mixup of ice and sea water densities is resolved
clean up a little
add option for convservative form of Hellmer&Olbers (1989) thermodynamics - requires a little reorganization, which affects the testreport results of isomip.htd (only 7 digits of cg2d agree) => update experiment The results are extremely sensitive to details of the algorithm (e.g., order in which sums and differences are taken, etc) so that replacing a term with a (theoretically) exactly equal other term causes the big difference; possibly, because the solution of a quadratic equation is involed. I am not happy about this, but the present formulation appears to be a little more robust. - add a few comments
Change EmPmR units: from m/s to kg/m2/s
replace "recip_rhoConst*horiVertRatio" by mass2rUnit and "rhoConst*recip_horiVertRatio" by rUnit2mass
add a few diagnostics
add a simple boundary layer scheme to reduce noise, off by default for now
replace a '<' by a '.LT.'
- add more sophisticated thermodynamics of Hellmer (1989), this is
now the default
- give a few constants more intuitive names
- separate shelfice load anomaly from pload (breaks with time
dependent forcing), => introduce constant field shelficeLoadAnomaly.
Its default is 0., but it may be computed more cleverly from (unknown)
t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be
done offline. A good approximation of the pressure load anomaly is
necessary to avoid large initial adjustment processes underneath
deep-reaching shelfice.
- small fix in shelfice_thermodynamics
o add new package shelfice
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |