From d6f53e6804ee2da717a48eecf2825f8787e9c9f5 Mon Sep 17 00:00:00 2001 From: dmayerich Date: Tue, 10 Sep 2013 10:40:16 -0500 Subject: [PATCH] rts organization --- colormap.h | 2 +- dataTypes.h | 8 ++++---- fieldslice.cu | 2 +- fieldslice.h | 2 +- fileout.h | 2 +- main.cpp | 12 ++++++------ microscope.cu | 6 +++--- montecarlo.cpp | 4 ++-- nearfield.h | 6 +++--- nfScalarUf.cu | 8 ++++---- nfScalarUs.cu | 8 ++++---- nfSumUf.cu | 4 ++-- options.h | 2 +- scalarslice.cu | 4 ++-- sphere.cpp | 2 +- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/colormap.h b/colormap.h index cc68f32..17b7e34 100644 --- a/colormap.h +++ b/colormap.h @@ -4,7 +4,7 @@ #include #include #include -#include "rts/cuda_handle_error.h" +#include "rts/cuda/error.h" #define BREWER_CTRL_PTS 11 diff --git a/dataTypes.h b/dataTypes.h index 664366b..9515714 100644 --- a/dataTypes.h +++ b/dataTypes.h @@ -25,10 +25,10 @@ typedef double ptype; typedef ptype fieldPoint; //hybrid GPU/CPU complex data typ -#include "rts/rtsComplex.h" -#include "rts/rtsVector.h" -#include "rts/rtsPoint.h" -#include "rts/rtsQuad.h" +#include "rts/math/complex.h" +#include "rts/math/vector.h" +#include "rts/math/point.h" +#include "rts/math/quad.h" typedef rts::rtsComplex bsComplex; typedef rts::rtsVector bsVector; diff --git a/fieldslice.cu b/fieldslice.cu index 0981261..1b02998 100644 --- a/fieldslice.cu +++ b/fieldslice.cu @@ -1,6 +1,6 @@ #include "fieldslice.h" #include "dataTypes.h" -#include "rts/cuda_handle_error.h" +#include "rts/cuda/error.h" __global__ void field_intensity(bsComplex* x, bsComplex* y, bsComplex* z, ptype* I, unsigned int N) diff --git a/fieldslice.h b/fieldslice.h index a8c449c..d5c7bbd 100644 --- a/fieldslice.h +++ b/fieldslice.h @@ -5,7 +5,7 @@ #include #include -#include "rts/rtsQuad.h" +#include "rts/math/quad.h" #include "scalarslice.h" diff --git a/fileout.h b/fileout.h index d312e8c..efad6d8 100644 --- a/fileout.h +++ b/fileout.h @@ -9,7 +9,7 @@ #include "fieldslice.h" #include "nearfield.h" #include "microscope.h" -#include "rts/cuda_handle_error.h" +#include "rts/cuda/error.h" struct fileoutStruct{ diff --git a/main.cpp b/main.cpp index f5e80ca..4773cc0 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,5 @@ #include "sphere.h" -#include "rts/material.h" +#include "rts/optics/material.h" #include //#include "rts/complex.h" @@ -14,12 +14,12 @@ microscopeStruct* SCOPE; #include "fileout.h" #include "options.h" #include "montecarlo.h" -#include "rts/rtsPoint.h" -#include "rts/sbessel.h" -#include "rts/rtsMatrix.h" -#include "rts/rtsQuaternion.h" +#include "rts/math/point.h" +#include "rts/math/spherical_bessel.h" +#include "rts/math/matrix.h" +#include "rts/math/quaternion.h" -#include "envi/rtsEnvi.h" +#include "rts/envi/envi.h" #include "warnings.h" diff --git a/microscope.cu b/microscope.cu index 9154a5e..e6197f3 100644 --- a/microscope.cu +++ b/microscope.cu @@ -1,8 +1,8 @@ #include "microscope.h" -#include "rts/cuda_handle_error.h" -#include "rts/rtsProgressBar.h" -#include "rts/cuda_timer.h" +#include "rts/cuda/error.h" +#include "rts/tools/progressbar.h" +#include "rts/cuda/timer.h" #include "dataTypes.h" #include "colormap.h" diff --git a/montecarlo.cpp b/montecarlo.cpp index 7b9c09f..aec9aa2 100644 --- a/montecarlo.cpp +++ b/montecarlo.cpp @@ -1,6 +1,6 @@ #include "montecarlo.h" -#include "rts/rtsQuaternion.h" -#include "rts/rtsMatrix.h" +#include "rts/math/quaternion.h" +#include "rts/math/matrix.h" #include #include using namespace std; diff --git a/nearfield.h b/nearfield.h index 022fb2b..2b452df 100644 --- a/nearfield.h +++ b/nearfield.h @@ -4,7 +4,7 @@ //#include "defaults.h" #include "fieldslice.h" #include "montecarlo.h" -#include "rts/material.h" +#include "rts/optics/material.h" #include "sphere.h" #include @@ -43,7 +43,7 @@ struct nearfieldStruct //flag for a plane wave bool planeWave; - + //---------Scatterers------------ @@ -86,7 +86,7 @@ struct nearfieldStruct //add the incident field to the sum of scattered fields void sumUf(); - + diff --git a/nfScalarUf.cu b/nfScalarUf.cu index ec04ed2..6bc0724 100644 --- a/nfScalarUf.cu +++ b/nfScalarUf.cu @@ -1,9 +1,9 @@ #include "nearfield.h" -#include "rts/sbessel.h" -#include "rts/legendre.h" +#include "rts/math/spherical_bessel.h" +#include "rts/math/legendre.h" #include -#include "rts/cuda_handle_error.h" -#include "rts/cuda_timer.h" +#include "rts/cuda/error.h" +#include "rts/cuda/timer.h" __global__ void gpuScalarUfp(bsComplex* Uf, bsVector k, ptype kmag, bsPoint f, ptype A, bsRect ABCD, int uR, int vR) diff --git a/nfScalarUs.cu b/nfScalarUs.cu index 5fd380f..d1a79fc 100644 --- a/nfScalarUs.cu +++ b/nfScalarUs.cu @@ -1,9 +1,9 @@ #include "nearfield.h" -#include "rts/sbessel.h" -#include "rts/legendre.h" +#include "rts/math/spherical_bessel.h" +#include "rts/math/legendre.h" #include -#include "rts/cuda_handle_error.h" -#include "rts/cuda_timer.h" +#include "rts/cuda/error.h" +#include "rts/cuda/timer.h" __device__ bsComplex calc_Us(ptype kd, ptype cos_theta, int Nl, bsComplex* B) { diff --git a/nfSumUf.cu b/nfSumUf.cu index 97d6a0c..69b6e20 100644 --- a/nfSumUf.cu +++ b/nfSumUf.cu @@ -1,7 +1,7 @@ #include "nearfield.h" #include -#include "rts/cuda_handle_error.h" -#include "rts/cuda_timer.h" +#include "rts/cuda/error.h" +#include "rts/cuda/timer.h" __global__ void gpuScalarUsp(bsComplex* Ufx, bsComplex* Ufy, bsComplex* Ufz, bsComplex* Ux, bsComplex* Uy, bsComplex* Uz, diff --git a/options.h b/options.h index 8d76646..dfe29f5 100644 --- a/options.h +++ b/options.h @@ -1,7 +1,7 @@ //AnyOption for command-line processing //#include "anyoption.h" -#include "rts/material.h" +#include "rts/optics/material.h" #include "nearfield.h" #include "microscope.h" diff --git a/scalarslice.cu b/scalarslice.cu index d46976c..00de57e 100644 --- a/scalarslice.cu +++ b/scalarslice.cu @@ -1,8 +1,8 @@ #include "scalarslice.h" -#include "rts/cuda_handle_error.h" +#include "rts/cuda/error.h" #include "cublas_v2.h" -#include "envi/rtsEnvi.h" +#include "rts/envi/envi.h" scalarslice::scalarslice(int x, int y) { diff --git a/sphere.cpp b/sphere.cpp index be16e4b..b60c3e3 100644 --- a/sphere.cpp +++ b/sphere.cpp @@ -1,6 +1,6 @@ #include "sphere.h" -#include "rts/rtsComplex.h" +#include "rts/math/complex.h" #include #include -- libgit2 0.21.4