From c73382e51f62adeba2f2afb6e8484a45c7dce4f9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 24 Mar 2016 14:36:24 +0100 Subject: [PATCH] further cleaning --- Makefile | 1 - lib/damask/__init__.py | 32 -------------------------------- 2 files changed, 33 deletions(-) diff --git a/Makefile b/Makefile index 8be738090..1850f6cca 100755 --- a/Makefile +++ b/Makefile @@ -25,7 +25,6 @@ processing: rm -rv build; \ rm *.c; \ fi - @./installation/compile_CoreModule.py ${MAKEFLAGS} .PHONY: tidy tidy: diff --git a/lib/damask/__init__.py b/lib/damask/__init__.py index 1b6ec409d..c25fc0bd8 100644 --- a/lib/damask/__init__.py +++ b/lib/damask/__init__.py @@ -22,35 +22,3 @@ from .geometry import Geometry # noqa from .solver import Solver # noqa from .test import Test # noqa from .util import extendableOption # noqa - -try: - from . import core -# cleaning up namespace -################################################################################################### -# capitalize according to convention - core.IO = core.io - core.FEsolving = core.fesolving - core.DAMASK_interface = core.damask_interface -# remove modulePrefix_ - core.prec.init = core.prec.prec_init - core.DAMASK_interface.init = core.DAMASK_interface.DAMASK_interface_init - core.IO.init = core.IO.IO_init - core.numerics.init = core.numerics.numerics_init - core.debug.init = core.debug.debug_init - core.math.init = core.math.math_init - core.math.tensorAvg = core.math.math_tensorAvg - core.FEsolving.init = core.FEsolving.FE_init - core.mesh.init = core.mesh.mesh_init - core.mesh.nodesAroundCentres = core.mesh.mesh_nodesAroundCentres - core.mesh.deformedCoordsFFT = core.mesh.mesh_deformedCoordsFFT - core.mesh.volumeMismatch = core.mesh.mesh_volumeMismatch - core.mesh.shapeMismatch = core.mesh.mesh_shapeMismatch - -except (ImportError,AttributeError) as e: - core = None # from http://www.python.org/dev/peps/pep-0008/ - if os.path.split(sys.argv[0])[1] not in ('symLink_Processing.py', - 'compile_CoreModule.py', - ): - sys.stderr.write('\nWARNING: Core module (Fortran code) not available, \n'\ - "try to run 'make processing'\n"\ - 'Error message when importing core.so: %s\n\n'%e)