wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-24 13:20:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ref/dev

Browse Source 
Conflicts:
	SimPEG/DCIP/DCIPUtils.py
This commit is contained in:
D Fournier
2016-05-27 10:01:28 -07:00
parent 0379df2bf2 e5ec512517
commit 7b72d3a92d
10 changed files with 386 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Examples/Inversion_IRLS.py
+3 -3
View File
@@ -86,12 +86,12 @@ def run(N=200, plotIt=True):
#reg.recModel = mrec
reg.wght = np.ones(mesh.nC)
reg.mref = np.zeros(mesh.nC)
reg.eps_p = 2e-3
reg.eps_q = 2e-3
reg.eps_p = 5e-2
reg.eps_q = 1e-2
reg.norms = [0., 0., 2., 2.]
reg.wght = wr
opt = Optimization.ProjectedGNCG(maxIter=5 ,lower=-2.,upper=2., maxIterCG= 100, tolCG = 1e-3)
opt = Optimization.ProjectedGNCG(maxIter=10 ,lower=-2.,upper=2., maxIterLS = 20, maxIterCG= 20, tolCG = 1e-3)
invProb = InvProblem.BaseInvProblem(dmis, reg, opt, beta = invProb.beta*2.)
beta = Directives.BetaSchedule(coolingFactor=1, coolingRate=1)
#betaest = Directives.BetaEstimate_ByEig()