fix merge conflict

NREL · Jan 26, 2024 · 724f9e6 · 724f9e6
2 parents 7462ab2 + 2c3159c
commit 724f9e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/windse/DomainManager.py b/windse/DomainManager.py
@@ -1433,13 +1433,13 @@ def __init__(self):
         self.fprint("")
         if self.mesh_type == "mshr":
             raise NotImplementedError("Mshr is no longer supported, use gmsh instead.")
-
             # self.fprint("Generating Mesh Using mshr")
 
             # ### Create Mesh ###
             # mshr_circle = Circle(Point(self.center[0],self.center[1]), self.radius, self.nt)
             # self.mesh = generate_mesh(mshr_circle,self.res)
 
+
         elif self.mesh_type == "gmsh":
             self.fprint("Generating Mesh Using gmsh")
 

diff --git a/windse/FunctionSpaceManager.py b/windse/FunctionSpaceManager.py
@@ -89,7 +89,7 @@ class LinearFunctionSpace(GenericFunctionSpace):
     def __init__(self,dom):
         super(LinearFunctionSpace, self).__init__(dom)
 
-        # trick the mesh to working?
+        # # trick the mesh to working?
         # dummy = MeshFunction('bool', self.mesh, self.mesh.geometry().dim(),False)
         # print("before:", self.mesh.num_entities_global(0))
         # self.mesh = refine(self.mesh,dummy)