Merge pull request #11654 from KratosMultiphysics/Release-9.4.1

roigcarlo · web-flow · commit b2ea4e9ee9a2 · 2023-10-09T09:45:24.000+02:00
Release 9.4.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ endif(POLICY CMP0057)
 
 # Set here the version number **** only update upon tagging a release!
 set (KratosMultiphysics_MAJOR_VERSION 9)
-set (KratosMultiphysics_MINOR_VERSION 3)
+set (KratosMultiphysics_MINOR_VERSION 4)
 set (KratosMultiphysics_PATCH_VERSION 1)
 
 # If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR
diff --git a/INSTALL.md b/INSTALL.md
@@ -518,7 +518,7 @@ The result should be:
  ' /   __| _` | __|  _ \   __|    
  . \  |   (   | |   (   |\__ \  
 _|\_\_|  \__,_|\__|\___/ ____/
-           Multi-Physics 9.2."0"-4afb88094a-Release-ARM64
+           Multi-Physics 9.X.Y-4afb88094a-Release-ARM64
            Compiled for GNU/Linux and Python3.8 with GCC-8.5
 Compiled with threading and MPI support.
 Maximum number of threads: 1.
diff --git a/applications/DamApplication/DamApplication.json b/applications/DamApplication/DamApplication.json
@@ -7,5 +7,5 @@
 	"author": "Kratos Team",
 	"author_email": "kratos@listas.cimne.upc.edu",
 	"description": "KRATOS Multiphysics (\"Kratos\") is a framework for building parallel, multi-disciplinary simulation software, aiming at modularity, extensibility, and high performance. Kratos is written in C++, and counts with an extensive Python interface.",
-	"readme": "scripts/wheels/README.md"
+	"readme": "applications/DamApplication/README.md"
 }
diff --git a/kratos/tests/test_utilities/test_laplacian_element.h b/kratos/tests/test_utilities/test_laplacian_element.h
@@ -31,7 +31,7 @@ namespace Kratos::Testing
 * @details It is designed to create a simple LHS and RHS in order to test strategies, processes. etc.... This way the common interface of the elements/conditions can be used to minimize the difference between the actual implementation and the test
 * @author Vicente Mataix Ferrandiz
 */
-class TestLaplacianElement
+class KRATOS_API(KRATOS_CORE) TestLaplacianElement
     : public Element
 {
 public:
diff --git a/scripts/wheels/build_release_linux.ps1 b/scripts/wheels/build_release_linux.ps1
@@ -1,4 +1,4 @@
-$RELEASE_BRANCH="Release-9.3.1"
+$RELEASE_BRANCH="Release-9.4.1"
 
 $HOST_SWAP="C:/data_swap_host"
 $GUEST_SWAP="/data_swap_guest"
diff --git a/scripts/wheels/build_release_windows.ps1 b/scripts/wheels/build_release_windows.ps1
@@ -1,4 +1,4 @@
-$RELEASE_BRANCH="Release-9.3.1"
+$RELEASE_BRANCH="Release-9.4.1"
 
 $HOST_SWAP="C:/data_swap_host"
 $GUEST_SWAP="C:/data_swap_guest"
diff --git a/scripts/wheels/linux/build.sh b/scripts/wheels/linux/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 PYTHONS=("cp38" "cp39" "cp310" "cp311")
-export KRATOS_VERSION="9.3.1"
+export KRATOS_VERSION="9.4.1"
 
 BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export KRATOS_ROOT="/workspace/kratos/Kratos"
diff --git a/scripts/wheels/linux/build_mpi.sh b/scripts/wheels/linux/build_mpi.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 PYTHONS=("cp38" "cp39" "cp310" "cp311")
-# PYTHONS=("cp38")
-export KRATOS_VERSION="9.3.1"
+export KRATOS_VERSION="9.4.1"
 
 BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export KRATOS_ROOT="/workspace/kratos/Kratos"
diff --git a/scripts/wheels/linux/configure.sh b/scripts/wheels/linux/configure.sh
@@ -50,7 +50,6 @@ add_app ${KRATOS_APP_DIR}/CompressiblePotentialFlowApplication;
 # add_app ${KRATOS_APP_DIR}/HDF5Application;
 add_app ${KRATOS_APP_DIR}/IgaApplication;
 add_app ${KRATOS_APP_DIR}/ChimeraApplication;
-add_app ${KRATOS_APP_DIR}/MultilevelMonteCarloApplication;
 add_app ${KRATOS_APP_DIR}/StatisticsApplication;
 add_app ${KRATOS_APP_DIR}/RomApplication;
 add_app ${KRATOS_APP_DIR}/ShallowWaterApplication;
@@ -74,6 +73,6 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
 -DBLAS_LIBRARIES="/usr/lib64/libblas.so.3"                             \
 -DINCLUDE_MMG=ON                                                       \
 -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1"               \
--DKRATOS_BUILD_TESTING=OFF                                             \
+-DKRATOS_BUILD_TESTING=ON                                              \
 -DINSTALL_RUNKRATOS=OFF                                                \
 -DKRATOS_GENERATE_PYTHON_STUBS=ON                                      \
diff --git a/scripts/wheels/linux/configure_mpi.sh b/scripts/wheels/linux/configure_mpi.sh
@@ -51,7 +51,6 @@ add_app ${KRATOS_APP_DIR}/CompressiblePotentialFlowApplication;
 # add_app ${KRATOS_APP_DIR}/HDF5Application;
 add_app ${KRATOS_APP_DIR}/IgaApplication;
 add_app ${KRATOS_APP_DIR}/ChimeraApplication;
-add_app ${KRATOS_APP_DIR}/MultilevelMonteCarloApplication;
 add_app ${KRATOS_APP_DIR}/StatisticsApplication;
 add_app ${KRATOS_APP_DIR}/RomApplication;
 add_app ${KRATOS_APP_DIR}/ShallowWaterApplication;
@@ -75,6 +74,6 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
 -DBOOST_ROOT="/workspace/boost/boost_1_71_0"                           \
 -DINCLUDE_MMG=ON                                                       \
 -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1"               \
--DKRATOS_BUILD_TESTING=OFF                                             \
+-DKRATOS_BUILD_TESTING=ON                                              \
 -DINSTALL_RUNKRATOS=OFF                                                \
 -DKRATOS_GENERATE_PYTHON_STUBS=ON                                      \
diff --git a/scripts/wheels/windows/build.ps1 b/scripts/wheels/windows/build.ps1
@@ -1,7 +1,7 @@
 param([System.String]$cotire="OFF")
 
 $pythons = "38", "39", "310", "311"
-$env:kratos_version = "9.3.1"
+$env:kratos_version = "9.4.1"
 
 $kratosRoot = "c:\kratos\kratos"
 $env:kratos_root = $kratosRoot
diff --git a/scripts/wheels/windows/configure.bat b/scripts/wheels/windows/configure.bat
@@ -41,7 +41,6 @@ CALL :add_app %KRATOS_APP_DIR%\CompressiblePotentialFlowApplication;
 CALL :add_app %KRATOS_APP_DIR%\HDF5Application;
 CALL :add_app %KRATOS_APP_DIR%\IgaApplication;
 CALL :add_app %KRATOS_APP_DIR%\ChimeraApplication;
-CALL :add_app %KRATOS_APP_DIR%\MultilevelMonteCarloApplication;
 CALL :add_app %KRATOS_APP_DIR%\StatisticsApplication;
 CALL :add_app %KRATOS_APP_DIR%\RomApplication;
 CALL :add_app %KRATOS_APP_DIR%\ShallowWaterApplication;
@@ -61,7 +60,7 @@ cmake -G"Visual Studio 16 2019" -H"%KRATOS_SOURCE%" -B"%KRATOS_BUILD%\%KRATOS_BU
 -DCMAKE_C_FLAGS="/MP24 /Gm- /Zm10"                                                          ^
 -DCMAKE_CXX_FLAGS="/MP24 /Gm- /Zm10"                                                        ^
 -DBOOST_ROOT=%BOOST_ROOT%                                                                   ^
--DKRATOS_BUILD_TESTING=OFF                                                                  ^
+-DKRATOS_BUILD_TESTING=ON                                                                   ^
 -DINSTALL_RUNKRATOS=OFF                                                                     ^
 -DHDF5_ROOT="c:\hdf5\bin"                                                                   ^
 -DKRATOS_GENERATE_PYTHON_STUBS=ON

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`"author": "Kratos Team",`
`8`	`8`	`"author_email": "[email protected]",`
`9`	`9`	`"description": "KRATOS Multiphysics (\"Kratos\") is a framework for building parallel, multi-disciplinary simulation software, aiming at modularity, extensibility, and high performance. Kratos is written in C++, and counts with an extensive Python interface.",`
`10`		`- "readme": "scripts/wheels/README.md"`
	`10`	`+ "readme": "applications/DamApplication/README.md"`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace Kratos::Testing`
`31`	`31`	`* @details It is designed to create a simple LHS and RHS in order to test strategies, processes. etc.... This way the common interface of the elements/conditions can be used to minimize the difference between the actual implementation and the test`
`32`	`32`	`* @author Vicente Mataix Ferrandiz`
`33`	`33`	`*/`
`34`		`-class TestLaplacianElement`
	`34`	`+class KRATOS_API(KRATOS_CORE) TestLaplacianElement`
`35`	`35`	`: public Element`
`36`	`36`	`{`
`37`	`37`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$RELEASE_BRANCH="Release-9.3.1"`
	`1`	`+$RELEASE_BRANCH="Release-9.4.1"`
`2`	`2`
`3`	`3`	`$HOST_SWAP="C:/data_swap_host"`
`4`	`4`	`$GUEST_SWAP="/data_swap_guest"`