Skip to content

Commit d36b724

Browse files
committed
Move PostMesh to an external python package
1 parent 3e59082 commit d36b724

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*.step
4141

4242
# object files
43-
.o
43+
*.o
4444

4545
# shared libraries
4646
*.so
@@ -59,6 +59,7 @@ RunSession.sublime-project
5959
RunSession.sublime-workspace
6060
Florence.sublime-project
6161
Florence.sublime-workspace
62+
*.sublime-project
6263
param_run_session.py
6364
profile_imports_manual.py
6465
nr.py

Florence/BoundaryCondition/CurvilinearMeshing/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
from .BoundaryCondition import BoundaryCondition
2-
from .CurvilinearMeshing import PostMeshCurvePy, PostMeshSurfacePy
2+
from PostMeshPy import PostMeshCurvePy, PostMeshSurfacePy
Lines changed: 0 additions & 1 deletion
This file was deleted.

Florence/ParallelProcessing/mpipool

Lines changed: 0 additions & 1 deletion
This file was deleted.

setup.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,9 @@ def CollectExtensionModulePaths(self):
203203
gm_path = os.path.join(_pwd_,"VariationalPrinciple","_GeometricStiffness_")
204204
cm_path = os.path.join(_pwd_,"VariationalPrinciple","_ConstitutiveStiffness_")
205205
material_path = os.path.join(_pwd_,"MaterialLibrary","LLDispatch")
206-
occ_path = os.path.join(_pwd_,"BoundaryCondition","CurvilinearMeshing","PostMesh")
207206

208-
self.extension_paths = [tensor_path,mesh_path,jacobi_path,bp_path,km_path,gm_path,cm_path,material_path,occ_path]
209-
210-
# self.extension_paths = [jacobi_path]
207+
self.extension_paths = [tensor_path,mesh_path,jacobi_path,bp_path,km_path,gm_path,cm_path,material_path]
208+
# self.extension_paths = [material_path]
211209

212210
def SourceClean(self):
213211

@@ -219,9 +217,6 @@ def SourceClean(self):
219217
execute('cd '+_path+' && '+source_clean_cmd)
220218
elif "LLDispatch" in _path:
221219
execute('cd '+_path+' && echo rm -rf *.cpp CythonSource/*.cpp && rm -rf *.cpp CythonSource/*.cpp')
222-
elif "PostMesh" in _path:
223-
execute('cd '+_path+' && echo rm -rf PostMeshPy.cpp build/ && rm -rf m PostMeshPy.cpp build')
224-
225220

226221
def Clean(self):
227222

@@ -231,7 +226,7 @@ def Clean(self):
231226
# You need to run both make clean and rm -rf as some modules relocate the shared libraries
232227
clean_cmd = 'make clean ' + self.compiler_args
233228
for _path in self.extension_paths:
234-
if "PostMesh" not in _path and "LLDispatch" not in _path:
229+
if "LLDispatch" not in _path:
235230
execute('cd '+_path+' && echo rm -rf *.so && '+clean_cmd+' && rm -rf *.so *.'+self.extension_postfix)
236231
elif "LLDispatch" in _path:
237232
execute('cd '+_path+
@@ -262,7 +257,6 @@ def Build(self):
262257
"_IsotropicElectroMechanics_108_",
263258
"_Piezoelectric_100_"
264259
]
265-
266260
# low_level_material_list = ["_IsotropicElectroMechanics_101_"]
267261

268262
assert self.extension_paths != None
@@ -275,10 +269,8 @@ def Build(self):
275269
for material in low_level_material_list:
276270
material = material.lstrip('_').rstrip('_')
277271
execute('cd '+_path+' && make ' + self.compiler_args + " MATERIAL=" + material)
278-
elif "PostMesh" in _path:
279-
execute('cd '+_path+' && python setup.py build_ext -ifq')
280272

281-
# Get rid off cython sources
273+
# Get rid of cython sources
282274
sys.stdout = open(os.devnull, 'w')
283275
self.SourceClean()
284276
sys.stdout = sys.__stdout__

0 commit comments

Comments
 (0)