Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Sticky Tag: |
- remove variables associated with NON-generic costs unless ECCO_CTRL_DEPRECATED is defined - ecco_readparms.F : include ecco.h and ecco_local_params.h, instead of ecco_cost.h, unless ECCO_CTRL_DEPRECATED is defined - ecco_cost_init_varia.F, ecco_cost_init_barfiles.F, ecco_cost_final.F, ecco_cost_init_fixed.F : include ecco.h, instead of ecco_cost.h, unless ECCO_CTRL_DEPRECATED is defined - ecco_toolbox.F, ecco_cost_init_barfiles.F : bug fixes.
- ecco.h : add frame, cosphi. - ecco_cost.h : rm frame, cosphi. - ecco_cost_driver.F, ecco_cost_final.F, ecco_cost_init_fixed.F, ecco_cost_summary.F, ecco_summary.F : cosmetic change.
- pkg/ecco/ecco_cost.h : rm obcs ctrl variables (now all in CTRL_OBCS.h). - pkg/ecco/cost_obcs.F, cost_obcs_ageos.F, cost_obcse.F, cost_obcsw.F, cost_obcsn.F, cost_obcss.F, cost_obcsvol.F, ecco_cost_init_varia.F, ecco_cost_weights.F, ecco_readparms.F, ecco_cost_final.F : add CPP brackets and CTRL_OBCS.h
- ecco_ad_check_lev1_dir.h etc : rename xx_genbar_dummy as gencost_dummy - ecco_cost.h : more variable of general iterest (including gencost*) to ecco.h and include ecco.h in ecco_cost.h (to be retired soon...) - ecco.h : add sum1day etc, using_cost_altim etc, etanFull etc, cost_iprec, cost_yftype, eccoiter (copy of optimiter), gencost_* (incl. new gencost_startdate1/2, gencost_enddate1/2, using_mdt, using_tpj)
add cost contribution for sigmaR (drhodr)
Replace hardcoded mdt year range with runtime param mdt[start,end]date[1,2], rename variable "tpmean" as "mdt" and "topexmeanfile" as "mdtdatfile", add error+stop statement if "topexmeanfile" is used in data.ecco
o move smooth2Ddiffnbt param from pkg/smooth to pkg/ecco o minor bug fix in set gencost default values in ecco_readparms.F
o add compile flag ALLOW_GENCOST_TIMEVARY_WEIGHT in ECCO_CPPTIONS.h and runtime logical flag gencost_timevaryweight in data.ecco to read daily sea-ice uncertainty o fix 2 bugs in cost_gencost_seaicev4.F: (1) hardcoded nrecloc=nmonsrec (number of months) which is not correct for daily rec (2) hardcoded localperiod=0 which resulted in only the monthly bracket being valid
cost_averagesfields.F allow for addition of xx_genprecip to psbar cost_salt.F, cost_theta.F reset sbar_gen and tbar_gen(taf related) ecco_cost.h add using_cost_seaice runtime parameter ecco_readparms.F add using_cost_seaice runtime parameter
- add call to new routine ECCO_PHYS - add option to apply global steric correction to psbar.
- introduce gencost_flag(k) that is currently one of 3 values : 0 if cost term k is not used 1 if cost term is fully interactive (i.e. uses gencost_datafile) -1 if ocst term is pre-specified (i.e. uses gencost_name) - introduce using_gencost(k) logical in line with using_topex etc. - ecco_readparms.F : assign using_gencost(k) & gencost_flag(k) based on gencost_datafile(k).NE.' ' (fully interactive cost terms) or on gencost_name(k) (for pre-specified generic cost terms) - throughout : replace "if ( gencost_datafile(num_var) .ne. ' ' )" with "if ( using_gencost(num_var) ) then" - throughout : rm ALLOW_GENCOST_FREEFORM CPP option. The same thing is now achieved dynamically based on gencost_flag. - ecco_check.F : add gencost checks, account for "data"startdate in ecco_check_files, add topexmean check.
ecco_cost.h
- add using_cost_altim, using_cost_sst,using_cost_bp,using_cost_scat
to allow for run time switch of main cost terms. Those switches
are further reset to false if files are missing (ecco_check.F)
cost_gencost_all.F
- using_cost_altim, using_cost_sst
cost_hyd.F
- using_cost_sst
ecco_check.F
- restrict maxNumDays test to relevant cases
- add ECCO_CHECK_FILES S\R that test whether the input binary files
are there, and otherwise switch off the corresponding run
time flag. Rather than do the full run then crash in ecco_cost_driver.
- thus reset using_cost_bp, using_cost_altim, using_cost_sst,
using_cost_scat if necessary.
ecco_cost_driver.F
- using_cost_altim, using_cost_bp, using_cost_scat
ecco_cost_init_fixed.F
- remove tpTimeMask etc. bloc when not needed (i.e. undef ALLOW_NEW_SSH_COST)
ecco_cost_weights.F
- dont try to read data_errfile if it is not there
- using_cost_sst, using_cost_altim, using_cost_bp, using_cost_scat
ecco_readparms.F
- activate using_cost_sst, using_cost_altim, using_cost_bp, using_cost_scat
- also activate using_topex, using_ers, and using_gfo
- ecco_cost_final.F : add fc definition when pkg/cost is omitted, omit global_sum of fc when pkg/cost is included (see joint modif). - ecco_cost.h : define tbar, sbar, ubar, vbar accordingly if ALLOW_COST_TRANSPORT. - add CPP brackets around pkg/cost and pkg/ctrl includes of "CTRL_SIZE.h" "ctrl.h" "ctrl_dummy.h" "optim.h" / "cost.h" accordingly. - ALLOW_COST_ATLANTIC_HEAT vs ALLOW_COST_ATLANTIC : attempt to sort out ALLOW_COST_ATLANTIC (in ecco) vs ALLOW_COST_ATLANTIC_HEAT (in cost) that both use objf_atl (from cost). - ALLOW_COST_ATLANTIC ifdef ALLOW_ECCO_EVOLUTION : add calls to cost_atlantic (that also does the associated time averaging) in cost_averagesfields.F and ecco_cost_driver.F, along with the relevant ecco_ad_check_lev*_dir.h stores.
Enabling inverted echo sounder constraint (IES). Turned on with ALLOW_IESTAU_COST_CONTRIBUTION. Code copied primarily from ALLOW_BP_COST_CONTRIBUTION This includes determining sound speed setting the stage for tomography constraints. For now sound speed is determined in cost_averagesfields.F. Would be better to have its own function but cause numerous recomputations. Needs more thought
- set maxNumDays to 8050 (22 years). - fix cost_generic for daily data and nIter0>0 case. - complement ALLOW_DAILYSCAT_COST_CONTRIBUTION.
- increase NGENCOST.
Merging Benny Cheng code for init. etan, uvel, vvel controls Fix weight handling
- Introducing gencost_name that will be used when printing cost function to file. - Changing default for gencost_barfile to ' ' in which case no specific bar file is generated.
adding file name for potential smoothing scale field.
In cost_sshv4.F use space variable length scales using the name specified as sshv4cost_scalefile in data.ecco
remove tabs
finish removing unbalanced quote (single or double) in commented line
Updating gencost code * merge B. Cheng's changes * bug fixes (especially cost_generic_all.F)
allow user defined cost function contributions
CPP: ALLOW_USERCOST_CONTRIBUTION
USAGE: compute contributions in cost_usercost_all.F
note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was.
the two options are complementary.
bug fixes
More code for GENCOST.
Preparing usage of generic cost function terms. Enable with CPP option #ifdef ALLOW_GENCOST_CONTRIBUTION First usage is adding air-sea flux constraints when using bulk controls. ---> NOT YET READY FOR PRIME TIME <---
rearrange common block /ecco_cost_objf/ declaration so that compilers that do not allow more than 100 extension lines do not choke
MDT/SLA cost function terms for ECCO version 4 -- initial check-in
completion of the bottom pressure (GRACE) cost term
specify SST weights file
Enable easy way for daily SST cost.
o A final fix in cost_ssh_new(!) o Move ecco_check to earlier instance o Increase maxNumDays to 17yr o A few debug calls
Fix a myRiad of bugs...
Modify cost calculation for SSH anomalies: * Model mean is sampled according to altimeter data for each instrument * Period for computing model mean can be prescribed through daily flags; corresponding daily flag time series provided in files tpTimeMaskFile, ersTimeMaskFile, gfoTimeMaskFile NOT YET TESTED.
Change parameter
Add call.
o bridging the gap between eddy stress and GM.
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi)
along with a change in CPP option (now ALLOW_EDDYPSI).
-> when using GM w/ GM_AdvForm:
The total eddy streamfunction (Psi = eddyPsi + K x Slope)
is applied either in the tracer Eq. or in momentum Eq.
depending on data.gmredi (intro. GM_InMomAsStress).
-> ALLOW_EDDYPSI_CONTROL for estimation purpose.
The key modifications are in model/src/taueddy_external_forcing.F
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F
introduce isopycnal diffusion coefficient control.
add missing cvs $Header:$ or $Name:$
*** empty log message ***
Preparing bottom pressure cost for time-varying GRACE data.
Adding cost function for daily Florida Strait transport.
allow user defined cost function contributions CPP: ALLOW_GENCOST_CONTRIBUTION USAGE: compute contributions in cost_gencost_all.F
internal parameter controls: completements of implementations
Merge annual balance changes from v3 production to repository.
Adding new control variables: lwflux, lwdown, evap, snowprecip, apressure, runoff.
Enable separate error fields for TP, ERS, GFO
o cost_averagesflags now returns year indices in addition to day, month o sflux balance is performed on annual basis (sflxumm, sfluxmm2, bal_sfluxmm) o for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO, including separate counting and multipliers
Adding weights for diffkr, etc.
Make pkg/profile fully independent of ecco,cost, etc. stuff to be able to use it in pure forward.
Adding Gael Forget profile cost code.
Remove trend in SSH anomaly obs.
Adding parameter to remove on-the-fly global mean and trend from exf forcing and ctrl control adjustments
o Adding GFO observations o Modified masks to add costs beyond TOPEX 66N/S
Smoothness constraint now enabled also for initial T, S This has changed flags slightly; now use o at compile time: * ALLOW_SMOOTH_IC_COST_CONTRIBUTION * ALLOW_SMOOTH_BC_COST_CONTRIBUTION o at runtime * mult_smooth_ic * mult_smooth_bc
o Adding smoothness constraint on forcing controls * enable at compile-time via ALLOW_SMOOTH_BOUNDARY_CTRL_COST * enable at run-time via mult_smooth = 1 * Absolute scale somewhat unclear so far * no area weighting was included since no other cost term does so far
Adding vars for temp0errfile, salt0errfile
Introduce nnztbar, nnzsbar to distinguish btw 2d/3d bar files at initialisation time.
Moving seaice-related cost to pkg/seaice/
Adding swdown control.
o Replacing 10 forcing penalty cost routines by 1 generic. o Implementing partitioning in time-mean and variable adjustment for atmos. state.
Adding swflux control
Adding precip control
o adding some cost transport diagnostics o adding second set of flux weights whflux2, etc o for mean SSH, read TOPEX mean first to compute effective mask
Adding counters to cost terms.
Adding eddy stress controls a la Ferreira et al.
o ECCO specific cost function terms (up-to-date with 1x1 runs) o ecco_cost_weights is modified to 1x1 runs o modifs to allow observations to be read in as single file or yearly files
o merging from ecco-branch o pkg/ecco now containes ecco-specific part of cost function o top level routines the_main_loop, forward_step supersede those in model/src/ previous input data.cost now in data.ecco (new namelist ecco_cost_nml)
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 |