diff --git a/.github/docker_files/docker_file_ci_ubuntu_20_04/DockerFile b/.github/docker_files/docker_file_ci_ubuntu_22_04/DockerFile similarity index 96% rename from .github/docker_files/docker_file_ci_ubuntu_20_04/DockerFile rename to .github/docker_files/docker_file_ci_ubuntu_22_04/DockerFile index f7508c5a..cbc9b932 100644 --- a/.github/docker_files/docker_file_ci_ubuntu_20_04/DockerFile +++ b/.github/docker_files/docker_file_ci_ubuntu_22_04/DockerFile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:latest ENV HOME /root @@ -15,7 +15,7 @@ RUN apt-get update -y && apt-get upgrade -y && \ apt-get -y update && \ apt-get install -y \ build-essential \ - clang-11 \ + clang \ cmake \ git \ intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic \ diff --git a/.github/workflows/build_docker_images_for_ci.yml b/.github/workflows/build_docker_images_for_ci.yml index 4d1b04fd..b9ce5c38 100644 --- a/.github/workflows/build_docker_images_for_ci.yml +++ b/.github/workflows/build_docker_images_for_ci.yml @@ -6,13 +6,13 @@ on: branches: - 'master' paths: - - '.github/docker_files/docker_file_ci_ubuntu_20_04/*' + - '.github/docker_files/docker_file_ci_ubuntu_22_04/*' - '.github/workflows/build_docker_images_for_ci.yml' pull_request: branches: - 'master' paths: - - '.github/docker_files/docker_file_ci_ubuntu_20_04/*' + - '.github/docker_files/docker_file_ci_ubuntu_22_04/*' - '.github/workflows/build_docker_images_for_ci.yml' jobs: @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Build the Docker image - run: docker build . --file .github/docker_files/docker_file_ci_ubuntu_20_04/DockerFile --tag kratosmultiphysics/co-sim-io-image-ci-ubuntu-20-04 + run: docker build . --file .github/docker_files/docker_file_ci_ubuntu_22_04/DockerFile --tag kratosmultiphysics/co-sim-io-image-ci-ubuntu-22-04 - name: Docker Login uses: azure/docker-login@v1 with: @@ -31,4 +31,4 @@ jobs: - name: Publish the Docker image if: ${{ github.event_name == 'push'}} # only push the new image when the changes are merged to master - run: docker push kratosmultiphysics/co-sim-io-image-ci-ubuntu-20-04 + run: docker push kratosmultiphysics/co-sim-io-image-ci-ubuntu-22-04 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38b4b91c..b05271de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - compiler: [GCC, CLANG, ICC, ICX] + compiler: [GCC, CLANG, ICPX] mpi: [OpenMPI, IntelMPI] exclude: # CLANG is not properly supported by Intel, better use LLVMIntel in the future @@ -29,7 +29,7 @@ jobs: timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: | @@ -44,14 +44,10 @@ jobs: sudo apt-get install \ valgrind \ - clang-11 - - - name: Install legacy Intel compiler - if: ${{ matrix.compiler == 'ICC' }} - run: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + clang - name: Install Intel compiler - if: ${{ matrix.compiler == 'ICX' }} + if: ${{ matrix.compiler == 'ICPX' }} run: sudo apt-get install intel-oneapi-compiler-dpcpp-cpp - name: Install MPI @@ -68,12 +64,9 @@ jobs: export CXX=/usr/bin/g++ export CC=/usr/bin/gcc elif [ ${{ matrix.compiler }} = CLANG ]; then - export CXX=/usr/bin/clang++-11 - export CC=/usr/bin/clang-11 - elif [ ${{ matrix.compiler }} = ICC ]; then - export CXX=icpc - export CC=icc - elif [ ${{ matrix.compiler }} = ICX ]; then + export CXX=/usr/bin/clang++ + export CC=/usr/bin/clang + elif [ ${{ matrix.compiler }} = ICPX ]; then export CXX=icpx export CC=icx else @@ -81,7 +74,7 @@ jobs: exit 1 fi - if [ ${{ matrix.compiler }} = ICC ] || [ ${{ matrix.compiler }} = ICX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then + if [ ${{ matrix.compiler }} = ICPX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then source /opt/intel/oneapi/setvars.sh fi @@ -107,14 +100,14 @@ jobs: export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin export PATH=${PATH}:${GITHUB_WORKSPACE}/bin # required for IntelMPI export PATH=${PATH}:${GITHUB_WORKSPACE}/bin/tests_c_mpi # required for IntelMPI - if [ ${{ matrix.compiler }} = ICC ] || [ ${{ matrix.compiler }} = ICX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then + if [ ${{ matrix.compiler }} = ICPX ] || [ ${{ matrix.mpi }} = IntelMPI ]; then source /opt/intel/oneapi/setvars.sh fi cd build ctest -T memcheck --output-on-failure - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: failure() with: name: "CTest Log Ubuntu C++ & C (${{ matrix.compiler }}-${{ matrix.mpi }})" @@ -127,15 +120,15 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] - compiler: [GCC, ICC] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + compiler: [GCC, ICPX] timeout-minutes: 15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Intel compiler - if: ${{ matrix.compiler == 'ICC' }} + if: ${{ matrix.compiler == 'ICPX' }} run: | # see https://software.intel.com/content/www/us/en/develop/articles/installing-intel-oneapi-toolkits-via-apt.html#pkgtable cd /tmp @@ -145,7 +138,7 @@ jobs: sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" sudo apt-get update - sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic + sudo apt-get install intel-oneapi-compiler-dpcpp-cpp - name: Install MPI run: | @@ -153,7 +146,7 @@ jobs: sudo apt-get install libopenmpi-dev openmpi-bin - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -170,7 +163,7 @@ jobs: - name: Running tests run: | - if [ ${{ matrix.compiler }} = ICC ]; then + if [ ${{ matrix.compiler }} = ICPX ]; then source /opt/intel/oneapi/setvars.sh fi export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin @@ -181,7 +174,7 @@ jobs: - name: Running MPI tests run: | - if [ ${{ matrix.compiler }} = ICC ]; then + if [ ${{ matrix.compiler }} = ICPX ]; then source /opt/intel/oneapi/setvars.sh fi export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin @@ -198,7 +191,7 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build CoSimIO run: | @@ -221,14 +214,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] timeout-minutes: 15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -257,7 +250,7 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build CoSimIO shell: cmd @@ -297,14 +290,14 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] timeout-minutes: 15 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -325,7 +318,7 @@ jobs: -G"Visual Studio 17 2022" ^ -H"." ^ -B"build" ^ - -DCO_SIM_IO_BUILD_PYTHON=ON ^ + -DCO_SIM_IO_BUILD_PYTHON=ON ^ -DCO_SIM_IO_STRICT_COMPILER=ON || goto :error cmake --build "build" --target install -- /p:Platform=x64 || goto :error @@ -347,23 +340,25 @@ jobs: python run_python_tests.py - CentOS-7: + Rocky-8: runs-on: ubuntu-latest - name: CentOS 7 + name: Rocky 8 container: - image: kratosmultiphysics/kratos-image-ci-centos7:latest + image: kratosmultiphysics/kratos-image-ci-rocky8:latest + options: --user 1001 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build CoSimIO run: | - cmake -H"." -B"build" \ - -DCMAKE_BUILD_TYPE="Debug" \ - -DCO_SIM_IO_BUILD_C=ON \ - -DCO_SIM_IO_BUILD_PYTHON=ON \ - -DCO_SIM_IO_STRICT_COMPILER=ON + cmake -H"." -B"build" \ + -DCMAKE_BUILD_TYPE="Debug" \ + -DCO_SIM_IO_BUILD_C=ON \ + -DCO_SIM_IO_BUILD_PYTHON=ON \ + -DCO_SIM_IO_STRICT_COMPILER=ON \ + -DPYTHON_EXECUTABLE=/usr/local/bin/python3.8 cmake --build "build" --target install -- -j2 @@ -381,14 +376,14 @@ jobs: python3.8 run_python_tests.py - Ubuntu-old-CMake: + Ubuntu-minimum-CMake: runs-on: ubuntu-latest steps: - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.10 + uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '2.8.x' + cmake-version: '3.15.x' - name: Use cmake run: cmake --version @@ -398,7 +393,7 @@ jobs: sudo apt-get update sudo apt-get install libopenmpi-dev openmpi-bin - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build CoSimIO run: | diff --git a/co_sim_io/c/co_sim_io_c.h b/co_sim_io/c/co_sim_io_c.h index 221baea9..c570d746 100644 --- a/co_sim_io/c/co_sim_io_c.h +++ b/co_sim_io/c/co_sim_io_c.h @@ -35,7 +35,8 @@ enum CoSimIO_ConnectionStatus CoSimIO_DisconnectionError }; -CO_SIM_IO_NODISCARD CoSimIO_Info CoSimIO_Hello(); +CO_SIM_IO_NODISCARD CoSimIO_Info CoSimIO_Hello( + void); CO_SIM_IO_NODISCARD CoSimIO_Info CoSimIO_Connect( const CoSimIO_Info I_Settings); diff --git a/co_sim_io/c/co_sim_io_c_info.h b/co_sim_io/c/co_sim_io_c_info.h index d9cfd770..98998bd2 100644 --- a/co_sim_io/c/co_sim_io_c_info.h +++ b/co_sim_io/c/co_sim_io_c_info.h @@ -22,7 +22,7 @@ typedef struct CoSimIO_Info } CoSimIO_Info; -CO_SIM_IO_NODISCARD CoSimIO_Info CoSimIO_CreateInfo(); +CO_SIM_IO_NODISCARD CoSimIO_Info CoSimIO_CreateInfo(void); CO_SIM_IO_NODISCARD CoSimIO_Info CoSimIO_CopyInfo(const CoSimIO_Info I_Info); diff --git a/co_sim_io/sources/communication/base_socket_communication.cpp b/co_sim_io/sources/communication/base_socket_communication.cpp index a5fb6806..8f71c4c1 100644 --- a/co_sim_io/sources/communication/base_socket_communication.cpp +++ b/co_sim_io/sources/communication/base_socket_communication.cpp @@ -19,7 +19,7 @@ namespace CoSimIO { namespace Internals { template -BaseSocketCommunication::~BaseSocketCommunication() +BaseSocketCommunication::~BaseSocketCommunication() { CO_SIM_IO_TRY diff --git a/tests/co_sim_io/c/checks.h b/tests/co_sim_io/c/checks.h index 3f44e989..71622f20 100644 --- a/tests/co_sim_io/c/checks.h +++ b/tests/co_sim_io/c/checks.h @@ -17,6 +17,9 @@ #include #include + +#define COSIMIO_UNUSED(variable_name) (void)(variable_name) + #define COSIMIO_CHECK_INT_EQUAL(a, b) \ if (a != b) { \ printf("in line %d: %d is not equal to %d", __LINE__, a, b); \ diff --git a/tests/co_sim_io/c/info/test_info_bool.c b/tests/co_sim_io/c/info/test_info_bool.c index 31fd4f8b..e7d1c726 100644 --- a/tests/co_sim_io/c/info/test_info_bool.c +++ b/tests/co_sim_io/c/info/test_info_bool.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_FALSE(CoSimIO_Info_Has(info, "is_converged")); diff --git a/tests/co_sim_io/c/info/test_info_clear.c b/tests/co_sim_io/c/info/test_info_clear.c index 04c31907..a0ed4e34 100644 --- a/tests/co_sim_io/c/info/test_info_clear.c +++ b/tests/co_sim_io/c/info/test_info_clear.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_INT_EQUAL(CoSimIO_Info_Size(info), 0); diff --git a/tests/co_sim_io/c/info/test_info_copy.c b/tests/co_sim_io/c/info/test_info_copy.c index 25ce806a..43fd19e0 100644 --- a/tests/co_sim_io/c/info/test_info_copy.c +++ b/tests/co_sim_io/c/info/test_info_copy.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info, copied_info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_INT_EQUAL(CoSimIO_Info_Size(info), 0); diff --git a/tests/co_sim_io/c/info/test_info_double.c b/tests/co_sim_io/c/info/test_info_double.c index 6a3235ed..cc840c6d 100644 --- a/tests/co_sim_io/c/info/test_info_double.c +++ b/tests/co_sim_io/c/info/test_info_double.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_FALSE(CoSimIO_Info_Has(info, "tolerance")); @@ -31,6 +34,6 @@ int main() COSIMIO_CHECK_DOUBLE_EQUAL(CoSimIO_Info_GetDouble(info, "tolerance"), 0.0086); CoSimIO_FreeInfo(info); - + return 0; } diff --git a/tests/co_sim_io/c/info/test_info_erase.c b/tests/co_sim_io/c/info/test_info_erase.c index 2d211b90..e4568b09 100644 --- a/tests/co_sim_io/c/info/test_info_erase.c +++ b/tests/co_sim_io/c/info/test_info_erase.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_INT_EQUAL(CoSimIO_Info_Size(info), 0); diff --git a/tests/co_sim_io/c/info/test_info_info.c b/tests/co_sim_io/c/info/test_info_info.c index 94e77a80..d1478335 100644 --- a/tests/co_sim_io/c/info/test_info_info.c +++ b/tests/co_sim_io/c/info/test_info_info.c @@ -15,13 +15,16 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; CoSimIO_Info sub_info; CoSimIO_Info retrieved_sub_info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); sub_info = CoSimIO_CreateInfo(); diff --git a/tests/co_sim_io/c/info/test_info_int.c b/tests/co_sim_io/c/info/test_info_int.c index 91ad7250..1af2a373 100644 --- a/tests/co_sim_io/c/info/test_info_int.c +++ b/tests/co_sim_io/c/info/test_info_int.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_FALSE(CoSimIO_Info_Has(info, "echo_level")); diff --git a/tests/co_sim_io/c/info/test_info_multiple_vals.c b/tests/co_sim_io/c/info/test_info_multiple_vals.c index 8f624f85..4750741f 100644 --- a/tests/co_sim_io/c/info/test_info_multiple_vals.c +++ b/tests/co_sim_io/c/info/test_info_multiple_vals.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_INT_EQUAL(CoSimIO_Info_Size(info), 0); diff --git a/tests/co_sim_io/c/info/test_info_print.c b/tests/co_sim_io/c/info/test_info_print.c index a7dcebe6..ce7fe2b9 100644 --- a/tests/co_sim_io/c/info/test_info_print.c +++ b/tests/co_sim_io/c/info/test_info_print.c @@ -16,12 +16,15 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; char buffer[BUFSIZ]; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); CoSimIO_Info_SetInt(info, "echo_level", 6); diff --git a/tests/co_sim_io/c/info/test_info_size.c b/tests/co_sim_io/c/info/test_info_size.c index 2a1b0d0c..1d3df0d7 100644 --- a/tests/co_sim_io/c/info/test_info_size.c +++ b/tests/co_sim_io/c/info/test_info_size.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_INT_EQUAL(CoSimIO_Info_Size(info), 0); diff --git a/tests/co_sim_io/c/info/test_info_string.c b/tests/co_sim_io/c/info/test_info_string.c index 6cefb226..c8e0e1d2 100644 --- a/tests/co_sim_io/c/info/test_info_string.c +++ b/tests/co_sim_io/c/info/test_info_string.c @@ -15,11 +15,14 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info info; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + info = CoSimIO_CreateInfo(); COSIMIO_CHECK_FALSE(CoSimIO_Info_Has(info, "identifier")); diff --git a/tests/co_sim_io/c/model_part/test_model_part.c b/tests/co_sim_io/c/model_part/test_model_part.c index ff255fd9..ef524cf4 100644 --- a/tests/co_sim_io/c/model_part/test_model_part.c +++ b/tests/co_sim_io/c/model_part/test_model_part.c @@ -15,7 +15,7 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i; @@ -24,6 +24,9 @@ int main() CoSimIO_Element elem; CoSimIO_ModelPart model_part; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + model_part = CoSimIO_CreateModelPart("my_model_part"); COSIMIO_CHECK_STRING_EQUAL(CoSimIO_ModelPart_Name(model_part), "my_model_part"); diff --git a/tests/co_sim_io/c/model_part/test_model_part_create_multiple.c b/tests/co_sim_io/c/model_part/test_model_part_create_multiple.c index 4306ee19..da0fcb1d 100644 --- a/tests/co_sim_io/c/model_part/test_model_part_create_multiple.c +++ b/tests/co_sim_io/c/model_part/test_model_part_create_multiple.c @@ -15,7 +15,7 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i; @@ -37,6 +37,9 @@ int main() CoSimIO_Node node; CoSimIO_Element elem; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + model_part = CoSimIO_CreateModelPart("my_model_part"); COSIMIO_CHECK_INT_EQUAL(CoSimIO_ModelPart_NumberOfNodes(model_part), 0); diff --git a/tests/co_sim_io/c/model_part/test_model_part_element.c b/tests/co_sim_io/c/model_part/test_model_part_element.c index cf2578d4..55b861c3 100644 --- a/tests/co_sim_io/c/model_part/test_model_part_element.c +++ b/tests/co_sim_io/c/model_part/test_model_part_element.c @@ -15,7 +15,7 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i; @@ -23,6 +23,9 @@ int main() CoSimIO_Element elem_tri, elem_line, elem_point, elem_tri_by_index, elem_line_by_index, elem_point_by_index, elem_tri_by_id, elem_line_by_id, elem_point_by_id; CoSimIO_ModelPart model_part; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + model_part = CoSimIO_CreateModelPart("my_model_part"); for (i=0; i<5; ++i) { CoSimIO_ModelPart_CreateNewNode( diff --git a/tests/co_sim_io/c/model_part/test_model_part_ghost.c b/tests/co_sim_io/c/model_part/test_model_part_ghost.c index 9a095b34..2f2dd84d 100644 --- a/tests/co_sim_io/c/model_part/test_model_part_ghost.c +++ b/tests/co_sim_io/c/model_part/test_model_part_ghost.c @@ -15,7 +15,7 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i; @@ -24,6 +24,9 @@ int main() CoSimIO_Element elem; CoSimIO_ModelPart model_part; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + model_part = CoSimIO_CreateModelPart("my_model_part"); COSIMIO_CHECK_STRING_EQUAL(CoSimIO_ModelPart_Name(model_part), "my_model_part"); diff --git a/tests/co_sim_io/c/model_part/test_model_part_node.c b/tests/co_sim_io/c/model_part/test_model_part_node.c index 2039964e..929ad84f 100644 --- a/tests/co_sim_io/c/model_part/test_model_part_node.c +++ b/tests/co_sim_io/c/model_part/test_model_part_node.c @@ -15,7 +15,7 @@ #include "../checks.h" -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i; @@ -28,6 +28,9 @@ int main() double coords_2[] = {-1.0, -2.8, 0.0}; double coords_3[] = {0.0, 3.7, 39.44}; + COSIMIO_UNUSED(argc); + COSIMIO_UNUSED(argv); + model_part = CoSimIO_CreateModelPart("my_model_part"); /* the memory of the node is managed on the C++ side */ diff --git a/tests/integration_tutorials/c/connect_disconnect_a.c b/tests/integration_tutorials/c/connect_disconnect_a.c index 8f0f62ae..c5df5bcb 100644 --- a/tests/integration_tutorials/c/connect_disconnect_a.c +++ b/tests/integration_tutorials/c/connect_disconnect_a.c @@ -19,12 +19,15 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info settings, connect_info, disconnect_settings, disconnect_info; const char* connection_name; + (void)(argc); + (void)(argv); + settings = CoSimIO_CreateInfo(); CoSimIO_Info_SetString(settings, "my_name", "c_connect_disconnect_a"); CoSimIO_Info_SetString(settings, "connect_to", "c_connect_disconnect_b"); diff --git a/tests/integration_tutorials/c/connect_disconnect_b.c b/tests/integration_tutorials/c/connect_disconnect_b.c index 457ce77a..4bcad722 100644 --- a/tests/integration_tutorials/c/connect_disconnect_b.c +++ b/tests/integration_tutorials/c/connect_disconnect_b.c @@ -19,12 +19,15 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info settings, connect_info, disconnect_settings, disconnect_info; const char* connection_name; + (void)(argc); + (void)(argv); + settings = CoSimIO_CreateInfo(); CoSimIO_Info_SetString(settings, "my_name", "c_connect_disconnect_b"); CoSimIO_Info_SetString(settings, "connect_to", "c_connect_disconnect_a"); diff --git a/tests/integration_tutorials/c/data_exchange.c b/tests/integration_tutorials/c/data_exchange.c index 1934a182..f2d5a3e7 100644 --- a/tests/integration_tutorials/c/data_exchange.c +++ b/tests/integration_tutorials/c/data_exchange.c @@ -19,7 +19,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info connection_settings, connect_info, export_settings, import_settings, export_info, import_info, disconnect_settings, disconnect_info; @@ -29,6 +29,9 @@ int main() double* imported_data; int data_allocated_size = 0; + (void)(argc); + (void)(argv); + /* Creating the connection settings */ connection_settings = CoSimIO_CreateInfo(); CoSimIO_Info_SetString(connection_settings, "my_name", "c_export_data"); diff --git a/tests/integration_tutorials/c/export_data.c b/tests/integration_tutorials/c/export_data.c index b5202f98..4504b8c4 100644 --- a/tests/integration_tutorials/c/export_data.c +++ b/tests/integration_tutorials/c/export_data.c @@ -19,7 +19,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info connection_settings, connect_info, export_settings, export_info, disconnect_settings, disconnect_info; @@ -27,6 +27,9 @@ int main() int data_size = 4; double data_to_send[] = {3.14, 3.14, 3.14, 3.14}; + (void)(argc); + (void)(argv); + /* Creating the connection settings */ connection_settings = CoSimIO_CreateInfo(); CoSimIO_Info_SetString(connection_settings, "my_name", "c_export_data"); diff --git a/tests/integration_tutorials/c/export_info.c b/tests/integration_tutorials/c/export_info.c index 8a4f64e0..1db8d33b 100644 --- a/tests/integration_tutorials/c/export_info.c +++ b/tests/integration_tutorials/c/export_info.c @@ -19,12 +19,15 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info connection_settings, connect_info, info_to_export, export_info, disconnect_settings, disconnect_info; const char* connection_name; + (void)(argc); + (void)(argv); + /* Creating the connection settings */ connection_settings=CoSimIO_CreateInfo(); CoSimIO_Info_SetString(connection_settings, "my_name", "c_export_info"); diff --git a/tests/integration_tutorials/c/export_mesh.c b/tests/integration_tutorials/c/export_mesh.c index fd97e4ba..e44c14be 100644 --- a/tests/integration_tutorials/c/export_mesh.c +++ b/tests/integration_tutorials/c/export_mesh.c @@ -19,7 +19,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i,j; @@ -54,6 +54,9 @@ int main() CoSimIO_Info_SetInt(connection_settings, "echo_level", 1); CoSimIO_Info_SetString(connection_settings, "version", "1.25"); + (void)(argc); + (void)(argv); + /* Connecting using the connection settings */ connect_info = CoSimIO_Connect(connection_settings); COSIMIO_CHECK_EQUAL(CoSimIO_Info_GetInt(connect_info, "connection_status"), CoSimIO_Connected); diff --git a/tests/integration_tutorials/c/hello.c b/tests/integration_tutorials/c/hello.c index 7c45ba74..1b32cbac 100644 --- a/tests/integration_tutorials/c/hello.c +++ b/tests/integration_tutorials/c/hello.c @@ -23,12 +23,15 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info hello_info; int major_version, minor_version; + (void)(argc); + (void)(argv); + hello_info = CoSimIO_Hello(); CoSimIO_PrintInfo(stdout, hello_info); diff --git a/tests/integration_tutorials/c/import_data.c b/tests/integration_tutorials/c/import_data.c index 6eada851..6eb9373c 100644 --- a/tests/integration_tutorials/c/import_data.c +++ b/tests/integration_tutorials/c/import_data.c @@ -19,7 +19,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info connection_settings, connect_info, import_settings, import_info, disconnect_settings, disconnect_info; @@ -27,6 +27,9 @@ int main() double* data; int data_allocated_size = 0; + (void)(argc); + (void)(argv); + /* Creating the connection settings */ connection_settings=CoSimIO_CreateInfo(); CoSimIO_Info_SetString(connection_settings, "my_name", "c_import_data"); diff --git a/tests/integration_tutorials/c/import_info.c b/tests/integration_tutorials/c/import_info.c index 479cc383..408fd009 100644 --- a/tests/integration_tutorials/c/import_info.c +++ b/tests/integration_tutorials/c/import_info.c @@ -36,12 +36,15 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ CoSimIO_Info connection_settings, connect_info, export_info, imported_info, disconnect_settings, disconnect_info; const char* connection_name; + (void)(argc); + (void)(argv); + /* Creating the connection settings */ connection_settings=CoSimIO_CreateInfo(); CoSimIO_Info_SetString(connection_settings, "my_name", "c_import_info"); diff --git a/tests/integration_tutorials/c/import_mesh.c b/tests/integration_tutorials/c/import_mesh.c index c04dac95..26895036 100644 --- a/tests/integration_tutorials/c/import_mesh.c +++ b/tests/integration_tutorials/c/import_mesh.c @@ -25,7 +25,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i, j; @@ -53,6 +53,9 @@ int main() int expected_number_of_elements = 4; + (void)(argc); + (void)(argv); + /* Creating the connection settings */ connection_settings=CoSimIO_CreateInfo(); CoSimIO_Info_SetString(connection_settings, "my_name", "c_import_mesh"); diff --git a/tests/integration_tutorials/c/mesh_exchange.c b/tests/integration_tutorials/c/mesh_exchange.c index a196f0de..3647679d 100644 --- a/tests/integration_tutorials/c/mesh_exchange.c +++ b/tests/integration_tutorials/c/mesh_exchange.c @@ -25,7 +25,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { /* declaring variables */ int i,j; @@ -63,6 +63,9 @@ int main() CoSimIO_Info_SetInt(connection_settings, "echo_level", 1); CoSimIO_Info_SetString(connection_settings, "version", "1.25"); + (void)(argc); + (void)(argv); + /* Connecting using the connection settings */ connect_info = CoSimIO_Connect(connection_settings); COSIMIO_CHECK_EQUAL_INT(CoSimIO_Info_GetInt(connect_info, "connection_status"), CoSimIO_Connected); diff --git a/tests/integration_tutorials/cpp/connect_disconnect_a.cpp b/tests/integration_tutorials/cpp/connect_disconnect_a.cpp index 78410d2e..aaaea42f 100644 --- a/tests/integration_tutorials/cpp/connect_disconnect_a.cpp +++ b/tests/integration_tutorials/cpp/connect_disconnect_a.cpp @@ -20,7 +20,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_connect_disconnect_a"); @@ -29,6 +29,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/connect_disconnect_b.cpp b/tests/integration_tutorials/cpp/connect_disconnect_b.cpp index 88563d52..5b21006f 100644 --- a/tests/integration_tutorials/cpp/connect_disconnect_b.cpp +++ b/tests/integration_tutorials/cpp/connect_disconnect_b.cpp @@ -20,7 +20,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_connect_disconnect_b"); @@ -29,6 +29,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/data_exchange.cpp b/tests/integration_tutorials/cpp/data_exchange.cpp index e0f7360a..f4d48a17 100644 --- a/tests/integration_tutorials/cpp/data_exchange.cpp +++ b/tests/integration_tutorials/cpp/data_exchange.cpp @@ -23,13 +23,16 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "my_code"); settings.Set("connect_to", "Kratos"); settings.Set("echo_level", 1); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/export_data.cpp b/tests/integration_tutorials/cpp/export_data.cpp index 442b500a..5ddb63c5 100644 --- a/tests/integration_tutorials/cpp/export_data.cpp +++ b/tests/integration_tutorials/cpp/export_data.cpp @@ -20,7 +20,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_export_solver"); @@ -28,6 +28,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/export_info.cpp b/tests/integration_tutorials/cpp/export_info.cpp index 4e1f97ac..e9f3dd64 100644 --- a/tests/integration_tutorials/cpp/export_info.cpp +++ b/tests/integration_tutorials/cpp/export_info.cpp @@ -20,7 +20,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_export_info_solver"); @@ -28,6 +28,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/export_mesh.cpp b/tests/integration_tutorials/cpp/export_mesh.cpp index d683059d..3cedbf19 100644 --- a/tests/integration_tutorials/cpp/export_mesh.cpp +++ b/tests/integration_tutorials/cpp/export_mesh.cpp @@ -24,7 +24,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_mesh_export_solver"); @@ -32,6 +32,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/hello.cpp b/tests/integration_tutorials/cpp/hello.cpp index 39d091ec..83cc4013 100644 --- a/tests/integration_tutorials/cpp/hello.cpp +++ b/tests/integration_tutorials/cpp/hello.cpp @@ -20,10 +20,13 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { auto info = CoSimIO::Hello(); + (void)(argc); + (void)(argv); + std::cout << info << std::endl; int major_version = info.Get("major_version"); diff --git a/tests/integration_tutorials/cpp/import_data.cpp b/tests/integration_tutorials/cpp/import_data.cpp index be0e1159..1771ecf0 100644 --- a/tests/integration_tutorials/cpp/import_data.cpp +++ b/tests/integration_tutorials/cpp/import_data.cpp @@ -20,7 +20,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_import_solver"); @@ -28,6 +28,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/import_info.cpp b/tests/integration_tutorials/cpp/import_info.cpp index fe64abb8..62bb4694 100644 --- a/tests/integration_tutorials/cpp/import_info.cpp +++ b/tests/integration_tutorials/cpp/import_info.cpp @@ -20,7 +20,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_import_info_solver"); @@ -28,6 +28,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/import_mesh.cpp b/tests/integration_tutorials/cpp/import_mesh.cpp index 213941a5..5b979665 100644 --- a/tests/integration_tutorials/cpp/import_mesh.cpp +++ b/tests/integration_tutorials/cpp/import_mesh.cpp @@ -24,7 +24,7 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_mesh_import_solver"); @@ -32,6 +32,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/mesh_exchange.cpp b/tests/integration_tutorials/cpp/mesh_exchange.cpp index cb88b73a..4ae7822a 100644 --- a/tests/integration_tutorials/cpp/mesh_exchange.cpp +++ b/tests/integration_tutorials/cpp/mesh_exchange.cpp @@ -23,13 +23,16 @@ return 1; \ } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "my_code"); settings.Set("connect_to", "Kratos"); settings.Set("echo_level", 1); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); const std::string connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/run.cpp b/tests/integration_tutorials/cpp/run.cpp index ee6e2d04..6bbcd11f 100644 --- a/tests/integration_tutorials/cpp/run.cpp +++ b/tests/integration_tutorials/cpp/run.cpp @@ -135,7 +135,7 @@ CoSimIO::Info ExportMesh(const CoSimIO::Info& I_Info) } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_run"); @@ -143,6 +143,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_EQUAL(info.Get("connection_status"), CoSimIO::ConnectionStatus::Connected); s_connection_name = info.Get("connection_name"); diff --git a/tests/integration_tutorials/cpp/runner.cpp b/tests/integration_tutorials/cpp/runner.cpp index d57df6a0..f85a9ce7 100644 --- a/tests/integration_tutorials/cpp/runner.cpp +++ b/tests/integration_tutorials/cpp/runner.cpp @@ -67,7 +67,7 @@ bool ControlOtherCode(const std::string& I_FunctionName) return check_info.Get("name_for_check") == I_FunctionName; } -int main() +int main(int argc, const char** argv) { CoSimIO::Info settings; settings.Set("my_name", "cpp_runner"); @@ -75,6 +75,9 @@ int main() settings.Set("echo_level", 1); settings.Set("version", "1.25"); + (void)(argc); + (void)(argv); + auto info = CoSimIO::Connect(settings); COSIMIO_CHECK_TRUE(info.Get("connection_status") == CoSimIO::ConnectionStatus::Connected); s_connection_name = info.Get("connection_name");