Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to MAIN: | (view) (download) (annotate) |
| Sticky Tag: |
replace CLOSE(nmlfileUnit) with CLOSE(nmlfileUnit,STATUS='DELETE') to remove scratchfiles after closing, except for SINGLE_DISK_IO, when everything stays the same
- ctrl_summary.F : remove un-necessary ALLOW_SMOOTH_CORREL2D - ctrl_readparms.F : set mult_genarr2d,arr3d,tim2d default to 1.
- 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.
- ctrl_check.F : stop if xx_genarr2d_weight or xx_genarr2d_file are defined separately (one and not the other) except when using openad - ctrl_readparms.F : leave xx_genarr2d_file empty by default except when using openad
- get smoothOpNb from xx_gentim2d_preproc
- add preprocessing run time params - add genarr3dPrecond
- pkg/ctrl/ctrl_readparms.F : print message if .NOT.useCTRL - pkg/ctrl/ctrl_summary.F : update print statements and comments
- remove variables, codes associated with NON-generic NON-obcs controls, unless ECCO_CTRL_DEPRECATED is defined - ctrl_readparms.F : include ctrl_local_params.h unless ECCO_CTRL_DEPRECATED is defined
- pkg/ctrl/CTRL_OBCS.h (new) : regroup all obcs ctrl variables. - pkg/ctrl/ctrl.h, ctrl_dummy.h, ctrl_weights.h : rm obcs ctrl variables (now all in CTRL_OBCS.h). - pkg/ctrl/ctrl_getobcse.F, ctrl_getobcsn.F, ctrl_getobcss.F, ctrl_getobcsw.F, ctrl_getrec.F, ctrl_init.F, ctrl_init_obcs_variables.F, ctrl_init_wet.F, ctrl_mask_set_xz.F, ctrl_mask_set_yz.F, ctrl_pack.F, ctrl_unpack.F, ctrl_readparms.F, ctrl_set_pack_xz.F, ctrl_set_pack_yz.F, ctrl_set_unpack_xz.F, ctrl_set_unpack_yz.F : add CPP brackets and CTRL_OBCS.h - pkg/ctrl/ctrl_pack.F, ctrl_unpack.F : add CPP brackets
- ctrl_readparms.F : bug fix - ctrl_map_ini_genarr.F : re-organized to avoid AD recomputation
o pkg/ctrl : - CTRL_GENARR.h : add xx_gentim2d_numsmooth - ctrl_cost_driver.F : bug fix (iarr, not 1) - ctrl_init.F : bug fix (missing iarr) - ctrl_readparms.F : add xx_gentim2d_numsmooth, improve numsmooth defaults - ctrl_summary.F : improved report of controls settings
o pkg/ctrl :
- introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F,
ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F)
- re-activate ctrl_summary (call in ctrl_init.F)
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
- introduce useSmoothCorrel2DinAdMode run time parameter - the logic is put here rather than autodiff_readparms.F because ctrl_readparms.F comes later than autodiff_readparms.F and reads smoothCorrel2d
- OpenAD: change Makefile to generate the appropriate AD_CONFIG.h when building mitgcmuv_ad (make adAll).
Fix missing output of control and gradient *vector* with OpenAD
- add runtime parameters xx_gentim2d_cumsum & xx_gentim2d_glosum
- ctrl_init.F : fix previous modification. - ctrl_readparms.F : read/init mult_gentim2d.
More additions to enable simple rescaling of generic control variables
1st step toward generic time-varying control variable (2D)
switch off doMainPack for simple forward run (pack S/R was empty)
- ctrl_readparms.F : initialise ctrlSmoothCorrel2D/3D and read from namelist.
rename CTRL_CPPOPTIONS.h to CTRL_OPTIONS.h
Attempt at adding CTRL_SIZE.h
Enable generic arrays of control variables
add explicitly #include "AD_CONFIG.h" in each fortran src file where it is needed
Mean field atmosp. controls
Add missing (so far untested) code for xx_sst, xx_sss
comment out #include "GRID.h" and remove #include "OBCS.h" (don't seem to be needed)
add new control variable xx_shifwflx (fresh water flux underneath ice shelves). This is almost as tedious as obcs-ctrl, because the variables needs its own mask.
Complete implementation for xx_gen2d, xx_gen3d
Add flag to reduce all tapelev I/O to single-prec. In data.ctrl set doSinglePrecTapelev = .TRUE.
Put a name as default for costname, ctrlname
introduce isopycnal diffusion coefficient control.
Bit of tutorial_global_oce_optim
Adding AREA, HEFF, HSNOW as control variables.
pkg/ctrl: add forcingPrecond run time parameter
Adding new control variables: lwflux, lwdown, evap, snowprecip, apressure, runoff.
Modifications for bottom topography control o replace hFacC by _hFacC at various places o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL o add non-self-adjoint cg2d_nsa o update autodiff support routines o re-initialise hfac after ctrl_depth_ini o works for 5x5 box, doesnt work for global_ocean.90x40x15
Adding parameter delZexp (default = 0.)
Adding parameter to remove on-the-fly global mean and trend from exf forcing and ctrl control adjustments
change flag admtlmBypassAD to doAdmtlmBypassAD
o Adding flag admtlmBypassAD to focus on propagator EV problem o clean up objf_state_final discrepancies (SST/SSS vs. full state)
Adding time-dependent SST, SSS control.
Adding swdown control.
Adding swflux control
Adding precip control
Replace call to nml_filter by open_copy_data_file (dont know why it hasnt always been that way in the first place).
o separate masks used for ctrl_pack/unpack 'from write_grid' output (suggested by G. Forget) o added new control variables * init. uVel, vVel, etanN * lambda[Theta,Salt]ClimRelax
Assign default file names to xx_ files.
Adding eddy stress controls a la Ferreira et al.
o introduce z-scaling of * gradient (doZscalePack) and * control (doZscaleUnpack)
o Add ctrlvec diagnostics in pack/unpack for nondimensional I/O o May be enabled via doPackDiag
Untangle ALLOW_ECCO_OPTIMIZATION option.
More on dsvd vs. MITgcm interfacing o handling of g_, ad, via admtlm_vector (mds...vector) o use ctrl_pack/unpack for admtlm_vector I/O o use optimcycle for dsvd iteration o make sure norm is w.r.t. derived quantities
o More ECCO-GODAE merge: wind stress sign affects * exf_inscal_[u/v]stress * sign of xx_tau[u/v] adjustments * signs in cost_scat o run time flag for initializing xx_ fields
Use ctrl_pack/unpack as standalone to map back and forth between xx_/adxx_ and vector (useful when analysing wetpoint gradient- and control-VECTOR) Needs modified the_model_main.F
o added the [#include "AD_CONFIG.h"] statement to all files that need it for adjoint/tl #defines o re-worked the build logic in genmake2 to support AD_CONFIG.h o removed tools/genmake since it no longer works
Bringing cost/ ctrl/ up to date.
Merging for c51 vs. e34
Preparing next differentiable checkpoint and sync of MAIN vs. ecco-branch
file ctrl_readparms.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 |