Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Sticky Tag: |
relocate a misplaced plus sign that might cause compilation error when the CPP option ALLOW_PSBAR_STERIC is not defined.
Add and update some files related to ECCO v4 release 3. The main changes are
adding cost_gencost_glbmean.F to compute the costs for global mean time-series of OBP
& SSH, splitting the profile cost to sample-mean and -anomaly parts,
updating the cost formula for the proxy sea-ice costs, adding initial velocity
as part of the control variables, and applying the correction of global
mean steric height change to OBP.
- cost_gencost_glbmean.F: compute cost for global mean OBP & SSH time-series
- cost_profiles.F: add a CPP option (ALLOW_PROFILES_SAMPLESPLIT_COST)
that if defined splits the profile cost to
sample-mean and sample-anomaly costs.
- cost_gencost_seaicev4.F: add a CPP option (SEAICECOST_JPL) that if defined
reads in the weights for the proxy sea-ice costs.
- cost_gencost_curstomize.F: if ALLOW_PSBAR_STERIC is defined, correct OBP with
the global mean steric ssh change to be consistent
with SSH.
- ecco_phys.F: include sterGloH in a common block to be used in
cost_gencost_customize.F to correct OBP when
ALLOW_PSBAR_STERIC is defined.
- ctrl_map_ini_genarr.F: add CPP options to include initial UV as the control
variables.
- cost_gencost_all.F: changes related to cost for the global mean time-series.
- cost_gencost_bpv4.F: minor change related to cost for the global mean time-series.
- ecco_readparms.F: changes related to cost for the global mean time-series.
- ecco_ad_diff.list: include the new added cost_gencost_glbmean.F.
- ctrl_get_gen.F: check if the first seven characters of xx_tauu_file &
xx_tauv_filei matches "xx_tauu" or "xx_tauv".
- ecco_cost_final.F: add modification related to the sample-mean profile cost.
- ecco_cost_init_fixed.F: initialize the data and weights for the global mean costs
for OBP & SSH, if ALLOW_GENCOST_1D is defined.
- profiles_readvector.F: read in climatology field in the profile file, and mask
out the weight where climatology data is flagged. Active
if ALLOW_PROFILES_CLIMMASK is defined.
- PROFILES_SIZE.h: changes related to the split of profile cost to sample-mean
and sample-anomaly.
- profiles.h: changes related to the split of profile cost to sample-mean
and sample-anomaly.
- ecco.h: changes related to the global mean costs
- profiles_readparms.F: changes related to the profile cost splitting and masking
by climatology data.
- profiles_init_fixed.F: changes related to the profile cost splitting.
- profiles_init_varia.F: changes related to the profile cost splitting.
- add passive tracer cost functions to gencost: m_ptracer and m_boxmean_ptracer
- add missing CPP brackets
- 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_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.
bug fix
cost_gencost_all.F
Consolidate separate u/v components into total transports. Fully works in ad mode.
add ALLOW_GENCOST_TRANSPORT block
minor fix in barfile matching
- ecco.h: rename etanFull as m_eta, and introduce m_UE, m_VN - ecco_phys.F: compute m_UE, m_VN - cost_gencost_customize.F: store m_UE, m_VN in gencost_mod3d
- cost_gencost_customize.F: add missing GMREDI_OPTIONS.h - ecco_summary.F: polish summary of ecco configuration
- fix previous check-in
- fix previous check-in
- add penalties for exf and ctrl variables as gencost options.
- add the gencost_avgperiod='const' option for fields that are constant in time such as kapgm. - revise naming convention: gencost_barfile='etaday' becomes 'm_eta_day' etc. Note: backward compatible; 'etaday' still ok.
o pkg/ecco : add capability to penalize full series of time steps,
(rather than daily or month;y) for use in short verification experiments.
- cost_gencost_assignperiod.F : add myiter as argument.
- cost_averagesfields.F : add ECCO_CTRL_DEPRECATED brackets,
and myiter argument to cost_gencost_assignperiod.F.
- cost_averagesgeneric.F : if (startofloc .and. endofloc)
then write current time step field.
o pkg/ecco/cost_generic.F : add smoother as post-processing capability.
- treat the case of scatterometer costs
- 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
- cost_gencost_customize.F : add automated fill based upon barfile name when it starts with eta, sst, sss, bp, taux, or tauy; rm hard coded gencost_modfld(i,j,bi,bj,1) = empmr(i,j,bi,bj) - cost_gencost_assignperiod.F : revise gencost conditionality - cost_gencost_sshv4.F : rm ALLOW_SSH_COST_CONTRIBUTION etc brackets, add initialization of local arrays, streamline reading of mdt, use gencost_barfile rather than psbarfile, use local variables (e.g. tpob, tpma instead of tpobs, tpmask), only include ecco.h - cost_gencost_sstv4.F : rename igen_amsre as kgen, replace sstbar with gencost_barfile, rm ALLOW_DAILYSST_COST_CONTRIBUTION - cost_gencost_boxmean.F : replace tbarfile with gencost_barfile, rename igen_boxmean as kgen - cost_gencost_sstv4.F, cost_gencost_sshv4.F : rm myiter, mytime args - cost_gencost_bpv4.F (new) : to replace cost_bp using gencost, added to ecco_ad_diff.list
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
- ecco_ad_diff.list : add cost_gencost_seaicev4.f to adjoint. - cost_gencost_customize.F : time averages for ALLOW_GENCOST_SEAICEV4.
include ECCO_OPTIONS.h instead of COST_CPPOPTIONS.h
Attempt at adding CTRL_SIZE.h
bug fix
Updating gencost code * merge B. Cheng's changes * bug fixes (especially cost_generic_all.F)
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 <---
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 |