Skip to content

Commit

Permalink
Merge pull request #133 from Milkyway-at-home/nbody_lite
Browse files Browse the repository at this point in the history
nbody lite v1.84.1
  • Loading branch information
thomasdonlon authored Oct 5, 2022
2 parents 7f44dc4 + d7da1d7 commit 78b09ec
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
4 changes: 4 additions & 0 deletions lite/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v1.84.1:
- fixed bug where multi outputs wouldn't work
- hushed the errors about the makeHistogram function

v1.84.0:
- Updated to the most current (autodiff) version of Nbody v1.84
- Can now specify the distance of the Sun from the Galactic Center
Expand Down
4 changes: 1 addition & 3 deletions make_nbody_lite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ then
rm -r build
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DNBODY_DEV_OPTIONS=OFF -DNBODY_GL=ON -DBOINC_APPLICATION=OFF -DSEPARATION=OFF -DDOUBLEPREC=ON -DNBODY_OPENMP=ON -DNBODY_OPENCL=OFF -DAUTODIFF=OFF -DAUTODIFF_LOG=OFF ../milkywayathome_client/
cmake -DCMAKE_BUILD_TYPE=Release -DNBODY_DEV_OPTIONS=ON -DNBODY_GL=ON -DBOINC_APPLICATION=OFF -DSEPARATION=OFF -DDOUBLEPREC=ON -DNBODY_OPENMP=ON -DNBODY_OPENCL=OFF -DAUTODIFF=OFF -DAUTODIFF_LOG=OFF ../milkywayathome_client/
make -j
cd ..

fi

if $package
Expand Down Expand Up @@ -64,6 +63,5 @@ then
cp -r ./milkywayathome_client/lite/. ./mwah_nbody_lite

echo "Nbody Lite: Nbody Lite successfully built"

fi

19 changes: 19 additions & 0 deletions nbody/sample_workunits/settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,25 @@ function makeBodies(ctx, potential)

end

--dummy function to avoid erorr messages
function makeHistogram()
return HistogramParams.create{
--Orphan Stream coordinate transformation angles
phi = 128.79,
theta = 54.39,
psi = 90.70,

-- ANGULAR RANGE AND NUMBER OF BINS
lambdaStart = -150,
lambdaEnd = 150,
lambdaBins = 50,

betaStart = -15,
betaEnd = 15,
betaBins = 1
}
end

assert(argSeed ~= nil, "Expected seed") -- STILL EXPECTING SEED AS INPUT FOR THE FUTURE
argSeed = 7854614814 -- -- SETTING SEED TO FIXED VALUE
prng = DSFMT.create(argSeed)
Expand Down

0 comments on commit 78b09ec

Please sign in to comment.