Merge branch 'master' into ci/updating-wheelbuilders

Author: roigcarlo

.github/workflows/ci.yml

@@ -246,7 +246,7 @@ jobs:
 
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: changed-files
     env:
       KRATOS_BUILD_TYPE: Custom
@@ -462,7 +462,7 @@ jobs:
 
 
   windows-core-without-unity:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: changed-files
     env:
       KRATOS_BUILD_TYPE: Custom
@@ -496,7 +496,7 @@ jobs:
     - name: Build
       shell: cmd
       run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 || goto :error
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 || goto :error
 
         set CC=cl.exe
         set CXX=cl.exe
@@ -512,7 +512,7 @@ jobs:
         del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeFiles"
 
         cmake                                                 ^
-          -G"Visual Studio 16 2019"                           ^
+          -G"Visual Studio 17 2022"                           ^
           -H"%KRATOS_SOURCE%"                                 ^
           -B"%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%"              ^
           -DBOOST_ROOT="%TEMP%\boost"                         ^

.github/workflows/configure.cmd

@@ -1,4 +1,4 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 || goto :error
+call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 || goto :error
 
 set CC=cl.exe
 set CXX=cl.exe
@@ -43,7 +43,7 @@ del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeCache.txt"
 del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeFiles"
 
 cmake                                                 ^
-  -G"Visual Studio 16 2019"                           ^
+  -G"Visual Studio 17 2022"                           ^
   -H"%KRATOS_SOURCE%"                                 ^
   -B"%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%"              ^
   -DBOOST_ROOT="%TEMP%\boost"                         ^

.github/workflows/nightly_build.yml

@@ -175,7 +175,7 @@ jobs:
 
 
   windows-nightly:
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
       KRATOS_BUILD_TYPE: Custom
 

CMakeLists.txt

@@ -285,8 +285,8 @@ endif(${MSVC})
 # Common flags for MSVC
 if(${MSVC})
   message(STATUS "Detected compiler as MSVC")
