deprecated / bimsim

Commit d6f53e6804ee2da717a48eecf2825f8787e9c9f5

Authored by dmayerich
1 parent 7d43100a

rts organization

Showing 15 changed files with 36 additions and 36 deletions   Show diff stats
Inline Side-by-side
colormap.h
  Show/Hide comments   View file @d6f53e6
... ... @@ -4,7 +4,7 @@
4 4 #include <string>
5 5 #include <qimage.h>
6 6 #include <qcolor.h>
7   -#include "rts/cuda_handle_error.h"
  7 +#include "rts/cuda/error.h"
8 8  
9 9  
10 10 #define BREWER_CTRL_PTS 11
... ...
dataTypes.h
  Show/Hide comments   View file @d6f53e6
... ... @@ -25,10 +25,10 @@ typedef double ptype;
25 25 typedef ptype fieldPoint;
26 26  
27 27 //hybrid GPU/CPU complex data typ
28   -#include "rts/rtsComplex.h"
29   -#include "rts/rtsVector.h"
30   -#include "rts/rtsPoint.h"
31   -#include "rts/rtsQuad.h"
  28 +#include "rts/math/complex.h"
  29 +#include "rts/math/vector.h"
  30 +#include "rts/math/point.h"
  31 +#include "rts/math/quad.h"
32 32  
33 33 typedef rts::rtsComplex<ptype> bsComplex;
34 34 typedef rts::rtsVector<ptype, 3> bsVector;
... ...
fieldslice.cu
  Show/Hide comments   View file @d6f53e6
1 1 #include "fieldslice.h"
2 2 #include "dataTypes.h"
3   -#include "rts/cuda_handle_error.h"
  3 +#include "rts/cuda/error.h"
4 4  
5 5  
6 6 __global__ void field_intensity(bsComplex* x, bsComplex* y, bsComplex* z, ptype* I, unsigned int N)
... ...
fieldslice.h
  Show/Hide comments   View file @d6f53e6
... ... @@ -5,7 +5,7 @@
5 5  
6 6 #include <string>
7 7 #include <sstream>
8   -#include "rts/rtsQuad.h"
  8 +#include "rts/math/quad.h"
9 9  
10 10 #include "scalarslice.h"
11 11  
... ...
fileout.h
  Show/Hide comments   View file @d6f53e6
... ... @@ -9,7 +9,7 @@
9 9 #include "fieldslice.h"
10 10 #include "nearfield.h"
11 11 #include "microscope.h"
12   -#include "rts/cuda_handle_error.h"
  12 +#include "rts/cuda/error.h"
