Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Sticky Tag: |
- cost_averagesfields.F, cost_hyd.F, ecco_cost_driver.F, ecco_cost_final.F: comment out calls to retired codes. - ecco_ad_diff.list: remove retired codes from list. - ecco_check.F: issue warning if any old CPP option is defined that corresponds to retired codes -- then stop.
- add anom_preproc to avoid recomputations.
- use generic codes in place of cost_argo_theta, cost_ctdt, cost_xbt, cost_ctds cost_argo_salt, cost_theta, cost_salt, cost_ReadTopexMean, cost_ssh_mean, cost_readtopex, cost_readers, cost_readgfo. cost_ReadTopexMean, cost_bp. - remove calls to cost_sshv4 and cost_usercost_all
- remove ALLOW_ECCO_EVOLUTION switch
- add includes of PROFILES_SIZE.h
- move call to cost_profiles from ecco_cost_driver.F to the_main_loop.F
- pkg/ecco/ecco_cost_driver.F : add useCTRL switch - pkg/ecco/ecco_readparms.F : print message if .NOT.useECCO
- 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.
- ecco.h : remove un-needed CCP options, add gencost_preproc, add 3D gencost - cost_generic.F : move active_read calls to cost_genread (new) and setup generic pre-processing framework (via new preproc argument). - cost_genread.F (new) : interface between cost_generic and active_read - added 3D gencost involves : cost_averagesfields.F, cost_averagesinit.F, cost_gencost_all.F, ecco.h, ecco_check.F, ecco_cost_init_fixed.F, ecco_readparms.F (ALLOW_GENCOST3D, gencost_is3d, gencost_pointer3d, gencost_bar3d, gencost_mod3d, gencost_wei3d) - added gencost_preproc involves : cost_gencost_all.F, cost_genread.F, cost_generic.F, cost_hyd.F, ecco_readparms. and ... pkg/seaice/seaice_cost_driver.F - ecco_cost_driver.F : move cost_profiles here - cost_hyd.F : remove cost_profiles from here - ecco_cost_weights.F : remove gencost weights from here - ecco_cost_init_fixed.F : more gencost weights here - ecco_cost_final.F : 0. _ d 0 fixes
- remove includes from pkg/ctrl, add missing CCP switches,
remove unused variable, replace optimiter with eccoiter :
cost_averagesgeneric.F, cost_gencost*.F,
cost_generic.F, ecco_check.F, ecco_phys.F
- include ecco.h rather than ecco.h : ecco_cost_driver.F,
ecco_phys.F, cost_averagesgeneric.F, cost_gencost*.F,
- rename xx_genbar_dummy as gencost_dummy : cost_averagesfields.F,
cost_averagesinit.F, cost_gencost_*.F, ecco_cost_init_barfiles.F
- cost_bp.F : modify calls to cost_bp_read (added arguments)
- cost_bp_read.F added arguments (localobsfile, localstartdate,
localobs, localmask) replacing use of common blocs
- cost_generic.F : add ALLOW_OLD_ESTIM_CODES bracket
- ecco_check.F :
use gencost_startdate rather than modelstartdate, rename
using_topex as using_tpj, add ALLOW_OLD_ESTIM_CODES brackets
- cost_gencost_all.F : remove un-necessary CPP brackets of
cost_gencost_*v4 calls, add cost_gencost_bpv4 call,
use gencost_startdate rather than modelstartdate
- cost_averagesgeneric.F : added DEBUG code
- ecco_cost_final.F : added ifdef ALLOW_ECCO
- ecco_cost_init_fixed.F : copy optimcycle to eccoiter
when ALLOW_CTRL, set eccoiter to 0 otherwise;
revise gencost conditionality
- ecco_cost_summary.F : add ALLOW_OLD_ESTIM_CODES brackets,
rename using_topex as using_tpj
- ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0
- ecco_phys.F : compute etanFull
- ecco_readparms.F : rename using_topex as using_tpj, add
bpv4-grace to gencost list, initialize added parameters
- ecco_summary.F : include SIZE.h needed for augmented ecco.h
o pkg/ecco/cost_forcing.F : - remove un-necessary myiter, mytime arguments o pkg/ecco/ecco_cost_driver.F : - update cost_forcing, ctrl_cost_driver calls (rm myiter, mytime args)
o pkg/ecco : - remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F) - remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F) - update cost_forcing_gen calls in cost_forcing.F - update cost_genctrl call in ecco_cost_driver.F - update ecco_ad_diff.list accordingly
- add cost_genctrl.F that computes generic control costs. - ecco_ad_diff.list : add cost_genctrl.f - ecco_cost_driver.F : calls cost_genctrl.F - ecco_cost_final.F : print cost and add to fc.
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
include ECCO_OPTIONS.h instead of COST_CPPOPTIONS.h
- 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.
- dont create ad files unless adjoint run. - bug fix : sla_startdate etc. rather than modelstartdate. - ecco_cost_driver.F : dont do cost_ssh.F when cost_gencost_sshv4.F. - cost_gencost_sshv4.F : only re-reference MDT if altimeter period is covered.
finish replacing "#ifndef DISABLE_DEBUGMODE" with "#ifdef ALLOW_DEBUG" (left from Nov 04, 2003 cleaning)
- cost_gencost_sshv4.F and cost_sshv4.F: compute smoothed 35 day-average fields once a week only -- for speed up. - ecco_cost_driver.F: necessary includes.
Pieces that are needed to use model/src/forward_step.F and model/src/forward_step.F along with pkg/ecco. This capability is still in testing phase. So, for now, the added code is commented out using CPP ifdefs.
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 |