Skip to content
Snippets Groups Projects
Commit 147f2169 authored by 数学の武士's avatar 数学の武士
Browse files

- instead of _ for C/CXX/CUDA files

parent 12d05dcf
No related branches found
No related tags found
No related merge requests found
Pipeline #1535 failed
Showing
with 58 additions and 59 deletions
...@@ -88,29 +88,29 @@ set(HEADERS_F ...@@ -88,29 +88,29 @@ set(HEADERS_F
if(USE_CXX) if(USE_CXX)
set(SOURCES_C set(SOURCES_C
srcC/c_sfx_model_compute_flux.c srcC/c-sfx-model-compute-flux.c
) )
set(HEADERS_C set(HEADERS_C
includeC/sfx_data.h includeC/sfx-data.h
) )
list(APPEND HEADERS_DIRS includeC/) list(APPEND HEADERS_DIRS includeC/)
set(SOURCES_CXX set(SOURCES_CXX
srcCXX/model_base.cpp srcCXX/model-base.cpp
srcCXX/sfx_esm.cpp srcCXX/sfx-esm.cpp
srcCXX/sfx_sheba.cpp srcCXX/sfx-sheba.cpp
srcCXX/cxx_sfx_model_compute_flux.cpp srcCXX/cxx-sfx-model-compute-flux.cpp
) )
set(HEADERS_CXX set(HEADERS_CXX
includeCU/sfx_surface.cuh includeCU/sfx-surface.cuh
includeCU/sfx_math.cuh includeCU/sfx-math.cuh
includeCU/sfx_model_compute_subfunc.cuh includeCU/sfx-model-compute-subfunc.cuh
includeCXX/model_base.h includeCXX/model-base.h
includeCXX/sfx_esm.h includeCXX/sfx-esm.h
includeCXX/sfx_sheba.h includeCXX/sfx-sheba.h
includeCXX/cxx_sfx_model_compute_flux.h includeCXX/cxx-sfx-model-compute-flux.h
) )
list(APPEND HEADERS_DIRS includeCU/) list(APPEND HEADERS_DIRS includeCU/)
list(APPEND HEADERS_DIRS includeCXX/) list(APPEND HEADERS_DIRS includeCXX/)
...@@ -118,8 +118,8 @@ endif(USE_CXX) ...@@ -118,8 +118,8 @@ endif(USE_CXX)
if(INCLUDE_CUDA) if(INCLUDE_CUDA)
set(SOURCES_CU set(SOURCES_CU
srcCU/sfx_esm.cu srcCU/sfx-esm.cu
srcCU/sfx_sheba.cu srcCU/sfx-sheba.cu
) )
set(HEADERS_CU set(HEADERS_CU
...@@ -128,19 +128,19 @@ endif(INCLUDE_CUDA) ...@@ -128,19 +128,19 @@ endif(INCLUDE_CUDA)
if(USE_CXX OR INCLUDE_CUDA) if(USE_CXX OR INCLUDE_CUDA)
set(MEMPROC_SOURCES_CXX set(MEMPROC_SOURCES_CXX
srcCXX/sfx_memory_processing.cpp srcCXX/sfx-memory-processing.cpp
) )
set(MEMPROC_HEADERS_CXX set(MEMPROC_HEADERS_CXX
includeCXX/sfx_memory_processing.h includeCXX/sfx-memory-processing.h
includeCXX/sfx_template_parameters.h includeCXX/sfx-template-parameters.h
) )
if(INCLUDE_CUDA) if(INCLUDE_CUDA)
set(MEMPROC_SOURCES_CU set(MEMPROC_SOURCES_CU
srcCU/sfx_memory_processing.cu srcCU/sfx-memory-processing.cu
) )
set(MEMPROC_HEADERS_CU set(MEMPROC_HEADERS_CU
includeCU/sfx_memory_processing.cuh includeCU/sfx-memory-processing.cuh
) )
endif(INCLUDE_CUDA) endif(INCLUDE_CUDA)
endif(USE_CXX OR INCLUDE_CUDA) endif(USE_CXX OR INCLUDE_CUDA)
......
File moved
File moved
#pragma once #pragma once
#include "sfx_template_parameters.h" #include "sfx-template-parameters.h"
#include <cstddef> #include <cstddef>
namespace memproc namespace memproc
......
#pragma once #pragma once
#include "sfx_data.h" #include "sfx-data.h"
#include "sfx_math.cuh" #include "sfx-math.cuh"
template<typename T, class sfx_param> template<typename T, class sfx_param>
FUCNTION_DECLARATION_SPECIFIER void get_convection_lim(T &zeta_lim, T &Rib_lim, T &f_m_lim, T &f_h_lim, FUCNTION_DECLARATION_SPECIFIER void get_convection_lim(T &zeta_lim, T &Rib_lim, T &f_m_lim, T &f_h_lim,
......
#pragma once #pragma once
#include "sfx_data.h" #include "sfx-data.h"
#include "sfx_math.cuh" #include "sfx-math.cuh"
template<typename T> template<typename T>
FUCNTION_DECLARATION_SPECIFIER void get_thermal_roughness(T &z0_t, T &B, FUCNTION_DECLARATION_SPECIFIER void get_thermal_roughness(T &z0_t, T &B,
......
#pragma once #pragma once
#include "sfx_data.h" #include "sfx-data.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include "sfx_template_parameters.h" #include "sfx-template-parameters.h"
#include "sfx_data.h" #include "sfx-data.h"
template<typename T, MemType memIn, MemType memOut, MemType RunMem > template<typename T, MemType memIn, MemType memOut, MemType RunMem >
class ModelBase class ModelBase
......
#pragma once #pragma once
#include "sfx_template_parameters.h" #include "sfx-template-parameters.h"
#include "model_base.h" #include "model-base.h"
#include "sfx_data.h" #include "sfx-data.h"
template<typename T, MemType memIn, MemType memOut, MemType RunMem > template<typename T, MemType memIn, MemType memOut, MemType RunMem >
class FluxEsmBase : public ModelBase<T, memIn, memOut, RunMem> class FluxEsmBase : public ModelBase<T, memIn, memOut, RunMem>
......
#pragma once #pragma once
#include "sfx_template_parameters.h" #include "sfx-template-parameters.h"
#include <cstddef> #include <cstddef>
namespace memproc namespace memproc
......
#pragma once #pragma once
#include "sfx_template_parameters.h" #include "sfx-template-parameters.h"
#include "model_base.h" #include "model-base.h"
#include "sfx_data.h" #include "sfx-data.h"
template<typename T, MemType memIn, MemType memOut, MemType RunMem > template<typename T, MemType memIn, MemType memOut, MemType RunMem >
class FluxShebaBase : public ModelBase<T, memIn, memOut, RunMem> class FluxShebaBase : public ModelBase<T, memIn, memOut, RunMem>
......
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "cxx_sfx_model_compute_flux.h" #include "cxx-sfx-model-compute-flux.h"
// #include "../includeC/sfx_call_cxx.h"
// -------------------------------------------------------------------------- // // -------------------------------------------------------------------------- //
void c_esm_compute_flux (struct sfxDataVecTypeC* sfx, void c_esm_compute_flux (struct sfxDataVecTypeC* sfx,
......
#include <cuda.h> #include <cuda.h>
#include <cuda_runtime_api.h> #include <cuda_runtime_api.h>
#include "sfx_esm.h" #include "sfx-esm.h"
#include "sfx_model_compute_subfunc.cuh" #include "sfx-model-compute-subfunc.cuh"
#include "sfx_surface.cuh" #include "sfx-surface.cuh"
#include "sfx_memory_processing.cuh" #include "sfx-memory-processing.cuh"
namespace sfx_kernel namespace sfx_kernel
{ {
......
#include "sfx_memory_processing.cuh" #include "sfx-memory-processing.cuh"
#include <cuda.h> #include <cuda.h>
#include <cuda_runtime_api.h> #include <cuda_runtime_api.h>
......
#include <cuda.h> #include <cuda.h>
#include <cuda_runtime_api.h> #include <cuda_runtime_api.h>
#include "sfx_sheba.h" #include "sfx-sheba.h"
#include "sfx_model_compute_subfunc.cuh" #include "sfx-model-compute-subfunc.cuh"
#include "sfx_surface.cuh" #include "sfx-surface.cuh"
#include "sfx_memory_processing.cuh" #include "sfx-memory-processing.cuh"
namespace sfx_kernel namespace sfx_kernel
{ {
......
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "cxx_sfx_model_compute_flux.h" #include "cxx-sfx-model-compute-flux.h"
#include "sfx_esm.h" #include "sfx-esm.h"
#include "sfx_sheba.h" #include "sfx-sheba.h"
#include <vector> #include <vector>
// -------------------------------------------------------------------------- // // -------------------------------------------------------------------------- //
......
#include "model_base.h" #include "model-base.h"
#ifdef INCLUDE_CUDA #ifdef INCLUDE_CUDA
#include "sfx_memory_processing.cuh" #include "sfx-memory-processing.cuh"
#endif #endif
#include "sfx_memory_processing.h" #include "sfx-memory-processing.h"
template<typename T, MemType memIn, MemType memOut, MemType RunMem > template<typename T, MemType memIn, MemType memOut, MemType RunMem >
ModelBase<T, memIn, memOut, RunMem>::ModelBase(sfxDataVecTypeC* sfx_in, ModelBase<T, memIn, memOut, RunMem>::ModelBase(sfxDataVecTypeC* sfx_in,
......
#include <iostream> #include <iostream>
#include <cmath> #include <cmath>
#include "sfx_esm.h" #include "sfx-esm.h"
#ifdef INCLUDE_CUDA #ifdef INCLUDE_CUDA
#include "sfx_memory_processing.cuh" #include "sfx-memory-processing.cuh"
#endif #endif
#include "sfx_memory_processing.h" #include "sfx-memory-processing.h"
#include "sfx_surface.cuh" #include "sfx-surface.cuh"
#include "sfx_model_compute_subfunc.cuh" #include "sfx-model-compute-subfunc.cuh"
template<typename T, MemType memIn, MemType memOut, MemType RunMem > template<typename T, MemType memIn, MemType memOut, MemType RunMem >
FluxEsmBase<T, memIn, memOut, RunMem>::FluxEsmBase(sfxDataVecTypeC* sfx_in, FluxEsmBase<T, memIn, memOut, RunMem>::FluxEsmBase(sfxDataVecTypeC* sfx_in,
......
#include "sfx_memory_processing.h" #include "sfx-memory-processing.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment