From e0585a328b629b317e1b50356fcbe3878ba548eb Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 14 Aug 2022 17:12:48 +0200 Subject: [PATCH] [FEM] Elmer: writer: get rid of unnecessary function - fixes the ToDo - also remove unnecessary comment --- src/Mod/Fem/femsolver/elmer/writer.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py index b7307f358e..d40334d00a 100644 --- a/src/Mod/Fem/femsolver/elmer/writer.py +++ b/src/Mod/Fem/femsolver/elmer/writer.py @@ -198,10 +198,6 @@ class Writer(object): "BoltzmannConstant": constants.boltzmann_constant(), } - def _getConstant(self, name, unit_dimension): - # TODO without method directly use self.constsdef[name] - return self._convert(self.constsdef[name], unit_dimension) - def _setConstant(self, name, quantityStr): # TODO without method directly use self.constsdef[name] if name == "PermittivityOfVacuum": @@ -432,7 +428,8 @@ class Writer(object): def _handleHeatConstants(self): self._constant( "Stefan Boltzmann", - self._getConstant("StefanBoltzmann", "M/(O^4*T^3)")) + self._convert(self.constsdef["StefanBoltzmann"], "M/(O^4*T^3)") + ) def _handleHeatEquation(self, bodies, equation): for b in bodies: @@ -638,9 +635,8 @@ class Writer(object): def _handleElectrostaticConstants(self): self._constant( "Permittivity Of Vacuum", - self._getConstant("PermittivityOfVacuum", "T^4*I^2/(L^3*M)") + self._convert(self.constsdef["PermittivityOfVacuum"], "T^4*I^2/(L^3*M)") ) - # https://forum.freecadweb.org/viewtopic.php?f=18&p=400959#p400959 def _handleElectrostaticMaterial(self, bodies): for obj in self._getMember("App::MaterialObject"): @@ -1173,7 +1169,7 @@ class Writer(object): obj = self._getSingleMember("Fem::ConstraintSelfWeight") if obj is not None: for name in bodies: - gravity = self._getConstant("Gravity", "L/T^2") + gravity = self._convert(self.constsdef["Gravity"], "L/T^2") m = self._getBodyMaterial(name).Material densityQuantity = Units.Quantity(m["Density"]) @@ -1335,7 +1331,7 @@ class Writer(object): return s def _handleFlowConstants(self): - gravity = self._getConstant("Gravity", "L/T^2") + gravity = self._convert(self.constsdef["Gravity"], "L/T^2") self._constant("Gravity", (0.0, -1.0, 0.0, gravity)) def _updateFlowSolver(self, equation):