Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint66a: | (view) (download) (annotate) |
| Sticky Tag: |
- optim_readparms.F: skip if .NOT.useCTRL - ctrl_map_ini_genarr.F, ctrl_init.F: treat case when pkg.autodiff is not compiled.
- finish deprecating ctrlSmoothCorrel2d/3d
- revised treatment of dimensional/adimensional cost switches. - add noscaling option for dimensional generic controls.
- ctrl_map_ini_genarr.F: rename xx_etan0 as xx_etan, consistent with the other initial condition controls; add numbers of characters. - ctrl_set_pack_xy.F, etc.: replace tests for .NOT.ctrlSmoothCorrel2D with tests for doPackOld = (.NOT.ctrlSmoothCorrel2D).AND.(.NOT.ctrlUseGen) etc. to disentangle packing options from ALLOW_SMOOTH_CORREL2D/3D CPP options.
- CTRL_GENARR.h,ctrl_readparms.F : add xx_gentim2d_bounds - ctrl_map_ini_gentim2d.F : rename smoothOpNb as numsmo, distinguish between 'wc01' and 'smooth' (omitting normalization in the latter), separate the scaling to physical units from these optional features, add the call CTRL_BOUND_2D (using xx_gentim2d_bounds). - ctrl_map_ini_genarr.F : streamline ctrl_map_ini_gen2D in ctrl_map_genarr2D (and for 3D accordingly); update according to the changes in ctrl_map_ini_gentim2d.F; replace 'xxg' with 'xx' for etan0 and bottomdrag.
- bug fix (missing test for igen>0 that broke global_ocean.90x40x15, global_ocean_ebm)
- activate xx_bottomdrag using genarr2d - test for igen>0 - bug fix (sNx+Olx not sNy+Olx)
- move gentim2d part of ctrl_map_ini_genarr.F to new separate routine : ctrl_map_ini_gentim2d.F
- add time variable weights and cyclic controls (time mean, seasonal cycle, etc) capabilities to gentim2d
Consistent indentation.
- get smoothOpNb from xx_gentim2d_preproc
- carry out smooth_correl2D at initialization stage rather than during time stepping.
- include GMREDI_OPTIONS.h where ALLOW_3D_KAPGM, ALLOW_3D_KAPREDI belong.
- ctrl/ctrl_get_gen.F : fix gensign, doCtrlUpdate (kept for continuity of results, although rather questionable). - ctrl/ctrl_init.F, ctrl_map_ini.F, ctrl_map_ini_ecco.F : remove codes associated with NON-generic NON-obcs controls, unless ECCO_CTRL_DEPRECATED is defined - ctrl/ctrl_map_ini_genarr.F : replace ALLOW_DIFFKR_CONTROL switch with ALLOW_3D_DIFFKR (defined in CPP_OPTIONS.h).
- ctrl_readparms.F : bug fix - ctrl_map_ini_genarr.F : re-organized to avoid AD recomputation
- allow genarr3d for xx_theta, xx_salt, xx_kapgm, xx_kapredi, xx_diffkr
o pkg/ctrl/ctrl_cost_gen.F :
- rename ctrl_cost_gen2d input parameters {wmean_gen,wgen,genmask}
as {xx_gen_wmean,xx_gen_weight,xx_gen_mask}
- add ctrl_cost_gen3d for ARR3D (ctrl_cost_gen2d is for ARR2D,TIM2D)
o pkg/ctrl/CTRL_GENARR.h :
- add objf_genarr2d, num_genarr2d, mult_genarr2d
- add objf_genarr3d, num_genarr3d, mult_genarr3d
- add wgenarr2d, wgenarr3d
o pkg/ctrl/ctrl_readparms.F :
- add mult_genarr2d,mult_genarr3d in namelist
o pkg/ctrl_map_ini_genarr.F :
- bug fixes
o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F :
- add xx_genarr2d_bounds,xx_genarr3d_bounds,
xx_genarr2d_numsmooth, xx_genarr3d_numsmooth
o pkg/ctrl/ctrl_map_ini_genarr.F :
- remove compilation failure
- replace hard coded example
- use ctrl_map_ini_gen2D, 3D
o pkg/ctrl/ctrl_pack.F, ctrl_unpack.F :
- on/off switch based upon xx_genarr2d_weight,3d
move additional anomaly fields of control vars (related to options: ALLOW_KAPGM_CONTROL, ALLOW_KAPREDI_CONTROL and ALLOW_BOTTOMDRAG_CONTROL) from DYNVARS.h into new header file: CTRL_FIELDS.h
- only apply EXCH once (for each var) instead of maxCtrlArr2D,3D times ; - add necessary #ifdef around bottomdragfld and diffKr code. ; - remove some local copy (equal,itlo,ithi ...) and usused var (tmptest).
rename CTRL_CPPOPTIONS.h to CTRL_OPTIONS.h
Attempt at adding CTRL_SIZE.h
Enable generic arrays of control variables
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 |