diff --git a/environment.yaml b/environment.yaml
index 4eace61b663aad23df250e38d551dc3a2c0e6fcb..defe1d48f2b71c75d8256512822eef8e5794e0bb 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -1,4 +1,4 @@
-name: anla
+name: turbulence
channels:
- defaults
- conda-forge
@@ -22,6 +22,7 @@ dependencies:
- debugpy=1.8.11=py313h46c70d0_0
- decorator=5.1.1=pyhd8ed1ab_1
- double-conversion=3.3.0=h59595ed_0
+ - et_xmlfile=1.1.0=py313h06a4308_1
- exceptiongroup=1.2.2=pyhd8ed1ab_1
- executing=2.1.0=pyhd8ed1ab_1
- expat=2.6.4=h6a678d5_0
@@ -107,8 +108,10 @@ dependencies:
- numpy=2.2.1=py313hb30382a_0
- openjpeg=2.5.3=h5fbd93e_0
- openldap=2.6.9=he970967_0
+ - openpyxl=3.1.5=py313h9c9eb82_1
- openssl=3.4.0=h7b32b05_1
- packaging=24.2=py313h06a4308_0
+ - pandas=2.2.3=py313ha87cce1_1
- parso=0.8.4=pyhd8ed1ab_1
- pcre2=10.44=hba22ea6_2
- pexpect=4.9.0=pyhd8ed1ab_1
@@ -127,7 +130,9 @@ dependencies:
- pyside6=6.8.1=py313h5f61773_0
- python=3.13.1=ha99a958_105_cp313
- python-dateutil=2.9.0post0=py313h06a4308_2
+ - python-tzdata=2023.3=pyhd3eb1b0_0
- python_abi=3.13=0_cp313
+ - pytz=2024.1=py313h06a4308_0
- pyzmq=26.2.0=py313h8e95178_3
- qt6-main=6.8.1=h588cce1_2
- readline=8.2=h5eee18b_0
diff --git a/notebooks/AIM.ipynb b/notebooks/AIM.ipynb
index c7368efd0a51d69042cdb3befe96c36facea7ab8..816eb8e9f69ea747dcb3c595f15d8f689181d33f 100644
--- a/notebooks/AIM.ipynb
+++ b/notebooks/AIM.ipynb
@@ -12,7 +12,7 @@
},
{
"cell_type": "code",
- "execution_count": 21,
+ "execution_count": 13,
"id": "d2cfeec6-5df0-4dab-810c-92f392f27d81",
"metadata": {},
"outputs": [],
@@ -22,7 +22,7 @@
},
{
"cell_type": "code",
- "execution_count": 108,
+ "execution_count": 17,
"id": "0489c76e-340e-499f-b663-96b4fc3744dd",
"metadata": {},
"outputs": [],
@@ -32,6 +32,17 @@
"import pandas as pd"
]
},
+ {
+ "cell_type": "code",
+ "execution_count": 18,
+ "id": "8122351a",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "data_path = \"../data/\"\n",
+ "output_path = \"../RESULTS_AIM/\""
+ ]
+ },
{
"cell_type": "markdown",
"id": "564390e1-8700-4182-8ee6-91c971e759a3",
@@ -48,12 +59,12 @@
},
{
"cell_type": "code",
- "execution_count": 109,
+ "execution_count": 23,
"id": "7c24e1f1-80ce-4cb9-89b2-5057cab5455f",
"metadata": {},
"outputs": [],
"source": [
- "path = (r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\Data.xlsx')\n",
+ "path = data_path + \"Data_AIM.xlsx\"\n",
"dataset = pd.read_excel(path)\n",
"u_r = pd.read_excel(path,'nr',usecols = 'D') \n",
"u_r = u_r.to_numpy()\n",
@@ -72,7 +83,7 @@
"metadata": {},
"outputs": [],
"source": [
- "path = (r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\Data.xlsx')\n",
+ "path = data_path + \"Data_AIM.xlsx\"\n",
"dataset = pd.read_excel(path)\n",
"u_rms_032 = pd.read_excel(path,'r_032',usecols = 'E') \n",
"u_rms_032 = u_rms_032.to_numpy()\n",
@@ -95,7 +106,7 @@
"metadata": {},
"outputs": [],
"source": [
- "path = (r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\Data.xlsx')\n",
+ "path = data_path + \"Data_AIM.xlsx\"\n",
"dataset = pd.read_excel(path)\n",
"u_rms_061 = pd.read_excel(path,'r_061',usecols = 'E') \n",
"u_rms_061 = u_rms_061.to_numpy()\n",
@@ -479,7 +490,7 @@
" ax.grid(alpha=0.9)\n",
"\n",
"\n",
- " plt.savefig(r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\RESULTS\\\\2A.png', dpi=1000,bbox_inches = 'tight')\n",
+ " plt.savefig(output_path+ \"2A.png\", dpi=1000,bbox_inches = 'tight')\n",
" plt.show()\n",
"\n",
"\n",
@@ -553,7 +564,7 @@
" ax.grid(alpha=0.9)\n",
"\n",
"\n",
- " plt.savefig(r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\RESULTS\\\\2B.png', dpi=1000,bbox_inches = 'tight')\n",
+ " plt.savefig(output_path+ \"2B.png\", dpi=1000,bbox_inches = 'tight')\n",
" plt.show()\n",
"\n",
"\n",
@@ -627,7 +638,7 @@
" ax.grid(alpha=0.9)\n",
"\n",
"\n",
- " plt.savefig(r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\RESULTS\\\\2C.png', dpi=1000,bbox_inches = 'tight')\n",
+ " plt.savefig(output_path+ \"2C.png\", dpi=1000,bbox_inches = 'tight')\n",
" plt.show()\n",
"\n",
"\n",
@@ -702,7 +713,7 @@
" ax.grid(alpha=0.9)\n",
"\n",
"\n",
- " plt.savefig(r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\RESULTS\\\\2D.png', dpi=1000,bbox_inches = 'tight')\n",
+ " plt.savefig(output_path+ \"2D.png\", dpi=1000,bbox_inches = 'tight')\n",
" plt.show()\n",
"\n",
"\n",
@@ -780,7 +791,7 @@
" ax.grid(alpha=0.9)\n",
"\n",
"\n",
- " plt.savefig(r'D:\\\\Jupyter_notebooks\\\\Turbulence_project\\\\RESULTS\\\\2E.png', dpi=1000,bbox_inches = 'tight')\n",
+ " plt.savefig(output_path+ \"2E.png\", dpi=1000,bbox_inches = 'tight')\n",
" plt.show()\n",
"\n",
"\n",
@@ -808,7 +819,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3 (ipykernel)",
+ "display_name": "anla",
"language": "python",
"name": "python3"
},
@@ -822,7 +833,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.8.18"
+ "version": "3.13.1"
}
},
"nbformat": 4,
diff --git a/notebooks/eggels_data_process.ipynb b/notebooks/eggels_data_process.ipynb
index 5b82caa77de5892085277f69871e522b7e5e3982..6d289625d3259a1e7bfa0a58882f1af8d0b5f760 100644
--- a/notebooks/eggels_data_process.ipynb
+++ b/notebooks/eggels_data_process.ipynb
@@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
- "execution_count": 23,
+ "execution_count": 1,
"id": "7d246949-891b-4e4c-980c-bf466c87f72b",
"metadata": {},
"outputs": [],
@@ -13,7 +13,7 @@
},
{
"cell_type": "code",
- "execution_count": 24,
+ "execution_count": 2,
"id": "a59141ef",
"metadata": {},
"outputs": [],
@@ -23,7 +23,7 @@
},
{
"cell_type": "code",
- "execution_count": 25,
+ "execution_count": 3,
"id": "f62a98f3-1af9-467f-b770-c6ca448f558d",
"metadata": {},
"outputs": [],
@@ -34,7 +34,7 @@
},
{
"cell_type": "code",
- "execution_count": 26,
+ "execution_count": 4,
"id": "87bb4241-cdf3-43e8-aa59-2c8edcd64f00",
"metadata": {},
"outputs": [],
@@ -50,7 +50,7 @@
},
{
"cell_type": "code",
- "execution_count": 27,
+ "execution_count": 5,
"id": "2c5dc529-f705-43d0-ada3-4dd1669cff2d",
"metadata": {},
"outputs": [],
@@ -61,7 +61,7 @@
},
{
"cell_type": "code",
- "execution_count": 28,
+ "execution_count": 6,
"id": "652e307a-eaf2-4d35-a8be-d3d18a294803",
"metadata": {},
"outputs": [],
@@ -75,7 +75,7 @@
},
{
"cell_type": "code",
- "execution_count": 29,
+ "execution_count": 7,
"id": "f71699df-48d0-4b22-b025-a0e838a834b8",
"metadata": {},
"outputs": [],
@@ -96,7 +96,7 @@
},
{
"cell_type": "code",
- "execution_count": 30,
+ "execution_count": 8,
"id": "02a94479-98d7-4f3b-8a37-b6a62afdc901",
"metadata": {},
"outputs": [],
@@ -109,7 +109,7 @@
},
{
"cell_type": "code",
- "execution_count": 31,
+ "execution_count": 9,
"id": "14a6e6e0-a50d-46d1-92d2-b492d585903b",
"metadata": {},
"outputs": [],
@@ -133,7 +133,7 @@
},
{
"cell_type": "code",
- "execution_count": 32,
+ "execution_count": 10,
"id": "5efc1911-e5fc-4b42-83ff-3e8281c72ffc",
"metadata": {},
"outputs": [],
@@ -170,7 +170,7 @@
},
{
"cell_type": "code",
- "execution_count": 33,
+ "execution_count": 11,
"id": "6ecc5dde-80be-4313-9338-5851ff7cc188",
"metadata": {},
"outputs": [