Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ forcing
rAnalysis/test.R
*.*.swp
*.DS_Store
/vcpkg/
/Testing/
/dist/
/build/
/.idea/
/cmake-build-debug-msys2/
28 changes: 28 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
cmake_minimum_required(VERSION 3.26)
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")
project(SHUD)

set(CMAKE_CXX_STANDARD 11)

if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(VCPKG_TARGET_TRIPLET "x64-linux" CACHE STRING "" FORCE)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(VCPKG_TARGET_TRIPLET "x64-osx" CACHE STRING "" FORCE)
endif()


set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/dist/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/dist/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/dist/bin)

find_package (OpenMP)
find_package(SUNDIALS CONFIG REQUIRED)
set(COVDE_LIB "SUNDIALS::cvode_static")

add_subdirectory(src)
enable_testing()
add_subdirectory(test)




157 changes: 0 additions & 157 deletions Makefile

This file was deleted.

51 changes: 0 additions & 51 deletions Script/installSundials.sh

This file was deleted.

55 changes: 0 additions & 55 deletions configure

This file was deleted.

25 changes: 25 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
cmake_minimum_required(VERSION 3.26)

aux_source_directory(./classes MAIN_CLASSES)
aux_source_directory(./Equations MAIN_EQUATIONS)
aux_source_directory(./Model MAIN_MODEL)
aux_source_directory(./ModelData MAIN_MODEL_DATA)

include_directories(
${CMAKE_CURRENT_BINARY_DIR}
.
classes
Equations
Model
ModelData
)


add_library(${PROJECT_NAME}_lib STATIC ${MAIN_CLASSES} ${MAIN_EQUATIONS} ${MAIN_MODEL} ${MAIN_MODEL_DATA})
target_link_libraries(${PROJECT_NAME}_lib ${COVDE_LIB} OpenMP::OpenMP_CXX)

#target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})


add_executable(${PROJECT_NAME} main.cpp )
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_lib)
2 changes: 1 addition & 1 deletion src/classes/River.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef River_hpp
#define River_hpp

#include <stdio.h>
#include <cstdio>
#include "Macros.hpp"
#include "Node.hpp"
#include "functions.hpp"
Expand Down
19 changes: 19 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
cmake_minimum_required(VERSION 3.26)
project(SHUDTest)
add_definitions(-DTestDataPath="${CMAKE_SOURCE_DIR}/")

find_package(GTest)


aux_source_directory(. SRC_LIST)

add_executable(${PROJECT_NAME}
${SRC_LIST}
)
target_link_libraries(${PROJECT_NAME}
GTest::gtest
${COVDE_LIB}
SHUD_lib
)

add_test(${PROJECT_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME} -maxwarnings 10000)
22 changes: 22 additions & 0 deletions test/TestCase.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// Created by clz on 2024/10/23.
//

#include "gtest/gtest.h"

class TestCase : public ::testing::Test {

protected:
void SetUp() override {
filePath = TestDataPath;
}
void TearDown() override {
}
public:
std::string filePath ;
};

TEST_F(TestCase, CCW) {
std::cout<<"ccw case test"<<std::endl;
}

7 changes: 7 additions & 0 deletions test/TestMain.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

#include "gtest/gtest.h"

int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
Loading