cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed an unnecessary include from the root CMakeLists.txt

Browse Source
This commit is contained in:
jpekkila
2019-07-26 14:18:11 +03:00
parent 818893a0ea
commit b90d261e89
13 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -55,9 +55,8 @@ else ()
endif () endif ()
## Include directories ## Include directories
include_directories(.)
include_directories(include) include_directories(include)
include_directories(.) # TODO remove
include_directories(src) # TODO remove
## Subdirectories ## Subdirectories
add_subdirectory(src/core) add_subdirectory(src/core)

4
src/standalone/autotest.cc
View File

@@ -29,7 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include "config_loader.h" #include "config_loader.h"
#include "core/math_utils.h" #include "src/core/math_utils.h"
#include "model/host_forcing.h" #include "model/host_forcing.h"
#include "model/host_memory.h" #include "model/host_memory.h"
#include "model/host_timestep.h" #include "model/host_timestep.h"
@@ -37,7 +37,7 @@
#include "model/model_reduce.h" #include "model/model_reduce.h"
#include "model/model_rk3.h" #include "model/model_rk3.h"
#include "core/errchk.h" #include "src/core/errchk.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

2
src/standalone/benchmark.cc
View File

@@ -211,7 +211,7 @@ run_benchmark(void)
#if AUTO_OPTIMIZE #if AUTO_OPTIMIZE
const char* benchmark_path = "benchmark.out"; const char* benchmark_path = "benchmark.out";
#include "core/kernels/rk3_threadblock.conf" #include "src/core/kernels/rk3_threadblock.conf"
static int static int
write_result_to_file(const float& ms_per_step) write_result_to_file(const float& ms_per_step)
{ {

4
src/standalone/config_loader.cc
View File

@@ -31,8 +31,8 @@
#include <stdio.h> // print #include <stdio.h> // print
#include <string.h> // memset #include <string.h> // memset
#include "core/errchk.h" #include "src/core/errchk.h"
#include "core/math_utils.h" #include "src/core/math_utils.h"
static inline void static inline void
print(const AcMeshInfo& config) print(const AcMeshInfo& config)

4
src/standalone/main.cc
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2014-2019, Johannes Pekkilae, Miikka Vaeisalae. Copyright (C) 2014-2018, Johannes Pekkilae, Miikka Vaeisalae.
This file is part of Astaroth. This file is part of Astaroth.
@@ -28,7 +28,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "core/errchk.h" #include "src/core/errchk.h"
#include "run.h" #include "run.h"
// Write all errors from stderr to an <errorlog_name> in the current working // Write all errors from stderr to an <errorlog_name> in the current working

2
src/standalone/model/host_forcing.cc
View File

@@ -26,7 +26,7 @@
*/ */
#include "host_forcing.h" #include "host_forcing.h"
#include "core/math_utils.h" #include "src/core/math_utils.h"
// The is a wrapper for genering random numbers with a chosen system. // The is a wrapper for genering random numbers with a chosen system.
AcReal AcReal

2
src/standalone/model/host_memory.cc
View File

@@ -28,7 +28,7 @@
#include <math.h> #include <math.h>
#include "core/errchk.h" #include "src/core/errchk.h"
#define AC_GEN_STR(X) #X #define AC_GEN_STR(X) #X
const char* init_type_names[] = {AC_FOR_INIT_TYPES(AC_GEN_STR)}; const char* init_type_names[] = {AC_FOR_INIT_TYPES(AC_GEN_STR)};

4
src/standalone/model/host_timestep.cc
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2014-2019, Johannes Pekkilae, Miikka Vaeisalae. Copyright (C) 2014-2018, Johannes Pekkilae, Miikka Vaeisalae.
This file is part of Astaroth. This file is part of Astaroth.
@@ -26,7 +26,7 @@
*/ */
#include "host_timestep.h" #include "host_timestep.h"
#include "core/math_utils.h" #include "src/core/math_utils.h"
static AcReal timescale = AcReal(1.0); static AcReal timescale = AcReal(1.0);

2
src/standalone/model/model_boundconds.cc
View File

@@ -26,7 +26,7 @@
*/ */
#include "model_boundconds.h" #include "model_boundconds.h"
#include "core/errchk.h" #include "src/core/errchk.h"
void void
boundconds(const AcMeshInfo& mesh_info, ModelMesh* mesh) boundconds(const AcMeshInfo& mesh_info, ModelMesh* mesh)

2
src/standalone/model/model_diff.h
View File

@@ -25,7 +25,7 @@
* *
*/ */
#pragma once #pragma once
#include "core/errchk.h" #include "src/core/errchk.h"
typedef long double MODEL_REAL; typedef long double MODEL_REAL;

2
src/standalone/model/model_reduce.cc
View File

@@ -28,7 +28,7 @@
#include <math.h> #include <math.h>
#include "core/errchk.h" #include "src/core/errchk.h"
// Function pointer definitions // Function pointer definitions
typedef ModelScalar (*ReduceFunc)(const ModelScalar&, const ModelScalar&); typedef ModelScalar (*ReduceFunc)(const ModelScalar&, const ModelScalar&);

6
src/standalone/renderer.cc
View File

@@ -32,8 +32,8 @@
#include <string.h> // memcpy #include <string.h> // memcpy
#include "config_loader.h" #include "config_loader.h"
#include "core/errchk.h" #include "src/core/errchk.h"
#include "core/math_utils.h" #include "src/core/math_utils.h"
#include "model/host_memory.h" #include "model/host_memory.h"
#include "model/host_timestep.h" #include "model/host_timestep.h"
#include "model/model_reduce.h" #include "model/model_reduce.h"
@@ -423,7 +423,7 @@ run_renderer(void)
return 0; return 0;
} }
#else // BUILD_RT_VISUALIZATION == 0 #else // BUILD_RT_VISUALIZATION == 0
#include "core/errchk.h" #include "src/core/errchk.h"
int int
run_renderer(void) run_renderer(void)
{ {

4
src/standalone/simulation.cc
View File

@@ -27,8 +27,8 @@
#include "run.h" #include "run.h"
#include "config_loader.h" #include "config_loader.h"
#include "core/errchk.h" #include "src/core/errchk.h"
#include "core/math_utils.h" #include "src/core/math_utils.h"
#include "model/host_forcing.h" #include "model/host_forcing.h"
#include "model/host_memory.h" #include "model/host_memory.h"
#include "model/host_timestep.h" #include "model/host_timestep.h"