removing unicode_literals from __future__ imports

applications/ALEapplication/ALEApplication.py

@@ -1,11 +1,11 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosALEApplication import *
 application = KratosALEApplication()
 application_name = "KratosALEApplication"
 application_folder = "ALEapplication"
 
 # The following lines are common for all applications
-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)

applications/ALEapplication/custom_strategies/strategies/laplacian_componentwise_meshmoving_strategy.h

@@ -268,9 +268,7 @@ class LaplacianComponentwiseMeshMovingStrategy
         }
 
 
-        CalculateMeshVelocities();
-
-        BaseType::MoveMesh();
+       MoveNodes();
 
         //clearing the system if needed
         if(mreform_dof_at_every_step == true)

applications/ALEapplication/custom_strategies/strategies/structural_meshmoving_strategy.h

@@ -188,13 +188,28 @@ class StructuralMeshMovingStrategy
         // Updating the time
         rCurrentProcessInfo[TIME] = BaseType::GetModelPart().GetProcessInfo()[TIME];
         rCurrentProcessInfo[DELTA_TIME] = BaseType::GetModelPart().GetProcessInfo()[DELTA_TIME];
+
+        //set before each solve the displacements to the value at the beginning of the latest step if they are
+        //not fixed
+        for(ModelPart::NodeIterator i = (*mpMeshModelPart).NodesBegin() ;
+                    i != (*mpMeshModelPart).NodesEnd() ; ++i)
+        {
+            array_1d<double,3>& disp = (i)->FastGetSolutionStepValue(DISPLACEMENT);
+            const array_1d<double,3>& dispold = (i)->FastGetSolutionStepValue(DISPLACEMENT,1);
+
+            if(i->IsFixed(DISPLACEMENT_X) == false) disp[0] = dispold[0];
+            if(i->IsFixed(DISPLACEMENT_Y) == false) disp[1] = dispold[1];
+            if(i->IsFixed(DISPLACEMENT_Z) == false) disp[2] = dispold[2];
+
+            noalias(i->Coordinates()) = i->GetInitialPosition();
+            noalias(i->Coordinates()) += disp;
+        }
 
         // Solve for the mesh movement
         mstrategy->Solve();
 
         // Update FEM-base
-        CalculateMeshVelocities();
-        BaseType::MoveMesh();
+        MoveNodes();
 
         // Clearing the system if needed
         if(mreform_dof_at_every_step == true)
