Skip to content

Commit a4af45f

Browse files
committed
Used std::round get integer values for number density
1 parent 7526288 commit a4af45f

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/app/calc/calculate.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ void calculate::SetSphereRadiusAndRefIndex(parameters *para, unsigned int index,
358358
if (flagVolOrConc) //If volume fraction is selected, update number density
359359
{
360360
double sphereVolume = 4.0 * M_PI *para->meanRadius * para->meanRadius * para->meanRadius / 3.0;
361-
para->sphNumDensity = 1e9 * para->volFraction /sphereVolume ;
361+
para->sphNumDensity = std::round(1e9 * para->volFraction /sphereVolume) ;
362362
}
363363
para->radArray[0] = para->meanRadius;
364364
para->numDensityArray[0] = para->sphNumDensity;
@@ -407,7 +407,7 @@ void calculate::SetSphereRadiusAndRefIndex(parameters *para, unsigned int index,
407407

408408
for (unsigned int i=0; i<para->nRadius; i++)
409409
{
410-
para->numDensityArray[i] = funcArray[i]*factor;
410+
para->numDensityArray[i] = std::round(funcArray[i]*factor);
411411
para->scatRefRealArray[i] = para->scatRefReal;
412412
para->scatRefImagArray[i] = para->scatRefImag;
413413
}

src/test/test_calculate.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include <QObject>
55
#include <QTest>
6-
76
#include "../app/parameters.h"
87
#include "../app/calc/calculate.h"
98

0 commit comments

Comments
 (0)