Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint65k: | (view) (download) (annotate) |
| Sticky Tag: |
- ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h - AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h - CTRL_OPTIONS.h is needed when including ctrl.h
from Jeff Scott: add option (#define EXF_CALC_ATMRHO) to calculate local air density as function of air Temp, Humidity and atm pressure.
disable "sstExtrapol" when Nr=1
Lets do this again (for both cases).
Minor store fix.
- pkg/exf : added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch. ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F) and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h). - pkg/exf, autodiff, ctrl, ecco and seaice : remove ALLOW_ATM_WIND brackets, or replace them with useAtmWind ones. - pkg/ctrl, ecco : allow to compile both ALLOW_U/VSTRESS_CONTROL and ALLOW_U/VWIND_CONTROL. Depending on useAtmWind, one is inactive, and the other is active (see exf_getffields.F/exf_getsurfacefluxes.F).
remove/avoid un-used variables
avoiding recomputations.
merge exf_bulk_largeyeager04 into exf_bulkformulae because these
files are nearly the same anyway.
Step 2: do the actual merge
unfortunately requires updating lab_sea.salt_plume (6 matching digits),
and global_ocean.cs32x15.icedyn (only 11 matching digits)
merge exf_bulk_largeyeager04 into exf_bulkformulae because these
files are nearly the same anyway.
Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04:
- redefinition of tau(i,i) (by a factor of ustar)
- 1./exf(Const/T) -> exf(-Const/T) (big change in the results)
- replace rhonil by rhoConstFresh in computation of evap (bug fix)
- replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results)
- replace
rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh )
shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j)
by
shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh )
(changes results)
cosmetic changes: make exf_bulkformulae look more like exf_bulk_largeyager04 so that it is easier to compare the two routines
Fix store directives, keys, recomputations, following changes for vectorization.
introduce 2D fields and vectorize code
Remove those function calls to help vectorize bulk formulae.
remove us (use wspeed instead); add wStress .
Further exf cleanup: o change various "constants" into runtime parameters o cleaned-up Large&Yeager04 routine which should eventually replace exf_bulkformulae.F (changed names of S/R and CPP) and merged various ALLOW_ATM_WIND options
move EXF header files from lower_case.h to UPPER_CASE.h ; add missing cvs Header & Name
In the case of #undef ALLOW_ATM_WIND, ustress and vstress are defined on u and v points and tau needs to be computed from the stresses averaged to mass points.
when wind-stress is given as input (#undef ALLOW_ATM_WIND), by-pass turbulent momentum calculation.
o add new fields wspeed, snowprecip (to be able to couple to thsice) o correct Stefan-Boltzmann constant o new parameter for longwave surface emittance o separate some stuff from exf_bulkformulae into new routines exf_radiation, exf_wind
Adding unfinished 3-dim. relaxation code.
Extended diagnostics output for EXF o now includes all EXF variables o hs, hl moved to common block o separate S/R for diagnostics, called after ctrl vector is added o name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet
Bug fix (spotted by Eliyahu Biton): Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); terms -2*ATAN(x) + pi/2 were added to both stable and unstable case.
fixed bug with diagnostics output
added pkg/exf, SALTanom, and SALTSQan diagnostics
o Modified logic for ALLOW_ATM_[TEMP/WIND] o temporary field for function calls
o no restoring terms under ice for pkg/seaice o modfied EXF_EXTERNAL_FLUXES option o added exf_albedo parameter
o first check-in for the "branch-genmake2" merge
o verification suite as run on shelley (gcc 3.2.2):
Wed Oct 8 23:42:29 EDT 2003
T S U V
G D M c m s m s m s m s
E p a R g m m e . m m e . m m e . m m e .
N n k u 2 i a a d i a a d i a a d i a a d
2 d e n d n x n . n x n . n x n . n x n .
OPTFILE=NONE
Y Y Y Y 13 16 16 16 0 16 16 16 16 16 16 16 16 13 12 0 0 pass adjustment.128x64x1
Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 0 0 16 16 0 0 pass adjustment.cs-32x32x1
Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 22 0 16 16 22 0 pass adjust_nlfs.cs-32x32x1
Y Y Y Y -- 13 13 16 16 13 13 13 13 16 16 16 16 16 16 16 16 N/O advect_cs
Y Y Y Y -- 22 16 16 16 16 16 16 13 16 16 16 16 16 16 16 16 N/O advect_xy
Y Y Y Y -- 13 16 13 16 16 16 16 16 16 16 22 16 16 16 16 16 N/O advect_xz
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass aim.5l_cs
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 16 16 16 16 13 16 pass aim.5l_Equatorial_Channel
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 13 16 16 13 13 16 pass aim.5l_LatLon
Y Y Y Y 13 16 16 16 16 16 16 16 16 16 13 12 13 13 16 13 16 pass exp0
Y Y Y Y 14 16 16 16 16 16 16 16 22 16 16 16 13 16 16 22 16 pass exp1
Y Y Y Y 13 13 16 13 16 16 16 16 16 13 13 16 16 13 13 13 13 pass exp2
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass exp4
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 22 16 16 16 22 16 pass exp5
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass front_relax
Y Y Y Y 14 16 16 13 13 16 16 13 13 16 13 13 16 12 13 13 16 pass global_ocean.90x40x15
Y Y Y Y 10 16 16 13 13 16 13 16 16 13 13 13 13 16 16 13 16 FAIL global_ocean.cs32x15
Y Y Y Y 6 11 12 13 13 12 13 16 13 9 9 9 9 10 9 9 11 FAIL global_ocean_pressure
Y Y Y Y 14 16 16 13 16 16 16 13 13 13 13 13 16 12 16 13 16 pass global_with_exf
Y Y Y Y 14 16 16 16 16 16 16 16 16 11 13 22 13 16 16 9 16 pass hs94.128x64x5
Y Y Y Y 13 16 16 16 16 16 16 16 16 11 16 16 16 13 16 22 13 pass hs94.1x64x5
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 13 13 16 16 22 13 pass hs94.cs-32x32x5
Y Y Y Y 10 10 16 13 13 16 16 16 22 16 13 13 13 13 13 22 13 FAIL ideal_2D_oce
Y Y Y Y 8 16 16 16 16 16 16 16 16 13 13 8 16 16 16 16 16 FAIL internal_wave
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 13 22 13 13 13 22 16 pass inverted_barometer
Y Y Y Y 12 16 16 16 16 16 16 16 16 16 13 12 13 13 13 13 13 FAIL lab_sea
Y Y Y Y 11 16 16 16 16 16 16 16 13 13 13 12 13 16 13 12 13 FAIL natl_box
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass plume_on_slope
Y Y Y Y 13 16 16 16 16 13 16 16 16 16 16 16 16 13 16 16 16 pass solid-body.cs-32x32x1
Merging for c51 vs. e34
o exf totally restructured
- replaced all exf_set_ routines by one generic exf_set_gen.F
and made sure it's still differentiable
- split exf_getffields.F into new exf_bulkformulae.F
- exf_inscal_/exf_outscal_ suffixes consistent with field names
- updated adjoint/makefile and relevant verif. accordingly
file exf_bulkformulae.F was initially added on branch ecco-branch.
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 |