Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more apps as python-modules #3632

Merged
merged 8 commits into from
Dec 12, 2018
Merged

more apps as python-modules #3632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7830af5
updating CompressiblePotentialFlowApplication
philbucher Dec 11, 2018
a6e4843
updating ContactStructuralMechanics
philbucher Dec 11, 2018
3e25b9a
updating EigenSolversApp
philbucher Dec 11, 2018
d9698a9
updating EmpireApp
philbucher Dec 11, 2018
3272d86
updating hdfapp
philbucher Dec 11, 2018
214b982
updating meshmoving
philbucher Dec 11, 2018
65d3b69
updating shapeoptimization
philbucher Dec 11, 2018
90b753f
updating trilinos
philbucher Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/CompressiblePotentialFlowApplication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ if(${INSTALL_PYTHON_FILES} MATCHES ON)
endif(${INSTALL_PYTHON_FILES} MATCHES ON)

# Add to the KratosMultiphisics Python module
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/CompressiblePotentialFlowApplication.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/CompressiblePotentialFlowApplication")
4 changes: 2 additions & 2 deletions ...n/CompressiblePotentialFlowApplication.py → ...lowApplication/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
application_folder = "CompressiblePotentialFlowApplication"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application,application_name,application_folder,caller)
application_importer.ImportApplication(application,application_name,application_folder,caller,__path__)
2 changes: 1 addition & 1 deletion applications/ContactStructuralMechanicsApplication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ endif(USE_COTIRE MATCHES ON)
install(TARGETS KratosContactStructuralMechanicsApplication DESTINATION libs )

# Add to the KratosMultiphisics Python module
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ContactStructuralMechanicsApplication.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/ContactStructuralMechanicsApplication")
4 changes: 2 additions & 2 deletions .../ContactStructuralMechanicsApplication.py → ...icsApplication/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
application_folder = "ContactStructuralMechanicsApplication"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application,application_name,application_folder,caller)
application_importer.ImportApplication(application,application_name,application_folder,caller,__path__)
2 changes: 1 addition & 1 deletion applications/EigenSolversApplication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ if(USE_COTIRE MATCHES ON)
endif(USE_COTIRE MATCHES ON)

# Add to the KratosMultiphisics Python module
install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/EigenSolversApplication.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/EigenSolversApplication")
8 changes: 4 additions & 4 deletions ...ersApplication/EigenSolversApplication.py → ...ersApplication/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#
#
# KRATOS _______
# / ____(_)___ ____ ____
# / __/ / / __ `/ _ \/ __ \
# / /___/ / /_/ / __/ / / /
# /_____/_/\__, /\___/_/ /_/ SolversApplication
# /____/
#
#
# Author: Thomas Oberbichler
#

Expand All @@ -15,7 +15,7 @@
application_folder = "eigen_solvers_application"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application,application_name,application_folder,caller)
application_importer.ImportApplication(application,application_name,application_folder,caller,__path__)
2 changes: 1 addition & 1 deletion applications/EmpireApplication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ if(${INSTALL_PYTHON_FILES} MATCHES ON)
endif(${INSTALL_PYTHON_FILES} MATCHES ON)

# Add to the KratosMultiphisics Python module
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/EmpireApplication.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/EmpireApplication")
4 changes: 2 additions & 2 deletions ...ns/EmpireApplication/EmpireApplication.py → ...ireApplication/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
application_folder = "EmpireApplication"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application, application_name, application_folder, caller)
application_importer.ImportApplication(application, application_name, application_folder, caller, __path__)
2 changes: 1 addition & 1 deletion applications/HDF5Application/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ if(${INSTALL_PYTHON_FILES} MATCHES ON)
endif(${INSTALL_PYTHON_FILES} MATCHES ON)

# Add to the KratosMultiphisics Python module
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/HDF5Application.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/HDF5Application")
4 changes: 2 additions & 2 deletions ...ations/HDF5Application/HDF5Application.py → ...DF5Application/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
application_folder = "HDF5Application"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application,application_name,application_folder,caller)
application_importer.ImportApplication(application,application_name,application_folder,caller,__path__)
2 changes: 1 addition & 1 deletion applications/MeshMovingApplication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ endif(USE_COTIRE MATCHES ON)
install(TARGETS KratosMeshMovingApplication DESTINATION libs )

# Add to the KratosMultiphisics Python module
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/MeshMovingApplication.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/MeshMovingApplication")
4 changes: 2 additions & 2 deletions ...ovingApplication/MeshMovingApplication.py → ...ingApplication/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
application_folder = "MeshMovingApplication"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application, application_name, application_folder, caller)
application_importer.ImportApplication(application, application_name, application_folder, caller, __path__)
2 changes: 1 addition & 1 deletion applications/ShapeOptimizationApplication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ endif(${INSTALL_TESTING_FILES} MATCHES ON)
# message("TestApplication subdir inc_dirs = ${inc_dirs}")

# Add to the KratosMultiphisics Python module
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ShapeOptimizationApplication.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/ShapeOptimizationApplication")
4 changes: 2 additions & 2 deletions ...plication/ShapeOptimizationApplication.py → ...ionApplication/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
application_folder = "ShapeOptimizationApplication"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application,application_name,application_folder,caller)
application_importer.ImportApplication(application,application_name,application_folder,caller,__path__)
2 changes: 1 addition & 1 deletion applications/trilinos_application/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ if(${INSTALL_PYTHON_FILES} MATCHES ON)
endif(${INSTALL_PYTHON_FILES} MATCHES ON)

# Add to the KratosMultiphisics Python module
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/TrilinosApplication.py" DESTINATION KratosMultiphysics )
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/python_scripts/__init__.py" DESTINATION "KratosMultiphysics/TrilinosApplication")
4 changes: 2 additions & 2 deletions ...ilinos_application/TrilinosApplication.py → ...os_application/python_scripts/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
application_folder = "trilinos_application"

# The following lines are common for all applications
from . import application_importer
from .. import application_importer
import inspect
caller = inspect.stack()[1] # Information about the file that imported this, to check for unexpected imports
application_importer.ImportApplication(application, application_name, application_folder, caller)
application_importer.ImportApplication(application, application_name, application_folder, caller, __path__)