-  SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W1 /bigobj /EHsc -DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS")
-  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1 /bigobj /EHsc /Zc:__cplusplus -DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS")
+  SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W1 /bigobj /EHsc /DNOMINMAX -DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS")
+  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W1 /bigobj /EHsc /DNOMINMAX /Zc:__cplusplus -DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS")
   string( REPLACE "/W3" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS} )
   string( REPLACE "/W3" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
   # CMake does not select the correct runtime library for FullDebug now, no idea why
@@ -344,7 +344,7 @@ if(KRATOS_BUILD_TESTING MATCHES ON)
 
   # restore the current directory's old `COMPILE_OPTIONS`
   set_directory_properties(PROPERTIES COMPILE_OPTIONS "${kratos_root_compile_options}")
-endif(KRATOS_BUILD_TESTING MATCHES ON) 
+endif(KRATOS_BUILD_TESTING MATCHES ON)
 
 # Benchmarking
 if(KRATOS_BUILD_BENCHMARK MATCHES ON)
@@ -690,6 +690,7 @@ message("\t Model 'CreateModelPart' behavior change (no error thrown if model pa
 message("\t Make GetIntegrationMethod method of Condition const: https://github.com/KratosMultiphysics/Kratos/pull/9769")
 message("\t Behavior change of ModelPart.GetProperties (MeshIndex removed): https://github.com/KratosMultiphysics/Kratos/pull/9774")
 message("\t Behavior change of Testing. Please ensure you use KRATOS_EXPECT for testing instead of KRATOS_CHECK")
+message("\t Removal of misused EXTENDED_GAUSS integration rules and unification across geometries: https://github.com/KratosMultiphysics/Kratos/pull/13444")
 
 # Compiling the clipper library
 add_subdirectory(${KRATOS_SOURCE_DIR}/external_libraries/clipper)

README.md

@@ -144,7 +144,7 @@ Some users of the technologies developed in Kratos are:
 ## In Kratos Core:
 - [Boost](http://www.boost.org/) for uBLAS
 - [pybind11](https://github.com/pybind/pybind11) for exposing C++ to python
-- [GidPost](https://www.gidhome.com/gid-plus/tools/476/gidpost/) providing output to [GiD](https://www.gidhome.com/)
+- [GidPost]([https://www.gidhome.com/gid-plus/tools/476/gidpost/](https://www.gidsimulation.com/downloads/gidpost-2-11-library-to-write-postprocess-results-for-gid-in-ascii-binary-or-hdf5-format/)) providing output to [GiD](https://www.gidsimulation.com/)
 - [AMGCL](https://github.com/ddemidov/amgcl) for its highly scalable multigrid solver
 - [JSON](https://github.com/nlohmann/json) JSON for Modern C++
 - [ZLib](https://zlib.net/) The compression library

applications/CSharpWrapperApplication/tests/cpp_tests/test_calculate.cpp

@@ -8,10 +8,10 @@
 //                                 |_|                     |_|   |_|                    |_|   |_|
 //
 //
-//  License: BSD License
-//   license: CSharpWrapperApplication/license.txt
+//  License:         BSD License
+//                   license: CSharpWrapperApplication/license.txt
 //
-//  Main authors:  Vicente Mataix Ferrandiz
+//  Main authors:    Vicente Mataix Ferrandiz
 //
 
 // System includes
@@ -28,10 +28,10 @@ namespace Kratos {
     namespace Testing {
         void CreateMDPAFile() {
             std::filebuf buffer;
-            buffer.open(FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.mdpa"}), std::ios::out);
+            std::filesystem::path file_path = std::filesystem::current_path() / "file.mdpa";
+            buffer.open(file_path.string().c_str(), std::ios::out);
             std::ostream os(&buffer);
-            os
-                    << "Begin ModelPartData\nEnd ModelPartData\n\nBegin Properties  0\n    DENSITY 2700.000000\n    YOUNG_MODULUS 7000000.000000\n    POISSON_RATIO 0.300000\n    BODY_FORCE [3] (0.000000,0.000000,0.000000)\n    THICKNESS 1.000000\nEnd Properties\n\nBegin Nodes\n        1        0.0        0.0         0.0\n        2        0.0        0.0         1.0\n        3        1.0        0.0         0.0\n        4        1.0        1.0         0.0\nEnd Nodes\n\nBegin Elements SmallDisplacementElement3D4N\n    1 0 1 2 3 4\nEnd Elements\n\nBegin SubModelPart BasePart // Note that this would be a sub sub modelpart\n    Begin SubModelPartNodes\n        1\n        2\n    End SubModelPartNodes\n    Begin SubModelPart inner_part\n        Begin SubModelPartNodes\n            1\n        End SubModelPartNodes\n    End SubModelPart\nEnd SubModelPart";
+            os << "Begin ModelPartData\nEnd ModelPartData\n\nBegin Properties  0\n    DENSITY 2700.000000\n    YOUNG_MODULUS 7000000.000000\n    POISSON_RATIO 0.300000\n    BODY_FORCE [3] (0.000000,0.000000,0.000000)\n    THICKNESS 1.000000\nEnd Properties\n\nBegin Nodes\n        1        0.0        0.0         0.0\n        2        0.0        0.0         1.0\n        3        1.0        0.0         0.0\n        4        1.0        1.0         0.0\nEnd Nodes\n\nBegin Elements SmallDisplacementElement3D4N\n    1 0 1 2 3 4\nEnd Elements\n\nBegin SubModelPart BasePart // Note that this would be a sub sub modelpart\n    Begin SubModelPartNodes\n        1\n        2\n    End SubModelPartNodes\n    Begin SubModelPart inner_part\n        Begin SubModelPartNodes\n            1\n        End SubModelPartNodes\n    End SubModelPart\nEnd SubModelPart";
             buffer.close();
         }
 
@@ -86,7 +86,8 @@ namespace Kratos {
             })");
             const std::string &r_json_text = json_parameters.PrettyPrintJsonString();
             std::filebuf buffer;
-            buffer.open(FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.json"}), std::ios::out);
+            std::filesystem::path file_path_json = std::filesystem::current_path() / "file.json";
+            buffer.open(file_path_json.string().c_str(), std::ios::out);
             std::ostream os(&buffer);
             os << r_json_text;
             buffer.close();
@@ -102,9 +103,9 @@ namespace Kratos {
 
             // Import mdpa
             CreateMDPAFile();
-            const std::string file_name = FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.mdpa"});
+            std::filesystem::path file_path = std::filesystem::current_path() / "file.mdpa";
             CSharpKratosWrapper::KratosWrapper *wrapperInstance = new CSharpKratosWrapper::KratosWrapper();
-            wrapperInstance->init(file_name.c_str());
+            wrapperInstance->init(file_path.string().c_str());
             CSharpKratosWrapper::ModelPartWrapper *mainModelPart = wrapperInstance->getRootModelPartWrapper();
             // Get some API info
             mainModelPart->retrieveResults();
@@ -191,7 +192,7 @@ namespace Kratos {
 //             KRATOS_EXPECT_NEAR(y[3], 1.0, float_epsilon);
 //             KRATOS_EXPECT_NEAR(z[3], 0.0, float_epsilon);
 
-            Kratos::filesystem::remove((FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.mdpa"})).c_str());
+            std::filesystem::remove(file_path);
         }
 
         /**
@@ -205,11 +206,11 @@ namespace Kratos {
             // Import mdpa
             CreateMDPAFile();
             CreateJSONFile();
-            const std::string file_name = FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.mdpa"});
-            const std::string file_name_json = FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.json"});
+            std::filesystem::path file_path = std::filesystem::current_path() / "file.mdpa";
+            std::filesystem::path file_path_json = std::filesystem::current_path() / "file.json";
             CSharpKratosWrapper::KratosWrapper *wrapperInstance = new CSharpKratosWrapper::KratosWrapper();
 
-            wrapperInstance->init(file_name.c_str(), file_name_json.c_str());
+            wrapperInstance->init(file_path.string().c_str(), file_path_json.string().c_str());
             CSharpKratosWrapper::ModelPartWrapper *mainModelPart = wrapperInstance->getRootModelPartWrapper();
 
             // Get some API info
@@ -297,8 +298,8 @@ namespace Kratos {
 //             KRATOS_EXPECT_NEAR(y[3], 1.0, float_epsilon);
 //             KRATOS_EXPECT_NEAR(z[3], 0.0, float_epsilon);
 
-            Kratos::filesystem::remove((FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.mdpa"})).c_str());
-            Kratos::filesystem::remove((FilesystemExtensions::JoinPaths({FilesystemExtensions::CurrentWorkingDirectory(), "file.json"})).c_str());
+            std::filesystem::remove(file_path);
+            std::filesystem::remove(file_path_json);
         }
 
     } // namespace Testing

applications/CoSimulationApplication/tests/test_co_sim_io_py_exposure.py

@@ -8,7 +8,7 @@
 import os
 import subprocess
 
-
+@KratosUnittest.skipIf(os.name == 'nt', "This test is skipped in windows due to random errors in CI.")
 class TestCoSimIOPyExposure_aux_tests(KratosUnittest.TestCase):
 
     def test_InfoFromParameters(self):
@@ -49,7 +49,7 @@ def test_InfoFromParameters(self):
         self.assertFalse(sub_info.GetBool("is_converged"))
         self.assertEqual(sub_info.GetInt("echo_lvl"), 5)
 
-
+@KratosUnittest.skipIf(os.name == 'nt', "This test is skipped in windows due to random errors in CI.")
 class TestCoSimIOPyExposure(KratosUnittest.TestCase):
 
     def test_Connect_Disconnect(self):

applications/CoSimulationApplication/tests/test_kratos_co_sim_io.py

@@ -8,7 +8,7 @@
 import os
 import subprocess
 
-
+@KratosUnittest.skipIf(os.name == 'nt', "This test is skipped in windows due to random errors in CI.")
 class TestKratosCoSimIO(KratosUnittest.TestCase):
 
     def test_Connect_Disconnect(self):

applications/ContactMechanicsApplication/custom_processes/build_contact_model_part_process.hpp

@@ -16,7 +16,6 @@
 #include <iostream>
 
 // External includes
-#include <boost/timer.hpp>
 
 // Project includes
 #include "includes/model_part.h"

applications/ContactMechanicsApplication/custom_processes/generate_new_contact_conditions_mesher_process.hpp

@@ -16,7 +16,6 @@
 #include <iostream>
 
 // External includes
-#include <boost/timer.hpp>
 
 // Project includes
 #include "includes/model_part.h"