diff --git a/integrators/mps.py b/integrators/mps.py index 33138a29a67237c8af827d5b4bcc7150f6b80e59..33b9efabeb8a1c90a4ed983ed366c5a304608574 100644 --- a/integrators/mps.py +++ b/integrators/mps.py @@ -376,7 +376,7 @@ class MPS(_integrator._Integrator, \ diff_gf.vec.FV().NumPy()[:] = self._Mag_eta.m.vec.FV().NumPy()-oldIterate itError = sqrt( Integrate(diff_cf*diff_cf, self._GetMesh()) ) - if isinstance(self._fixedPointItCounter, IterationCounter): + if isinstance(self._fixedPointCallback, IterationCounter): self._fixedPointCallback() # TODO consider error in heff like in mpsPaper @@ -386,11 +386,18 @@ class MPS(_integrator._Integrator, \ print("itnr = ", itnr, "; Err = ", itError) oldIterate[:] = self._Mag_eta.m.vec.FV().NumPy() - self._Mag_eta.ComputeMaxwell(self._solvetol) + self._UpdateMagnetostatic_insideFixedPointIteration() print("itnr = ", itnr, "; Err = ", itError) +#------------------------------------------------------------------------------# + + + def _UpdateMagnetostatic_insideFixedPointIteration(self): + self._Mag_eta.ComputeMaxwell(self._solvetol) + + #------------------------------------------------------------------------------# diff --git a/integrators/mpsab.py b/integrators/mpsab.py index 017ce460632c000914725075399e3b963754ddd2..ae86f2761f037b25df23df039c24668f64871d41 100644 --- a/integrators/mpsab.py +++ b/integrators/mpsab.py @@ -65,6 +65,13 @@ class MPSAB(mps.MPS, _forms.lf_derivative.LinearForms_Derivative, \ , self._solvetol) +#------------------------------------------------------------------------------# + + + def _UpdateMagnetostatic_insideFixedPointIteration(self): + pass + + #------------------------------------------------------------------------------# diff --git a/local_installer.sh b/local_installer.sh index ad076ecca87bf30ab28a195495fc8cb2871d454b..3c4c42864843c0c03494dd4b9232f2c32a54ca35 100644 --- a/local_installer.sh +++ b/local_installer.sh @@ -8,7 +8,7 @@ WRITE_PATHS_TO=~/.bashrc NGSOLVE_GIT_VERSION_HASH="0419c0285dae6589c32a5ddfaf0dea2e89a5e3b7" BEMPP_GIT_VERSION_HASH="ce2ffc1ce52f07bf5890b19fb7c4389a7bb1031a" NGBEM_GIT_VERSION_HASH="499138ca5dd17e812d3bdfdc0556afbff4ca340c" -COMMICS_GIT_VERSION_HASH="" +COMMICS_GIT_VERSION_HASH="c4974e13106b6478663a211abd841b6c5ecf85d3" ################################################################################ # install requirements