Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Sticky Tag: |
- ecco.h: introduce three-dimensional gencost_mskC,W,S for use with m_boxmean and m_horflux (ifdef ALLOW_GENCOST3D) - ecco_check.F: issue error message if gencost_msk_pointer3d is beyond the gencost_mskC,W,S array size (NGENCOST3D) - ecco_phys.F: re-organize code and introduce option to use three-dimensional gencost_mskC,W,S (if gencost_msk_is3d) - ecco_readparms.F: read gencost_msk_is3d from namelist; if adequate then initialize and read gencost_mskC,W,S in place of gencost_mskCsurf,Wsurf,Ssurf (ifdef ALLOW_GENCOST3D and gencost_msk_is3d(kgen)=.TRUE.)
- ecco_check.F: avoid warning for 'altimeter data so cost gets switched of' is using_cost_altim is already false - ecco_cost_final.F: use print_message to print cost functions to STDOUT rather than printing directly to standardMessageUnit
- add m_boxmean_ptracer to list
- cost_gencost_all.F: pass 'c' as argument instead of gencost_mask(k) - cost_gencost_boxmean.F: use gencost_mask to specify masks rather than gencost_errfile - ecco.h: increase gencost_mask length to MAX_LEN_FNAM - ecco_check.F: checks related to gencost_mask and gencost_errfile - ecco_readparms.F: use gencost_mask to specify masks rather than gencost_errfile, set default to 0 for 2D masks to avoid confusing users
- cost_gencost_all.F: use gencost_nrec in place of gencost_nrecperiod (no effect) - ecco_check.F: check that retired run-time options are not used - ecco_cost_init_fixed.F, ecco_summary.F: finish retiring gencost_nrecperiod - ecco_readparms.F: finish retiring gencost_smooth2Ddiffnbt
- cost_gencost_boxmean.F: use gencost_flag instead of gencost_name, revise print statements - cost_gencost_customize.F: add m_horflux to list of known gencost_barfile values - ecco_check.F: remove gencost_msk* assignments (now in readparms), add m_horflux to list of known gencost_barfile values, revise print statements - ecco_phys.F: fix m_eta computation for virtual salt flux case, add m_horflux_vol - ecco_readparms.F: add gencost_msk* assignments (moved from check), add m_horflux as part of gencost_flag=-3 (i.e., as a cost_gencost_boxmean.F option), revise print statements, refine gencost_barfile tests
- 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.
- introduce gencost_mskTemporal and gencost_mskVertical. - ecco_check.F: use msk=1 by default, fix cost_iprec specifications, add mixxing inquire for W mask.
- cost_gencost_boxmean.F: add kgen loop, simplify display - ecco.h: add eccoVol_0 array for use in ecco_phys.F - ecco_check.F: set eccoVol_0 to initial volume - ecco_phys.F: prepare for volume weighted averaging (using tmpVol and eccoVol_0; bu not active yet)
- cost_gencost_boxmean.F: now use mask*field computed in ecco_phys.F (in the case of 3D field ecco_phys.F adds all contribution in the vertical so that cost_gencost_boxmean.F is just left to do a global sum of a 2D field) - ecco_phys.F: add the m_boxmean_theta, m_boxmean_eta, m_boxmean_salt blocs that sets gencost_storefld to the vertical sum of mask*field - cost_gencost_customize.F: if gencost_barfile(k)(1:9).EQ.'m_boxmean' then set gencost_modfld to gencost_storefld (from ecco_phys.F) - ecco.h: add gencost_storefld - ecco_check.F: now use m_boxmean_theta, m_boxmean_eta, etc. for gencost_barfile associated with boxmean capability.
- cost_gencost_boxmean.F: use maskC(i,j,k,bi,bj)*gencost_mskCsurf(i,j,bi,bj,kgen) rather than mymsk, tmpmsk - ecco.h: define gencost_mskCsurf, gencost_mskWsurf, gencost_mskSsurf (one field per gencost) - ecco_check.F: initialize (incl. mdsreadfield) gencost_mskCsurf (should eventually be moved to initfixed) - ecco_check.F: add m_eta option and init gencost_mskWsurf/gencost_mskSsurf (w. other modifications pending)
cost_gencost_all.F
- add using_cost_transp flag - use correct routine to read in mask - add more reports to stdout to ensure propered flags set
change msktrVol[W,S] from 3D to 2D
Consolidate separate u/v components into total transports. Fully works in ad mode.
add check for boxmean and transp cost
- revised handling of gencost_errfile and gencost_weight.
- remove un-necessary includes of profiles.h
- move call to cost_profiles from ecco_cost_driver.F to the_main_loop.F
- cost_gencost_bpv4.F, cost_gencost_sshv4.F, ecco_check.F : bring up to date after updated variable naming convention. - ecco_readparms.F : set gencost_is3d automiatically, set mult_gencost default to 1.
- replace stop with warning.
- add list of S/R at the top (since this file contains several S/R) - remove tabs
- cost_gencost_boxmean.F, cost_gencost_bpv4.F, ecco_cost_init_fixed.F, ecco_cost_weights.F : treat cases of missing files at run time. - cost_gencost_sshv4.F : rename etabar as etaday to reflect the required averaging frequency, move the test for etaday (now used instead of psbar) definition to ecco_check.F - ecco_check.F : if no gencost term properly defines etaday (e.g. due to missing files) then turn off sshv4 cost all together.
- ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj, using_ers, using_gfo, using_mdt is now only defined within gencost) - ecco_cost_weights.F : dont try to read geoid_errfile if this file name was specified.
- 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
rename variable "tpmean" as "mdt" and "topexmeanfile" as "mdtdatfile"
o change seaicev4 cost names siv4-[sst,vol] to siv4-[deconc,exconc], o put stop statement if old names siv4-[sst,vol] are used. o replace never used flag ALLOW_TMI_COST_CONTRIBUTION with ALLOW_TMI_SST_COST_CONTRIBUTION
- turn of using_cost_seaice if missing input files.
Separate words.
- 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 just CPP_OPTIONS.h
Attempt at adding CTRL_SIZE.h
- add run-time switch usePROFILES.
fix syntax format for writing integer
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:$
Adding cost function for daily Florida Strait transport.
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)
o somewhat cleaned package initialisation sequence for ctrl/ cost/ ecco/ o calls to new cost contributions
put call's within appropriate ifdef's
Starting from ecco-branch, replacing packages cost, ctrl, ecco, obcs by ECCO packages. Will create tag ecco-branch-mod1 after this modif.
file ecco_check.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 |