*** Wartungsfenster jeden ersten Mittwoch vormittag im Monat ***

Skip to content
Snippets Groups Projects
Commit 64d97f73 authored by Carl-Martin Pfeiler's avatar Carl-Martin Pfeiler
Browse files

Partial (small) merge from commicsPaper

parent 98385107
No related branches found
No related tags found
No related merge requests found
...@@ -376,7 +376,7 @@ class MPS(_integrator._Integrator, \ ...@@ -376,7 +376,7 @@ class MPS(_integrator._Integrator, \
diff_gf.vec.FV().NumPy()[:] = self._Mag_eta.m.vec.FV().NumPy()-oldIterate diff_gf.vec.FV().NumPy()[:] = self._Mag_eta.m.vec.FV().NumPy()-oldIterate
itError = sqrt( Integrate(diff_cf*diff_cf, self._GetMesh()) ) itError = sqrt( Integrate(diff_cf*diff_cf, self._GetMesh()) )
if isinstance(self._fixedPointItCounter, IterationCounter): if isinstance(self._fixedPointCallback, IterationCounter):
self._fixedPointCallback() self._fixedPointCallback()
# TODO consider error in heff like in mpsPaper # TODO consider error in heff like in mpsPaper
...@@ -386,11 +386,18 @@ class MPS(_integrator._Integrator, \ ...@@ -386,11 +386,18 @@ class MPS(_integrator._Integrator, \
print("itnr = ", itnr, "; Err = ", itError) print("itnr = ", itnr, "; Err = ", itError)
oldIterate[:] = self._Mag_eta.m.vec.FV().NumPy() oldIterate[:] = self._Mag_eta.m.vec.FV().NumPy()
self._Mag_eta.ComputeMaxwell(self._solvetol) self._UpdateMagnetostatic_insideFixedPointIteration()
print("itnr = ", itnr, "; Err = ", itError) print("itnr = ", itnr, "; Err = ", itError)
#------------------------------------------------------------------------------#
def _UpdateMagnetostatic_insideFixedPointIteration(self):
self._Mag_eta.ComputeMaxwell(self._solvetol)
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
......
...@@ -65,6 +65,13 @@ class MPSAB(mps.MPS, _forms.lf_derivative.LinearForms_Derivative, \ ...@@ -65,6 +65,13 @@ class MPSAB(mps.MPS, _forms.lf_derivative.LinearForms_Derivative, \
, self._solvetol) , self._solvetol)
#------------------------------------------------------------------------------#
def _UpdateMagnetostatic_insideFixedPointIteration(self):
pass
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
......
...@@ -8,7 +8,7 @@ WRITE_PATHS_TO=~/.bashrc ...@@ -8,7 +8,7 @@ WRITE_PATHS_TO=~/.bashrc
NGSOLVE_GIT_VERSION_HASH="0419c0285dae6589c32a5ddfaf0dea2e89a5e3b7" NGSOLVE_GIT_VERSION_HASH="0419c0285dae6589c32a5ddfaf0dea2e89a5e3b7"
BEMPP_GIT_VERSION_HASH="ce2ffc1ce52f07bf5890b19fb7c4389a7bb1031a" BEMPP_GIT_VERSION_HASH="ce2ffc1ce52f07bf5890b19fb7c4389a7bb1031a"
NGBEM_GIT_VERSION_HASH="499138ca5dd17e812d3bdfdc0556afbff4ca340c" NGBEM_GIT_VERSION_HASH="499138ca5dd17e812d3bdfdc0556afbff4ca340c"
COMMICS_GIT_VERSION_HASH="" COMMICS_GIT_VERSION_HASH="c4974e13106b6478663a211abd841b6c5ecf85d3"
################################################################################ ################################################################################
# install requirements # install requirements
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment