Revert examples 6 and 8

WISDEM · Jul 20, 2020 · 7122637 · 7122637
1 parent 877a4b2
commit 7122637
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Examples/example_06.py b/Examples/example_06.py
@@ -19,7 +19,7 @@
 from ROSCO_toolbox import utilities as ROSCO_utilities
 
 # Load yaml file 
-parameter_filename = '/Users/dzalkind/Tools/ROSCO_toolbox/Tune_Cases/IEA15MW.yaml'
+parameter_filename = 'NREL5MW_example.yaml'
 inps = yaml.safe_load(open(parameter_filename))
 path_params         = inps['path_params']
 turbine_params      = inps['turbine_params']
@@ -43,7 +43,7 @@
 
 # Run OpenFAST
 # --- May need to change fastcall if you use a non-standard command to call openfast
-fast_io.run_openfast(path_params['FAST_directory'], fastcall='openfast', fastfile=path_params['FAST_InputFile'],chdir=True)
+fast_io.run_openfast(path_params['FAST_directory'], fastcall='openfast_dev', fastfile=path_params['FAST_InputFile'],chdir=True)
 
 
 

diff --git a/Examples/example_08.py b/Examples/example_08.py
@@ -19,27 +19,27 @@
 
 # Instantiate fast_IO
 fast_io = ROSCO_utilities.FAST_IO()
-fast_plots = ROSCO_utilities.FAST_Plots()
 
 # Define openfast output filenames
 # filenames = ["../Test_Cases/5MW_Land/5MW_Land.outb"]
 
 # ---- Note: Could plot multiple cases, textfiles, and binaries...
-filenames = ["/Users/dzalkind/Tools/WISDEM/temp/OpenFAST/testing_0.outb"]
+filenames = ["../Test_Cases/5MW_Land_DLL_WTurb/5MW_Land_DLL_WTurb.out",
+            "../Test_Cases/5MW_Land_DLL_WTurb/5MW_Land_DLL_WTurb.outb"]
 
 # Load output info and data
-alldata = fast_io.load_FAST_out(filenames)
+allinfo, alldata = fast_io.load_output(filenames)
 
 # Trim time series
-for i,(data) in enumerate(alldata):
-    alldata[i] = fast_io.trim_output(data, tmin=0, tmax=630)
+for i,(info,data) in enumerate(zip(allinfo,alldata)):
+    alldata[i] = fast_io.trim_output(info, data, tmin=0, tmax=50)
 
 #  Define Plot cases 
 #  --- Comment,uncomment, create, and change these as desired...
 cases = {}
-cases['Baseline'] = ['Wind1VelX', 'BldPitch1', 'GenTq', 'GenSpeed','GenPwr','RootMyb1','TwrBsMyt','PtfmPitch']
-cases['Platform'] = ['PtfmHeave','PtfmPitch','PtfmRoll','PtfmSurge','PtfmSway','PtfmYaw']
-# cases['Rotor Performance'] = ['RtVAvgxh', 'RtTSR', 'RtAeroCp']
+cases['Baseline'] = ['Wind1VelX', 'BldPitch1', 'GenTq', 'RotSpeed']
+cases['Rotor'] = ['BldPitch1', 'GenTq', 'GenPwr']
+cases['Rotor Performance'] = ['RtVAvgxh', 'RtTSR', 'RtAeroCp']
 
 # Plot, woohoo!
-fast_plots.plot_fast_out(cases, alldata,showplot=True)
+fast_io.plot_fast_out(cases, allinfo, alldata)