Commit fc271c6b authored by Pierre Aubert's avatar Pierre Aubert
Browse files

Use generic naming for naive_propagation(tmpU2, tmpV2, tmpU1, tmpV1, nbRow, nbCol,

parent c410632c
...@@ -31,11 +31,7 @@ void evaluateSaxpy(size_t nbElement){ ...@@ -31,11 +31,7 @@ void evaluateSaxpy(size_t nbElement){
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
1.0f, 1.0f, 1.0f}; 1.0f, 1.0f, 1.0f};
naive_propagation(tmpU2, tmpV2, tmpU1, tmpV1, nbRow, nbCol, micro_benchmarkAutoNsPrint("evaluate GrayScott reaction", nbElement, grayscott_propagation,
matDeltaSquare, nbStencilRow, nbStencilCol,
diffudionRateU, diffusionRateV, feedRate, killRate, dt);
micro_benchmarkAutoNsPrint("evaluate GrayScott reaction", nbElement, naive_propagation,
tmpU2, tmpV2, tmpU1, tmpV1, nbRow, nbCol, tmpU2, tmpV2, tmpU1, tmpV1, nbRow, nbCol,
matDeltaSquare, nbStencilRow, nbStencilCol, matDeltaSquare, nbStencilRow, nbStencilCol,
diffudionRateU, diffusionRateV, feedRate, killRate, dt); diffudionRateU, diffusionRateV, feedRate, killRate, dt);
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* @param killRate : rate of the process which converts V into P * @param killRate : rate of the process which converts V into P
* @param dt : time interval between two steps * @param dt : time interval between two steps
*/ */
void naive_propagation(float * outMatU, float * outMatV, const float * matU, const float * matV, long nbRow, long nbCol, void grayscott_propagation(float * outMatU, float * outMatV, const float * matU, const float * matV, long nbRow, long nbCol,
const float * matDeltaSquare, long nbStencilRow, long nbStencilCol, const float * matDeltaSquare, long nbStencilRow, long nbStencilCol,
float diffudionRateU, float diffusionRateV, float feedRate, float killRate, float dt) float diffudionRateU, float diffusionRateV, float feedRate, float killRate, float dt)
{ {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <iostream> #include <iostream>
void naive_propagation(float * outMatU, float * outMatV, const float * matU, const float * matV, long nbRow, long nbCol, void grayscott_propagation(float * outMatU, float * outMatV, const float * matU, const float * matV, long nbRow, long nbCol,
const float * matDeltaSquare, long nbStencilRow, long nbStencilCol, const float * matDeltaSquare, long nbStencilRow, long nbStencilCol,
float diffudionRateU, float diffusionRateV, float feedRate, float killRate, float dt); float diffudionRateU, float diffusionRateV, float feedRate, float killRate, float dt);
......
...@@ -79,7 +79,7 @@ bool simulateImage(size_t nbRow, size_t nbCol, size_t nbImage, size_t nbExtraSte ...@@ -79,7 +79,7 @@ bool simulateImage(size_t nbRow, size_t nbCol, size_t nbImage, size_t nbExtraSte
for(size_t i(0lu); i < nbImage; ++i){ for(size_t i(0lu); i < nbImage; ++i){
progress.print(); progress.print();
for(size_t j(0lu); j < nbExtraStep; ++j){ for(size_t j(0lu); j < nbExtraStep; ++j){
naive_propagation(tmpU2, tmpV2, tmpU1, tmpV1, nbRow, nbCol, grayscott_propagation(tmpU2, tmpV2, tmpU1, tmpV1, nbRow, nbCol,
matDeltaSquare, nbStencilRow, nbStencilCol, matDeltaSquare, nbStencilRow, nbStencilCol,
diffudionRateU, diffusionRateV, feedRate, killRate, dt); diffudionRateU, diffusionRateV, feedRate, killRate, dt);
fullMat.setRow(i, tmpV2); fullMat.setRow(i, tmpV2);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment