Merge pull request #1 from ameliajo/master

Pull in Amelia's changes
njoy · May 6, 2020 · 88b8b43 · 88b8b43
2 parents c8bdc4c + 402c7c2
commit 88b8b43
Show file tree

Hide file tree

Showing 89 changed files with 3,816 additions and 2,470 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "dependencies/catch-adapter"]
 	path = dependencies/catch-adapter
 	url = https://github.com/njoy/catch-adapter.git
-[submodule "dependencies/eigen-adapter"]
-	path = dependencies/eigen-adapter
-	url = https://github.com/njoy/eigen-adapter.git
 [submodule "dependencies/range-v3-adapter"]
 	path = dependencies/range-v3-adapter
 	url = https://github.com/njoy/range-v3-adapter
+[submodule "dependencies/ENDFtk"]
+	path = dependencies/ENDFtk
+	url = https://github.com/njoy/ENDFtk
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/dependencies/ENDFtk b/dependencies/ENDFtk
diff --git a/dependencies/catch-adapter b/dependencies/catch-adapter
diff --git a/dependencies/eigen-adapter b/dependencies/eigen-adapter
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/_images/LEAPR_flowchart.jpg b/docs/_images/LEAPR_flowchart.jpg
diff --git a/docs/_images/U238_xs.png b/docs/_images/U238_xs.png
diff --git a/docs/_images/ZrH_phononDOS.png b/docs/_images/ZrH_phononDOS.png
diff --git a/docs/_images/ZrH_xs_mu_0p6.png b/docs/_images/ZrH_xs_mu_0p6.png
diff --git a/docs/_images/orthoVsPara.png b/docs/_images/orthoVsPara.png
diff --git a/docs/_images/scatteringBreakdown.jpeg b/docs/_images/scatteringBreakdown.jpeg
diff --git a/docs/_images/temp.png b/docs/_images/temp.png
diff --git a/docs/_images/waterPhononDOS.png b/docs/_images/waterPhononDOS.png
diff --git a/docs/_images/waterPhononDOS_hatch.png b/docs/_images/waterPhononDOS_hatch.png
diff --git a/docs/additional.rst b/docs/additional.rst