Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint65b: | (view) (download) (annotate) |
| Sticky Tag: |
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
- distinct values of gencost_flag : 0) inactive gencost 1) standard active gencost 2) pre-specified cost term with creation of a barfile -1) pre-specified cost term using otherwise created barfiles
- cost_gencost_assignperiod.F, ecco_cost_init_fixed.F : add missing gencost_flag test.
- cost_averagesfields.F, ecco_cost_init_barfiles.F : add missing using_gencost test.
- ecco_cost_init_barfiles.F, cost_averagesfields.F : add using_altim, etc. tests.
- ecco_check.F : switch off cost term if no a single file was found (regarless
of startdates for this general test).
- ecco_readparms.F : bug fix ('OR'; from previous rev) and print additional
information when failed test stops.
- 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
include ECCO_OPTIONS.h instead of COST_CPPOPTIONS.h
move #include "AD_CONFIG.h" after the other included OPTIONS files and remove PACKAGES_CONFIG.h
Move cal-specific calls from ecco_readparms.F to ecco_cost_init_fixed.F as per jmc request
- bug fix: those tests break the ALLOW_GENCOST_FREEFORM case.
Another missing if-statement
bug fix (gencost_nrec needs to be defined before ecco_cost_init_barfiles.F is called)
Documenting ALLOW_GENCOST_CONTRIBUTION in ECCO_CPPOPTIONS.h (see extract below) and adding the ALLOW_GENCOST_FREEFORM sub-option. C >>> ALLOW_GENCOST_CONTRIBUTION: interactive way to add basic 2D cost function terms. C > In data.ecco, this requires the specification of data file (name, frequency, C etc.), bar file name for corresp. model average, standard error file name, etc. C > In addition, adding such cost terms requires editing ecco_cost.h to increase C NGENCOST, and editing cost_gencost_customize.F to implement the actual C model average (i.e. the bar file content). #undef ALLOW_GENCOST_CONTRIBUTION C >>> free form version of GENCOST: allows one to use otherwise defined elements (e.g. C psbar and and topex data) while taking advantage of the cost function/namelist slots C that can be made available using ALLOW_GENCOST_CONTRIBUTION. To this end C ALLOW_GENCOST_CONTRIBUTION simply switches off tests that check whether all of the C gencost elements (e.g. gencost_barfile and gencost_datafile) are specified in data.ecco. C > While this option increases flexibility within the gencost framework, it implies more room C for error, so it should be used cautiously, and with good knowledge of the rest of pkg/ecco. C > It requires providing a specific cost function routine, and editing cost_gencost_all.F accordingly. #undef ALLOW_GENCOST_FREEFORM
gencost: a couple of fixes + modifications in ecco_readparams.F to allow the generation of bar files without specifying data sets.
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)
catch the case of empty filenames
fix syntax format for writing integer
Declare msgbuf seems useful...
Add an extra check on values of (SSH)TimeMask
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.
add missing cvs $Header:$ or $Name:$
Preparing bottom pressure cost for time-varying GRACE data.
Adding cost function for daily Florida Strait transport.
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
Make pkg/profile fully independent of ecco,cost, etc. stuff to be able to use it in pure forward.
One more ifdef ALLOW_PROFILES
Adding Gael Forget profile cost code.
o Adding GFO observations o Modified masks to add costs beyond TOPEX 66N/S
Moving seaice-related cost to pkg/seaice/
fixes for DIVA
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 |