13 13  
14 14 struct fileoutStruct{
15 15  
... ...
main.cpp
  Show/Hide comments   View file @d6f53e6
1 1 #include "sphere.h"
2   -#include "rts/material.h"
  2 +#include "rts/optics/material.h"
3 3 #include <vector>
4 4 //#include "rts/complex.h"
5 5  
... ... @@ -14,12 +14,12 @@ microscopeStruct* SCOPE;
14 14 #include "fileout.h"
15 15 #include "options.h"
16 16 #include "montecarlo.h"
17   -#include "rts/rtsPoint.h"
18   -#include "rts/sbessel.h"
19   -#include "rts/rtsMatrix.h"
20   -#include "rts/rtsQuaternion.h"
  17 +#include "rts/math/point.h"
  18 +#include "rts/math/spherical_bessel.h"
  19 +#include "rts/math/matrix.h"
  20 +#include "rts/math/quaternion.h"
21 21  
22   -#include "envi/rtsEnvi.h"
  22 +#include "rts/envi/envi.h"
23 23  
24 24 #include "warnings.h"
25 25  
... ...
microscope.cu
  Show/Hide comments   View file @d6f53e6
1 1 #include "microscope.h"
2 2  
3   -#include "rts/cuda_handle_error.h"
4   -#include "rts/rtsProgressBar.h"
5   -#include "rts/cuda_timer.h"
  3 +#include "rts/cuda/error.h"
  4 +#include "rts/tools/progressbar.h"
  5 +#include "rts/cuda/timer.h"
6 6 #include "dataTypes.h"
7 7 #include "colormap.h"
8 8  
... ...
montecarlo.cpp
  Show/Hide comments   View file @d6f53e6
1 1 #include "montecarlo.h"
2   -#include "rts/rtsQuaternion.h"
3   -#include "rts/rtsMatrix.h"
  2 +#include "rts/math/quaternion.h"
  3 +#include "rts/math/matrix.h"
4 4 #include <iostream>
5 5 #include <stdlib.h>
6 6 using namespace std;
... ...
nearfield.h
  Show/Hide comments   View file @d6f53e6
... ... @@ -4,7 +4,7 @@
4 4 //#include "defaults.h"
5 5 #include "fieldslice.h"
6 6 #include "montecarlo.h"
7   -#include "rts/material.h"
  7 +#include "rts/optics/material.h"
8 8 #include "sphere.h"
9 9 #include <vector>
10 10  
... ... @@ -43,7 +43,7 @@ struct nearfieldStruct
43 43 //flag for a plane wave
44 44 bool planeWave;
45 45  
46   -
  46 +
47 47  
48 48 //---------Scatterers------------
49 49  
... ... @@ -86,7 +86,7 @@ struct nearfieldStruct
86 86 //add the incident field to the sum of scattered fields
87 87 void sumUf();
88 88  
89   -
  89 +
90 90  
91 91  
92 92  
... ...
nfScalarUf.cu
  Show/Hide comments   View file @d6f53e6
1 1 #include "nearfield.h"
2   -#include "rts/sbessel.h"
3   -#include "rts/legendre.h"
  2 +#include "rts/math/spherical_bessel.h"
  3 +#include "rts/math/legendre.h"
4 4 #include <stdlib.h>
5   -#include "rts/cuda_handle_error.h"
6   -#include "rts/cuda_timer.h"
  5 +#include "rts/cuda/error.h"
  6 +#include "rts/cuda/timer.h"
7 7  
8 8  
9 9 __global__ void gpuScalarUfp(bsComplex* Uf, bsVector k, ptype kmag, bsPoint f, ptype A, bsRect ABCD, int uR, int vR)
... ...
nfScalarUs.cu
  Show/Hide comments   View file @d6f53e6
1 1 #include "nearfield.h"
2   -#include "rts/sbessel.h"
3   -#include "rts/legendre.h"
  2 +#include "rts/math/spherical_bessel.h"
  3 +#include "rts/math/legendre.h"
4 4 #include <stdlib.h>
5   -#include "rts/cuda_handle_error.h"
6   -#include "rts/cuda_timer.h"
  5 +#include "rts/cuda/error.h"
  6 +#include "rts/cuda/timer.h"
7 7  
8 8 __device__ bsComplex calc_Us(ptype kd, ptype cos_theta, int Nl, bsComplex* B)
9 9 {
... ...
nfSumUf.cu
  Show/Hide comments   View file @d6f53e6
1 1 #include "nearfield.h"
2 2 #include <stdlib.h>
3   -#include "rts/cuda_handle_error.h"
4   -#include "rts/cuda_timer.h"
  3 +#include "rts/cuda/error.h"
  4 +#include "rts/cuda/timer.h"
5 5  
6 6 __global__ void gpuScalarUsp(bsComplex* Ufx, bsComplex* Ufy, bsComplex* Ufz,
7 7 bsComplex* Ux, bsComplex* Uy, bsComplex* Uz,
... ...
options.h
  Show/Hide comments   View file @d6f53e6
1 1 //AnyOption for command-line processing
2 2 //#include "anyoption.h"
3 3  
4   -#include "rts/material.h"
  4 +#include "rts/optics/material.h"
5 5  
6 6 #include "nearfield.h"
7 7 #include "microscope.h"
... ...
scalarslice.cu
  Show/Hide comments   View file @d6f53e6
1 1 #include "scalarslice.h"
2 2  
3   -#include "rts/cuda_handle_error.h"
  3 +#include "rts/cuda/error.h"
4 4 #include "cublas_v2.h"
5   -#include "envi/rtsEnvi.h"
  5 +#include "rts/envi/envi.h"
6 6  
7 7 scalarslice::scalarslice(int x, int y)
8 8 {
... ...
sphere.cpp
  Show/Hide comments   View file @d6f53e6
1 1 #include "sphere.h"
2 2  
3   -#include "rts/rtsComplex.h"
  3 +#include "rts/math/complex.h"
4 4 #include <complex>
5 5 #include <stdlib.h>
6 6  
... ...