Code beauty fixes

CMakeLists.txt

@@ -87,6 +87,7 @@ if(USE_CXX)
     set(HEADERS_C
         includeC/sfx_data.h
     )
+    list(APPEND HEADERS_DIRS includeC/)
 
     set(SOURCES_CXX 
             srcCXX/model_base.cpp
@@ -104,6 +105,8 @@ if(USE_CXX)
             includeCXX/sfx_sheba.h
             includeCXX/sfx_call_class_func.h
         )
+        list(APPEND HEADERS_DIRS includeCU/)
+        list(APPEND HEADERS_DIRS includeCXX/)
 endif(USE_CXX)
 
 if(INCLUDE_CUDA)
@@ -149,6 +152,7 @@ endif(USE_CXX OR INCLUDE_CUDA)
 add_executable(sfx ${SOURCES})
 set_property(TARGET sfx PROPERTY LINKER_LANGUAGE Fortran)
 target_include_directories(sfx PUBLIC ${CMAKE_BINARY_DIR}/modules/)
+target_include_directories(sfx PUBLIC ${HEADERS_DIRS})
 
 if(USE_CONFIG_PARSER)
     target_link_libraries(sfx config_parser_F config_parser_CXX)

includeCU/sfx_memory_processing.cuh

 #pragma once
-#include "../includeCXX/sfx_template_parameters.h"
+#include "sfx_template_parameters.h"
 #include <cstddef>
 
 namespace memproc

includeCU/sfx_model_compute_subfunc.cuh

 #pragma once 
-#include "../includeC/sfx_data.h"
-#include "../includeCU/sfx_math.cuh"
+#include "sfx_data.h"
+#include "sfx_math.cuh"
 
 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,

includeCU/sfx_surface.cuh

 #pragma once
-#include "../includeC/sfx_data.h"
-#include "../includeCU/sfx_math.cuh"
+#include "sfx_data.h"
+#include "sfx_math.cuh"
 
 template<typename T>
 FUCNTION_DECLARATION_SPECIFIER void get_thermal_roughness(T &z0_t, T &B,

includeCXX/model_base.h

 #pragma once
 #include <cstddef>
 #include "sfx_template_parameters.h"
-#include "../includeC/sfx_data.h"
+#include "sfx_data.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 class ModelBase

includeCXX/sfx_call_class_func.h

 #pragma once
-#include "../includeC/sfx_data.h"
+#include "sfx_data.h"
 
 #ifdef __cplusplus
 extern "C" {

includeCXX/sfx_esm.h

 #pragma once
 #include "sfx_template_parameters.h"
-#include "../includeCXX/model_base.h"
-#include "../includeC/sfx_data.h"
+#include "model_base.h"
+#include "sfx_data.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 class FluxEsmBase : public ModelBase<T, memIn, memOut, RunMem>

includeCXX/sfx_sheba.h

 #pragma once
 #include "sfx_template_parameters.h"
-#include "../includeCXX/model_base.h"
-#include "../includeC/sfx_data.h"
+#include "model_base.h"
+#include "sfx_data.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 class FluxShebaBase : public ModelBase<T, memIn, memOut, RunMem>

srcC/sfx_call_cxx.c

 #include <stdlib.h>
 #include <stdio.h>
-#include "../includeCXX/sfx_call_class_func.h"
+#include "sfx_call_class_func.h"
 // #include "../includeC/sfx_call_cxx.h"
 // -------------------------------------------------------------------------- //
 

srcCU/sfx_esm.cu

 #include <cuda.h>
 #include <cuda_runtime_api.h>
 
-#include "../includeCXX/sfx_esm.h"
-#include "../includeCU/sfx_model_compute_subfunc.cuh"
-#include "../includeCU/sfx_surface.cuh"
-#include "../includeCU/sfx_memory_processing.cuh"
+#include "sfx_esm.h"
+#include "sfx_model_compute_subfunc.cuh"
+#include "sfx_surface.cuh"
+#include "sfx_memory_processing.cuh"
 
 namespace sfx_kernel
 {

srcCU/sfx_memory_processing.cu

-#include "../includeCU/sfx_memory_processing.cuh"
+#include "sfx_memory_processing.cuh"
 #include <cuda.h>
 #include <cuda_runtime_api.h>
 

srcCU/sfx_sheba.cu

 #include <cuda.h>
 #include <cuda_runtime_api.h>
 
-#include "../includeCXX/sfx_sheba.h"
-#include "../includeCU/sfx_model_compute_subfunc.cuh"
-#include "../includeCU/sfx_surface.cuh"
-#include "../includeCU/sfx_memory_processing.cuh"
+#include "sfx_sheba.h"
+#include "sfx_model_compute_subfunc.cuh"
+#include "sfx_surface.cuh"
+#include "sfx_memory_processing.cuh"
 
 namespace sfx_kernel
 {

srcCXX/model_base.cpp

-#include "../includeCXX/model_base.h"
+#include "model_base.h"
 
 #ifdef INCLUDE_CUDA
-    #include "../includeCU/sfx_memory_processing.cuh"
+    #include "sfx_memory_processing.cuh"
 #endif
-#include "../includeCXX/sfx_memory_processing.h"
+#include "sfx_memory_processing.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 ModelBase<T, memIn, memOut, RunMem>::ModelBase(sfxDataVecTypeC* sfx_in,

srcCXX/sfx_call_class_func.cpp

 #include <stdlib.h>
 #include <stdio.h>
-#include "../includeCXX/sfx_call_class_func.h"
-#include "../includeCXX/sfx_esm.h"
-#include "../includeCXX/sfx_sheba.h"
+#include "sfx_call_class_func.h"
+#include "sfx_esm.h"
+#include "sfx_sheba.h"
 #include <vector>
 
 // -------------------------------------------------------------------------- //

srcCXX/sfx_esm.cpp

 #include <iostream>
 #include <cmath>
 
-#include "../includeCXX/sfx_esm.h"
+#include "sfx_esm.h"
 #ifdef INCLUDE_CUDA
-    #include "../includeCU/sfx_memory_processing.cuh"
+    #include "sfx_memory_processing.cuh"
 #endif
 
-#include "../includeCXX/sfx_memory_processing.h"
-#include "../includeCU/sfx_surface.cuh"
-#include "../includeCU/sfx_model_compute_subfunc.cuh"
+#include "sfx_memory_processing.h"
+#include "sfx_surface.cuh"
+#include "sfx_model_compute_subfunc.cuh"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 FluxEsmBase<T, memIn, memOut, RunMem>::FluxEsmBase(sfxDataVecTypeC* sfx_in,

srcCXX/sfx_memory_processing.cpp

-#include "../includeCXX/sfx_memory_processing.h"
+#include "sfx_memory_processing.h"
 #include <cstdlib>
 #include <cstring>
 

srcCXX/sfx_sheba.cpp

 #include <iostream>
 #include <cmath>
 
-#include "../includeCXX/sfx_sheba.h"
+#include "sfx_sheba.h"
 #ifdef INCLUDE_CUDA
-    #include "../includeCU/sfx_memory_processing.cuh"
+    #include "sfx_memory_processing.cuh"
 #endif
 
-#include "../includeCXX/sfx_memory_processing.h"
-#include "../includeCU/sfx_surface.cuh"
-#include "../includeCU/sfx_model_compute_subfunc.cuh"
+#include "sfx_memory_processing.h"
+#include "sfx_surface.cuh"
+#include "sfx_model_compute_subfunc.cuh"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 FluxShebaBase<T, memIn, memOut, RunMem>::FluxShebaBase(sfxDataVecTypeC* sfx_in,