@@ -228,9 +243,21 @@ class StructuralMeshMovingStrategy
         }
         else //mesh velocity calculated as (3*x(n+1)-4*x(n)+x(n-1))/(2*Dt)
         {
-            double c1 = 1.50*coeff;
-            double c2 = -2.0*coeff;
-            double c3 = 0.50*coeff;
+            double Dt = (*mpMeshModelPart).GetProcessInfo()[DELTA_TIME];
+            double OldDt = (*mpMeshModelPart).GetProcessInfo().GetPreviousTimeStepInfo(1)[DELTA_TIME];
+KRATOS_WATCH(Dt)
+KRATOS_WATCH(OldDt)
+
+            double Rho = OldDt / Dt;
+            double TimeCoeff = 1.0 / (Dt * Rho * Rho + Dt * Rho);
+
+            double c1 = TimeCoeff * (Rho * Rho + 2.0 * Rho); //coefficient for step n+1 (3/2Dt if Dt is constant)
+            double c2 = -TimeCoeff * (Rho * Rho + 2.0 * Rho + 1.0); //coefficient for step n (-4/2Dt if Dt is constant)
+            double c3 = TimeCoeff; //coefficient for step n-1 (1/2Dt if Dt is constant)
+
+//             double c1 = 1.50*coeff;
+//             double c2 = -2.0*coeff;
+//             double c3 = 0.50*coeff;
 
             for(ModelPart::NodeIterator i = (*mpMeshModelPart).NodesBegin() ;
                     i != (*mpMeshModelPart).NodesEnd() ; ++i)

applications/ALEapplication/python_scripts/mesh_solver.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.ALEApplication import *

applications/ALEapplication/python_scripts/mesh_solver_ballvertex.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.ALEApplication import *

applications/ALEapplication/python_scripts/mesh_solver_laplacian_componentwise.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.ALEApplication import *

applications/ALEapplication/python_scripts/mesh_solver_laplacian_componentwise_strainbased.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.ALEApplication import *

applications/ALEapplication/python_scripts/mesh_solver_structural_similarity.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.ALEApplication import *

applications/ALEapplication/python_scripts/mesh_solver_structural_similarity_nonlinear.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.ALEApplication import *

applications/ALEapplication/test_examples/cavity2d.gid/cavity2d.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # setting the domain size for the problem to be solved
 domain_size = 2
 

applications/ALEapplication/test_examples/cavity3D.gid/cavity3D.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # setting the domain size for the problem to be solved
 domain_size = 3
 

applications/ALEapplication/test_examples/profil_surface.gid/profil_surface.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.ALEApplication import *

applications/CMakeLists.txt

@@ -13,6 +13,7 @@ message("PFEM_SOLID_MECHANICS_APPLICATION.....${PFEM_SOLID_MECHANICS_APPLICATION
 message("FLUID_DYNAMICS_APPLICATION.......... ${FLUID_DYNAMICS_APPLICATION}")
 message("ALE_APPLICATION..................... ${ALE_APPLICATION}")
 message("FSI_APPLICATION..................... ${FSI_APPLICATION}")
+message("EMPIRE_APPLICATION..................... ${EMPIRE_APPLICATION}")
 message("MIXED_ELEMENT_APPLICATION........... ${MIXED_ELEMENT_APPLICATION}")
 message("DEM_APPLICATION......................${DEM_APPLICATION}")
 message("SWIMMING_DEM_APPLICATION.............${SWIMMING_DEM_APPLICATION}")
@@ -147,5 +148,9 @@ if(${WIND_TURBINE_APPLICATION} MATCHES ON)
   add_subdirectory(wind_turbine_application)
 endif(${WIND_TURBINE_APPLICATION} MATCHES ON)
 
+if(${EMPIRE_APPLICATION} MATCHES ON)
+  add_subdirectory(empire_application)
+endif(${EMPIRE_APPLICATION} MATCHES ON)
+
 # get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
 # message("applications subdir inc_dirs = ${inc_dirs}")

applications/DEM_FEM_Application/DEM_FEM_Application.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosDEM_FEM_Application import *
 application = KratosDEM_FEM_Application()
 application_name = "KratosDEM_FEM_Application"

applications/DEM_FEM_Application/python_scripts/DEM_Explicit_Solve_Strategy.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import sys
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *

applications/DEM_FEM_Application/python_scripts/DEM_FEM_Explicit_Solve_Strategy.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 
 

applications/DEM_FEM_Application/python_scripts/FEM_Explicit_Solve_Strategy.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # importing the Kratos Library
 from KratosMultiphysics import *
 from KratosMultiphysics.DEM_FEM_Application import *

applications/DEM_application/DEMApplication.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosDEMApplication import *
 application = KratosDEMApplication()
 application_name = "KratosDEMApplication"

applications/DEM_application/custom_problemtype/DEM_explicit_solver.gid/continuum_spheric_particle_script.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import time as timer
 import os
 import sys

applications/DEM_application/custom_problemtype/DEM_explicit_solver.gid/continuum_spheric_particle_script_mpi.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import time as timer
 import os
 import sys

applications/DEM_application/custom_problemtype/DEM_explicit_solver.gid/pressure_script.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *
 # from KratosMultiphysics.MetisApplication import *

applications/DEM_application/custom_problemtype/DEM_explicit_solver.gid/script.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 
 # CASE LAUNCHER
 

applications/DEM_application/custom_problemtype/DEM_explicit_solver.gid/script_mpi.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import time as timer
 import os
 import sys

applications/DEM_application/custom_problemtype/DEM_explicit_solver.gid/spheric_particle_script.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import time as timer
 import os
 import sys

applications/DEM_application/custom_problemtype/problemtype_generator/DEM_explicit_script/script.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # import cProfile
 
 import DEM_explicit_solver_var

applications/DEM_application/python_scripts/DEM_inlet_process.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosMultiphysics.DEMApplication import *
 
 

applications/DEM_application/python_scripts/DEM_procedures.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *
 

applications/DEM_application/python_scripts/DEM_procedures_mpi.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *
 from KratosMultiphysics.MetisApplication import *

applications/DEM_application/python_scripts/continuum_sphere_strategy.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *
 

applications/DEM_application/python_scripts/sphere_strategy.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import sys
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *

applications/DEM_application/test_examples/DEM_benchmarks.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import os
 import sys
 

applications/DEM_application/test_examples/DEM_references.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import os
 import sys
 

applications/DEM_application/test_examples/rotating_ball_no_tangent_damp.gid/DEM_explicit_solver_var.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # Model Type
 
 ContinuumOption = "OFF"

applications/DEM_application/test_examples/rotating_ball_no_tangent_damp.gid/pressure_script.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *
 # from KratosMultiphysics.MetisApplication import *

applications/DEM_application/test_examples/rotating_ball_no_tangent_damp.gid/rotating_ball_no_tangent_damp.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import time as timer
 import os
 import sys

applications/DEM_application/test_examples/rotating_ball_no_tangent_damp.gid/rotating_ball_no_tangent_damp_benchmark.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import benchmarking
 
 

applications/DEM_application/test_examples/rotating_ball_no_tangent_damp.gid/rotating_ball_no_tangent_damp_build_reference.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import sys
 kratos_benchmarking_path = '../../../../benchmarking'
 sys.path.append(kratos_benchmarking_path)

applications/DEM_application/test_examples/rotating_ball_rolling_friction.gid/DEM_explicit_solver_var.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # Model Type
 
 ContinuumOption = "OFF"

applications/DEM_application/test_examples/rotating_ball_rolling_friction.gid/pressure_script.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 from KratosMultiphysics import *
 from KratosMultiphysics.DEMApplication import *
 # from KratosMultiphysics.MetisApplication import *

applications/DEM_application/test_examples/rotating_ball_rolling_friction.gid/rotating_ball_rolling_friction.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import time as timer
 import os
 import sys

applications/DEM_application/test_examples/rotating_ball_rolling_friction.gid/rotating_ball_rolling_friction_benchmark.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import benchmarking
 
 

applications/DEM_application/test_examples/rotating_ball_rolling_friction.gid/rotating_ball_rolling_friction_build_reference.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 import sys
 kratos_benchmarking_path = '../../../../benchmarking'
 sys.path.append(kratos_benchmarking_path)

applications/DEM_application/test_examples/two_balls_no_damp.gid/DEM_explicit_solver_var.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # Model Type
 
 ContinuumOption = "OFF"

applications/DEM_application/test_examples/two_balls_no_damp.gid/benchmark_lines.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
+from __future__ import print_function, absolute_import, division #makes KratosMultiphysics backward compatible with python 2.6 and 2.7
 # including kratos path                                                                        ### BENCHMARK ###
 kratos_path = '../../../..'  # BENCHMARK ###
 kratos_libs_path = '../../../../libs'  # kratos_root/libs                                      ### BENCHMARK ###