Updates C++ and some unit tests (RascalSoftware#97)

alexhroom · Dec 6, 2024 · 4d08b5d · 4d08b5d
1 parent d77a550
commit 4d08b5d
Show file tree

Hide file tree

Showing 23 changed files with 1,003 additions and 2,443 deletions.
diff --git a/RATapi/examples/absorption/absorption.ipynb b/RATapi/examples/absorption/absorption.ipynb
@@ -36,7 +36,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "problem = RAT.Project(name=\"Absorption example\", calculation=\"non polarised\", model=\"custom layers\", geometry=\"substrate/liquid\", absorption=True)"
+    "problem = RAT.Project(name=\"Absorption example\", calculation=\"normal\", model=\"custom layers\", geometry=\"substrate/liquid\", absorption=True)"
    ]
   },
   {

diff --git a/RATapi/examples/absorption/absorption.py b/RATapi/examples/absorption/absorption.py
@@ -9,7 +9,7 @@ def absorption():
     """Custom layers model including absorption"""
     problem = RAT.Project(
         name="Absorption example",
-        calculation="non polarised",
+        calculation="normal",
         model="custom layers",
         geometry="substrate/liquid",
         absorption=True,

diff --git a/RATapi/examples/convert_rascal_project/convert_rascal.ipynb b/RATapi/examples/convert_rascal_project/convert_rascal.ipynb
diff --git a/RATapi/examples/domains/domains_custom_XY.ipynb b/RATapi/examples/domains/domains_custom_XY.ipynb
diff --git a/RATapi/examples/domains/domains_custom_layers.ipynb b/RATapi/examples/domains/domains_custom_layers.ipynb
diff --git a/RATapi/examples/domains/domains_standard_layers.ipynb b/RATapi/examples/domains/domains_standard_layers.ipynb
diff --git a/RATapi/examples/languages/setup_problem.py b/RATapi/examples/languages/setup_problem.py
@@ -38,7 +38,7 @@ def make_example_problem():
     # and H2O. Load these datafiles in and put them in the data block
 
     # Read in the datafiles
-    data_path = pathlib.Path("../data")
+    data_path = pathlib.Path(__file__).parents[1] / "data"
     D2O_data = np.loadtxt(data_path / "c_PLP0016596.dat", delimiter=",")
     SMW_data = np.loadtxt(data_path / "c_PLP0016601.dat", delimiter=",")
     H2O_data = np.loadtxt(data_path / "c_PLP0016607.dat", delimiter=",")

diff --git a/RATapi/examples/non_polarised/DSPC_custom_xy.ipynb b/RATapi/examples/non_polarised/DSPC_custom_xy.ipynb
diff --git a/RATapi/examples/non_polarised/DSPC_standard_layers.ipynb b/RATapi/examples/non_polarised/DSPC_standard_layers.ipynb