Merge pull request #68 from a2e-mmc/cleanup

Cleanup notebooks
a2e-mmc · Mar 24, 2023 · b20d158 · b20d158
2 parents 938870e + 05518ea
commit b20d158
Show file tree

Hide file tree

Showing 4 changed files with 356 additions and 881,894 deletions.
diff --git a/studies/FINO/fino_offshore_microscale/01_FINO_obs_readAndProcess.ipynb b/studies/FINO/fino_offshore_microscale/01_FINO_obs_readAndProcess.ipynb
@@ -33,7 +33,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from mmctools.windtools.windtools.plotting import plot_timehistory_at_height"
+    "from mmctools.plotting import plot_timehistory_at_height"
    ]
   },
   {

diff --git a/studies/FINO/fino_offshore_microscale/03_FINO_sowfa_initialAnalysisanalysis.ipynb b/studies/FINO/fino_offshore_microscale/03_FINO_sowfa_initialAnalysisanalysis.ipynb
@@ -46,8 +46,7 @@
    "source": [
     "# WL imports mmctools and windtools on LC @ livermore\n",
     "\n",
-    "from mmctools.helper_functions import theta, power_spectral_density, calc_spectra\n",
-    "from mmctools.windtools.windtools.common import calc_wind"
+    "from mmctools.helper_functions import calc_wind, theta, power_spectral_density, calc_spectra"
    ]
   },
   {
@@ -58,30 +57,11 @@
    "source": [
     "# WL imports mmctools and windtools on LC @ livermore\n",
     "\n",
-    "from mmctools.windtools.windtools.SOWFA6.postProcessing.averaging import PlanarAverages\n",
-    "from mmctools.windtools.windtools.SOWFA6.postProcessing.probes import Probe\n",
-    "from mmctools.windtools.windtools.SOWFA6.postProcessing.probeSets import ProbeSets\n",
-    "from mmctools.windtools.windtools.plotting import plot_timeheight, plot_timehistory_at_height, plot_profile, plot_spectrum\n",
-    "#from mmctools.windtools.windtools.io.vtk import readVTK"
-   ]
-  },
-  {
-   "cell_type": "raw",
-   "metadata": {},
-   "source": [
-    "from mmctools.helper_functions import theta, power_spectral_density, calc_spectra\n",
-    "from windtools.common import calc_wind"
-   ]
-  },
-  {
-   "cell_type": "raw",
-   "metadata": {},
-   "source": [
-    "from windtools.SOWFA6.postProcessing.averaging import PlanarAverages\n",
-    "from windtools.SOWFA6.postProcessing.probes import Probe\n",
-    "from windtools.SOWFA6.postProcessing.probeSets import ProbeSets\n",
-    "from windtools.plotting import plot_timeheight, plot_timehistory_at_height, plot_profile, plot_spectrum\n",
-    "from windtools.vtk import readVTK"
+    "from mmctools.windtools.SOWFA6.postProcessing.averaging import PlanarAverages\n",
+    "from mmctools.windtools.SOWFA6.postProcessing.probes import Probe\n",
+    "from mmctools.windtools.SOWFA6.postProcessing.probeSets import ProbeSets\n",
+    "from mmctools.plotting import plot_timeheight, plot_timehistory_at_height, plot_profile, plot_spectrum\n",
+    "#from mmctools.windtools.io.vtk import readVTK"
    ]
   },
   {