marked to delete

Author: aradermacher

src/fenicsxconcrete/finite_element_problem/__init__.py

@@ -1,4 +1,3 @@
 from .base_material import MaterialProblem, QuadratureFields, SolutionFields
-#from .concrete_am import ConcreteAM, ConcreteThixElasticModel
-#from .concrete_thermo_mechanical import ConcreteThermoMechanical
-#from .linear_elasticity import LinearElasticity
+from .linear_elasticity import LinearElasticity
+from .fenics_constitutive import FenicsConstitutive

src/fenicsxconcrete/finite_element_problem/concrete_am_fc.py

@@ -157,7 +157,6 @@ def setup(self) -> None:
 
         # boundaries
         bcs = self.experiment.create_displacement_boundary(self.V)
-        # body_force_fct = self.experiment.create_body_force # TODO temp delete
         body_force_fct = self.experiment.create_body_force_am  # with element activation
 
         # define problem:
@@ -340,7 +339,7 @@ def update_path(self) -> None:
         for _ in load_idx:
             density[active_idx[load_idx]] = (
                 self.q_array_path_time[active_idx[load_idx]] / self.p["load_time"]
-            )  # linear ramp #TODO check
+            )  # linear ramp 
 
         self.density_time.x.array[:] = density
         self.density_time.x.scatter_forward()
@@ -376,18 +375,21 @@ def pv_plot(self) -> None:
 
 
         # write further fields 
-        sigma_plot = df.fem.Function(self.plot_space_stress, name="Stress")
-        project(self.q_fields.mandel_stress, self.plot_space_stress, ufl.dx, sigma_plot) #TODO: Check rule 
-        sigma_plot.x.scatter_forward()
-
-        density_plot = df.fem.Function(self.plot_space_alpha, name="Density")
-        project(self.density_time, self.plot_space_alpha, ufl.dx, density_plot)
-        density_plot.x.scatter_forward()
+        sigma_plot = project(self.q_fields.mandel_stress, self.plot_space_stress, self.rule.dx)  
+        sigma_plot.name = "Stress"
+        
+        density_plot = project(self.density_time, self.plot_space_alpha, self.rule.dx)
+        density_plot.name = "Density"
+        # density_plot = df.fem.Function(self.plot_space_alpha, name="Density")
+        # project(self.density_time, self.plot_space_alpha, ufl.dx, density_plot)
+        # density_plot.x.scatter_forward()
 
         if self.a_plot:
-            alpha_plot = df.fem.Function(self.plot_space_alpha, name="Alpha")   
-            project(self.q_fields.history_scalar, self.plot_space_alpha, ufl.dx, alpha_plot)
-            alpha_plot.x.scatter_forward()
+            alpha_plot = project(self.q_fields.history_scalar, self.plot_space_alpha, self.rule.dx)
+            alpha_plot.name = "Alpha"
+            # alpha_plot = df.fem.Function(self.plot_space_alpha, name="Alpha")   
+            # project(self.q_fields.history_scalar, self.plot_space_alpha, ufl.dx, alpha_plot)
+            # alpha_plot.x.scatter_forward()
         # #
         ## write to file
         with df.io.XDMFFile(self.mesh.comm, self.pv_output_file, "a") as f:

…te/finite_element_problem/concrete_am.py …te_element_problem/delete_concrete_am.pysrc/fenicsxconcrete/finite_element_problem/concrete_am.py renamed to src/fenicsxconcrete/finite_element_problem/delete_concrete_am.py src/fenicsxconcrete/finite_element_problem/concrete_am.py renamed to src/fenicsxconcrete/finite_element_problem/delete_concrete_am.py

@@ -182,7 +182,7 @@ def solve(self) -> None:
         self.compute_residuals()  # for residual sensor
         for sensor_name in self.sensors:
             # go through all sensors and measure
-            self.sensors[sensor_name].measure(self) # TODO: problems with stress sensor
+            self.sensors[sensor_name].measure(self) 
 
     def compute_residuals(self) -> None:
         """defines what to do, to compute the residuals. Called in solve for sensors"""
@@ -197,19 +197,16 @@ def pv_plot(self) -> None:
         if self.p["degree"] > 1:
             # project displacement to linear space for writing 
             V_project = df.fem.functionspace(self.experiment.mesh, ("CG", 1, (self.p["dim"],)))
-            disp_plot = df.fem.Function(V_project, name="displacement")
-            #disp_plot.interpolate(self.fields.displacement)
-            project(self.fields.displacement, V_project, ufl.dx, disp_plot)
-            disp_plot.x.scatter_forward()
+            disp_plot = project(self.fields.displacement, V_project, self.rule.dx)
         else:
             disp_plot = self.fields.displacement
-            disp_plot.x.scatter_forward()
+        disp_plot.name = "displacement"
 
 
         # write further fields 
-        sigma_plot = df.fem.Function(self.plot_space_stress, name="Stress")
-        project(self.q_fields.mandel_stress, self.plot_space_stress, ufl.dx, sigma_plot) #TODO: Check rule 
-        sigma_plot.x.scatter_forward()
+        sigma_plot = project(self.q_fields.mandel_stress, self.plot_space_stress, self.rule.dx)
+        sigma_plot.name = "Stress"
+
         # #
         ## write to file
         with df.io.XDMFFile(self.mesh.comm, self.pv_output_file, "a") as f:

…nt_problem/concrete_thermo_mechanical.py …lem/delete_concrete_thermo_mechanical.pysrc/fenicsxconcrete/finite_element_problem/concrete_thermo_mechanical.py renamed to src/fenicsxconcrete/finite_element_problem/delete_concrete_thermo_mechanical.py src/fenicsxconcrete/finite_element_problem/concrete_thermo_mechanical.py renamed to src/fenicsxconcrete/finite_element_problem/delete_concrete_thermo_mechanical.py

@@ -157,13 +157,10 @@ def pv_plot(self) -> None:
         if self.p["degree"] > 1:
             # project displacement to linear space for writing 
             V_project = df.fem.functionspace(self.experiment.mesh, ("CG", 1, (self.p["dim"],)))
-            disp_plot = df.fem.Function(V_project, name="displacement")
-            #disp_plot.interpolate(self.fields.displacement)
-            project(self.fields.displacement, V_project, ufl.dx, disp_plot)
-            disp_plot.x.scatter_forward()
+            disp_plot = project(self.fields.displacement, V_project, ufl.dx)
         else:
             disp_plot = self.fields.displacement
-            disp_plot.x.scatter_forward()
+        disp_plot.name = "displacement"
 
         with df.io.XDMFFile(self.mesh.comm, self.pv_output_file, "a") as f:
             f.write_function(disp_plot, self.time)

src/fenicsxconcrete/finite_element_problem/fenics_constitutive.py

@@ -1,9 +1,7 @@
 from .base_sensor import BaseSensor, PointSensor
 from .displacement_sensor import DisplacementSensor
-from .doh_sensor import DOHSensor
 from .reaction_force_sensor import ReactionForceSensor
 from .sensor_schema import generate_sensor_schema
 from .strain_sensor import StrainSensor
 from .stress_sensor import StressSensor
-from .temperature_sensor import TemperatureSensor
 from .youngs_modulus_sensor import YoungsModulusSensor

src/fenicsxconcrete/finite_element_problem/linear_elasticity.py

@@ -1,5 +1,4 @@
 from .logger import LogMixin
-from .mori_tanaka_homogenization import ConcreteHomogenization
 from .parameters import Parameters
 from .projection import project
 from .quadrature import QuadratureEvaluator, QuadratureRule