Page Menu
Home
HEPForge
Search
Configure Global Search
Log In
Files
F7876919
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
10 KB
Subscribers
None
View Options
diff --git a/.gitignore b/.gitignore
index 6067f9c..9c64549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,20 @@
*.ipynb_checkpoints
*.vscode
*path.py
*type.py
*path.hpp
*.pyc
*__pycache__*
*.so
*.run
Examples/Python/*_examplePlot.pdf
Examples/scan/*/*.dat
-*src/Rosenbrock
-*src/RKF
-*src/Interpolation
-.cosmoDat
-.axMDat
-.anFDat
*.xtx
*.aux
*.log
*.out
*.bbl
*.blg
*.synctex.gz
*MiMeS.pdf
*_minted-MiMeS*
diff --git a/Examples/Cpp/AnharmonicFactor/makefile b/Examples/Cpp/AnharmonicFactor/makefile
index d6f778e..76751db 100644
--- a/Examples/Cpp/AnharmonicFactor/makefile
+++ b/Examples/Cpp/AnharmonicFactor/makefile
@@ -1,32 +1,32 @@
-include Definitions.mk
#---optimization options---#
OPT=O3 #this should be fast and safe
# OPT=O0 #this is generally 2x slower than O3
# OPT=Ofast #this is usually bit faster than O3 but can cause issues (I haven't observed any though)
CC=g++ #compiler. I use g++, and haven't tested anything else.
#c++ std lib
STD=c++17
# STD=c++11 #this should also work
PATH_INCLUDE= -I$(rootDir)
FLG= -$(OPT) -std=$(STD) $(PATH_INCLUDE) -Wall -DLONG=$(LONG)
-SPLINE_Headers=$(wildcard $(rootDir)src/Interpolation/*.hpp)
+SPLINE_Headers=$(wildcard $(rootDir)src/SimpleSplines/*.hpp)
PathHead=$(rootDir)src/misc_dir/path.hpp
AnFac_Headers=$(wildcard $(rootDir)src/AnharmonicFactor/AnharmonicFactor.hpp)
all: AnharmonicFactor.run
AnharmonicFactor.run: AnharmonicFactor.cpp $(AnFac_Headers) $(PathHead) $(SPLINE_Headers)
$(CC) -o $@ $< $(FLG)
clean:
rm -f AnharmonicFactor.run
\ No newline at end of file
diff --git a/Examples/Cpp/Axion/makefile b/Examples/Cpp/Axion/makefile
index 61d239b..db91f44 100644
--- a/Examples/Cpp/Axion/makefile
+++ b/Examples/Cpp/Axion/makefile
@@ -1,42 +1,43 @@
-include Definitions.mk
#---optimization options---#
OPT=O3 #this should be fast and safe
# OPT=O0 #this is generally 2x slower than O3
# OPT=Ofast #this is usually bit faster than O3 but can cause issues (I haven't observed any though)
CC=g++ #compiler. I use g++, and haven't tested anything else.
#c++ std lib
STD=c++17
# STD=c++11 #this should also work
PATH_INCLUDE= -I$(rootDir)
FLG= -$(OPT) -std=$(STD) $(PATH_INCLUDE) -Wall -DLONG=$(LONG) -DMETHOD=$(METHOD) -Dsolver=$(Solver)
-Ros_Headers= $(wildcard $(rootDir)src/Rosenbrock/*.hpp) $(wildcard $(rootDir)src/Rosenbrock/LU/*.hpp) $(wildcard $(rootDir)src/Rosenbrock/Jacobian/*.hpp)
-RKF_Headers= $(wildcard $(rootDir)src/RKF/*.hpp)
-SPLINE_Headers=$(wildcard $(rootDir)src/Interpolation/*.hpp)
+
+Ros_Headers= $(wildcard $(rootDir)src/NaBBODES/Rosenbrock/*.hpp) $(wildcard $(rootDir)src/NaBBODES/Rosenbrock/LU/*.hpp) $(wildcard $(rootDir)src/NaBBODES/Rosenbrock/Jacobian/*.hpp)
+RKF_Headers= $(wildcard $(rootDir)src/NaBBODES/RKF/*.hpp)
+SPLINE_Headers=$(wildcard $(rootDir)src/SimpleSplines/*.hpp)
Axion_Headers= $(wildcard $(rootDir)src/Axion/*.hpp)
PathHead=$(rootDir)src/misc_dir/path.hpp
Cosmo_Headers=$(wildcard $(rootDir)src/Cosmo/Cosmo.hpp)
AxionMisc_Headers= $(wildcard $(rootDir)src/AxionMass/AxionMass.hpp) $(wildcard $(rootDir)src/AnharmonicFactor/AnharmonicFactor.hpp)
Static_Headers= $(wildcard $(rootDir)src/static.hpp)
all: Axion.run
Axion.run: Axion.cpp\
$(Axion_Headers) $(AxionMisc_Headers) $(Cosmo_Headers)\
$(PathHead) $(Static_Headers)\
$(Ros_Headers) $(RKF_Headers) $(SPLINE_Headers)
$(CC) -o $@ $< $(FLG)
clean:
rm -f Axion.run
\ No newline at end of file
diff --git a/Examples/Cpp/AxionMass/makefile b/Examples/Cpp/AxionMass/makefile
index cf55e93..dac61b1 100644
--- a/Examples/Cpp/AxionMass/makefile
+++ b/Examples/Cpp/AxionMass/makefile
@@ -1,33 +1,33 @@
-include Definitions.mk
#---optimization options---#
OPT=O3 #this should be fast and safe
# OPT=O0 #this is generally 2x slower than O3
# OPT=Ofast #this is usually bit faster than O3 but can cause issues (I haven't observed any though)
CC=g++ #compiler. I use g++, and haven't tested anything else.
#c++ std lib
STD=c++17
# STD=c++11 #this should also work
PATH_INCLUDE= -I$(rootDir)
FLG= -$(OPT) -std=$(STD) $(PATH_INCLUDE) -Wall -DLONG=$(LONG)
-SPLINE_Headers=$(wildcard $(rootDir)src/Interpolation/*.hpp)
+SPLINE_Headers=$(wildcard $(rootDir)src/SimpleSplines/*.hpp)
PathHead=$(rootDir)src/misc_dir/path.hpp
AxionMass_Headers=$(wildcard $(rootDir)src/AxionMass/AxionMass.hpp)
all: AxionMass.run
AxionMass.run: AxionMass.cpp $(AxionMass_Headers) $(PathHead) $(SPLINE_Headers)
$(CC) -o $@ $< $(FLG)
clean:
rm -f AxionMass.run
\ No newline at end of file
diff --git a/Examples/Cpp/Cosmo/makefile b/Examples/Cpp/Cosmo/makefile
index c7d12c5..08aa5de 100644
--- a/Examples/Cpp/Cosmo/makefile
+++ b/Examples/Cpp/Cosmo/makefile
@@ -1,32 +1,32 @@
-include Definitions.mk
#---optimization options---#
OPT=O3 #this should be fast and safe
# OPT=O0 #this is generally 2x slower than O3
# OPT=Ofast #this is usually bit faster than O3 but can cause issues (I haven't observed any though)
CC=g++ #compiler. I use g++, and haven't tested anything else.
#c++ std lib
STD=c++17
# STD=c++11 #this should also work
PATH_INCLUDE=-I$(rootDir)
FLG= -$(OPT) -std=$(STD) $(PATH_INCLUDE) -Wall -DLONG=$(LONG)
-SPLINE_Headers=$(wildcard $(rootDir)src/Interpolation/*.hpp)
+SPLINE_Headers=$(wildcard $(rootDir)src/SimpleSplines/*.hpp)
PathHead=$(rootDir)src/misc_dir/path.hpp
Cosmo_Headers=$(wildcard $(rootDir)src/Cosmo/Cosmo.hpp)
all: Cosmo.run
Cosmo.run: Cosmo.cpp $(Cosmo_Headers) $(PathHead) $(SPLINE_Headers)
$(CC) -o $@ $< $(FLG)
clean:
rm -f Cosmo.run
\ No newline at end of file
diff --git a/makefile b/makefile
index fb48203..5c4e7e5 100644
--- a/makefile
+++ b/makefile
@@ -1,132 +1,132 @@
-include Definitions.mk
#---optimization options---#
OPT=O3 #this should be fast and safe
# OPT=O0 #this is generally 2x slower than O3
# OPT=Ofast #this is usually bit faster than O3 but can cause issues (I haven't observed any though)
#you can inlude more things here
PATH_INCLUDE= -I./
#compiler. I use g++, and haven't tested anything else.
CC=g++
#c++ std
STD=c++17
FLG= -$(OPT) -std=$(STD) $(PATH_INCLUDE) -Wall
-Ros_Headers= $(wildcard src/Rosenbrock/*.hpp) $(wildcard src/Rosenbrock/LU/*.hpp) $(wildcard src/Rosenbrock/Jacobian/*.hpp)
-RKF_Headers= $(wildcard src/RKF/*.hpp)
-SPLINE_Headers=$(wildcard src/Interpolation/*.hpp)
+Ros_Headers= $(wildcard src/NaBBODES/Rosenbrock/*.hpp) $(wildcard src/NaBBODES/Rosenbrock/LU/*.hpp) $(wildcard src/NaBBODES/Rosenbrock/Jacobian/*.hpp)
+RKF_Headers= $(wildcard src/NaBBODES/RKF/*.hpp)
+SPLINE_Headers=$(wildcard src/SimpleSplines/*.hpp)
Cosmo_Headers= $(wildcard src/Cosmo/Cosmo.hpp)
Cosmo_Cpp= $(wildcard src/Cosmo/Cosmo.cpp)
AxionMass_Headers= $(wildcard src/AxionMass/AxionMass.hpp)
AxionAnF_Headers= $(wildcard src/AnharmonicFactor/AnharmonicFactor.hpp)
AxionMass_Cpp= $(wildcard src/AxionMass/AxionMass.cpp)
AxionAnF_Cpp= $(wildcard src/AnharmonicFactor/AnharmonicFactor.cpp)
AxionSolve_Headers= $(wildcard src/Axion/AxionSolve.hpp)
AxionEOM_Headers= $(wildcard src/Axion/AxionEOM.hpp)
Static_Funcs= $(wildcard src/static.hpp)
all: lib exec examples
lib: lib/libCosmo.so lib/libma.so lib/libanfac.so lib/Axion_py.so
exec: check
#shared libraries that can be used from python
lib/libCosmo.so: $(Cosmo_Cpp) $(PathTypePy)\
$(Cosmo_Headers) $(SPLINE_Headers) $(Static_Funcs)
$(CC) -o $@ $< -fPIC -shared $(FLG) -DLONG=$(LONGpy)
lib/libma.so: $(AxionMass_Cpp) $(PathTypePy)\
$(AxionMass_Headers) $(SPLINE_Headers) $(Static_Funcs)
$(CC) -o $@ $< -fPIC -shared $(FLG) -DLONG=$(LONGpy)
lib/libanfac.so: $(AxionAnF_Cpp) $(PathTypePy)\
$(AxionAnF_Headers) $(SPLINE_Headers) $(Static_Funcs)
$(CC) -o $@ $< -fPIC -shared $(FLG) -DLONG=$(LONGpy)
#shared library for the evolution of the axion that can be used from python
Axion_py=$(wildcard src/Axion/Axion-py.cpp)
lib/Axion_py.so: $(Axion_py) $(PathTypePy)\
$(Cosmo_Headers) $(AxionAnF_Headers) $(AxionMass_Headers)\
$(AxionEOM_Headers) $(AxionSolve_Headers)\
$(Ros_Headers) $(RKF_Headers) $(SPLINE_Headers)\
$(Static_Funcs)
$(CC) -o $@ $< -fPIC -shared $(FLG) -DLONG=$(LONGpy) -DMETHOD=$(METHOD) -Dsolver=$(Solver)
# make the examples in Examples/Cpp
examples:
cd Examples/Cpp && $(MAKE)
#cleans whatever make all created
clean:
rm -rf $(wildcard lib/*)
rm -rf $(wildcard exec/*)
rm -rf $(wildcard Examples/Python/*_examplePlot.pdf)
rm -rf $(PathTypePy)
cd Examples/Cpp && $(MAKE) clean
cd Documentation/Tex && $(MAKE) clean
#deletes directories that configure.sh made
deepClean: clean
rm -f $(wildcard Examples/scan/*.xtx)
rm -rf lib
rm -rf exec
rm -rf src/misc_dir
##--------------------------------make checks----------------------------------------##
check: exec/AxionEOM_check.run exec/AxionSolve_check.run exec/AnharmonicFactor_check.run exec/AxionMass_check.run exec/Cosmo_check.run
Cosmo_check_cpp=$(wildcard src/Cosmo/checks/Cosmo_check.cpp)
# check anharmonic factor interpolation
exec/Cosmo_check.run: $(Cosmo_check_cpp) $(Cosmo_Headers) $(DataFiles) $(SPLINE_Headers)
$(CC) -o $@ $< $(FLG) -DLONG=$(LONG)
AnFac_check_cpp=$(wildcard src/AnharmonicFactor/checks/AnharmonicFactor_check.cpp)
# check anharmonic factor interpolation
exec/AnharmonicFactor_check.run: $(AnFac_check_cpp) $(AxionAnF_Headers)\
$(SPLINE_Headers)
$(CC) -o $@ $< $(FLG) -DLONG=$(LONG)
AxM_check_cpp=$(wildcard src/AxionMass/checks/AxionMass_check.cpp)
# check axion mass interpolation
exec/AxionMass_check.run: $(AxM_check_cpp) $(AxionMass_Headers)\
$(SPLINE_Headers)
$(CC) -o $@ $< $(FLG) -DLONG=$(LONG)
AxionEOM_check_cpp=$(wildcard src/Axion/checks/AxionEOM_check.cpp)
# check interpolations of the Axion_eom class
exec/AxionEOM_check.run: $(AxionEOM_check_cpp) $(AxionEOM_Headers)\
$(Cosmo_Headers) $(AxionAnF_Headers) $(AxionMass_Headers)\
$(DataFiles) $(Static_Funcs) $(SPLINE_Headers)
$(CC) -o $@ $< $(FLG) -DLONG=$(LONG)
AxionSolve_check_cpp=$(wildcard src/Axion/checks/AxionSolve_check.cpp)
# check interpolations of the Axion_eom class
exec/AxionSolve_check.run: $(AxionSolve_check_cpp) $(AxionSolve_Headers)\
$(Cosmo_Headers) $(AxionAnF_Headers) $(AxionMass_Headers)\
$(DataFiles) $(Static_Funcs)\
$(Ros_Headers) $(RKF_Headers) $(SPLINE_Headers)
$(CC) -o $@ $< $(FLG) -DLONG=$(LONG) -DMETHOD=$(METHOD) -Dsolver=$(Solver)
# produce the documentation pdf
doc:
cd Documentation/Tex && $(MAKE)
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Tue, Nov 19, 2:35 PM (1 d, 8 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3804766
Default Alt Text
(10 KB)
Attached To
R535 MiMeS
Event Timeline
Log In to Comment