Merge branch 'WISDEM:develop' into develop

sora-ryu · Aug 28, 2024 · 3a25943 · 3a25943
2 parents 7f77a6f + 03b0c1f
commit 3a25943
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 26 deletions.
diff --git a/share/kestrel_install.sh b/share/kestrel_install.sh
@@ -6,23 +6,23 @@
 # ./kestrel_install.sh -h
 
 # Flags and variables; Set as required for install
-weisBranch="develop"
+weisBranch="main"
 weisRepoOverride=""
 weisDirName="weis"
 
 openfastBranch="main"
 openfastRepoOverride=""
 openfastDirName="openfast"
 
-roscoBranch="develop"
+roscoBranch="main"
 roscoRepoOverride=""
 roscoDirName="rosco"
 
-wisdemBranch="develop"
+wisdemBranch="master"
 wisdemRepoOverride=""
 wisdemDirName="wisdem"
 
-raftBranch="dev"
+raftBranch="main"
 raftRepoOverride=""
 raftDirName="raft"
 
@@ -248,7 +248,7 @@ load_modules() {
 
         module purge
 
-        for mod in conda mamba git cmake craype-x86-spr intel-oneapi-compilers intel-oneapi-mpi intel-oneapi-mkl fftw/3.3.10-intel-oneapi-mpi-intel hdf5/1.14.1-2-intel-oneapi-mpi-intel netcdf-c/4.9.2-intel-oneapi-mpi-intel petsc/3.20.4-intel-oneapi-mpi-intel
+        for mod in conda mamba git cmake craype-x86-spr intel-oneapi-compilers intel-oneapi-mpi intel-oneapi-mkl fftw/3.3.10-intel-oneapi-mpi-intel hdf5/1.14.1-2-intel-oneapi-mpi-intel netcdf-c/4.9.2-intel-oneapi-mpi-intel petsc/3.20.4-intel-oneapi-mpi-intel PrgEnv-intel
         do
                 echo "Loading $mod....."
                 module load $mod
@@ -258,9 +258,9 @@ load_modules() {
         module unload gcc
 
         # Set compiler environment variables
-        export CC=icc
-        export CXX=icpc
-        export FC=ifort
+        # export CC=icc
+        # export CXX=icpc
+        # export FC=ifort
 
     fi
 }

diff --git a/weis/visualization/appServer/app/pages/visualize_opt.py b/weis/visualization/appServer/app/pages/visualize_opt.py
@@ -33,7 +33,7 @@
 
 def read_opt_vars_per_type(input_dict):
     opt_options = {}
-    opt_type_reference = {1: 'RAFT', 2: 'OpenFAST'}     # TODO: Expand other types of optimizations
+    opt_type_reference = {1: 'RAFT', 3: 'OpenFAST'}     # TODO: Expand other types of optimizations
 
     opt_options['root_file_path'] = '/'.join(input_dict['userOptions']['output_folder'].split('/')[:-1])           # Remove the last output folder name for future path join
     opt_options['log_file_path'] = os.path.join(opt_options['root_file_path'], '/'.join(k for k in next(find_file_path_from_tree(input_dict['outputDirStructure'], input_dict['userOptions']['sql_recorder_file'])) if k not in ['dirs', 'files']))

diff --git a/weis/visualization/appServer/share/vizFileGen.py b/weis/visualization/appServer/share/vizFileGen.py
@@ -31,20 +31,21 @@ def userOptions(self):
         # Add the user options to the vizInput file
         self.vizInput['userOptions'] = {}
         # Run type
+        self.vizInput['userOptions']['optimization'] = {}
         self.vizInput['userOptions']['optimization']['status'] = self.opt_options['driver']['optimization']['flag']
 
-        if self.fname_modeling_options['driver']['Level1']['Flag']:
-            self.vizInput['userOptions']['optimization']['type'] = 1
+        if self.modeling_options['Level1']['flag']:
+            self.vizInput['userOptions']['optimization']['type'] = 1    # RAFT
 
-        elif self.fname_modeling_options['driver']['Level2']['Flag']:
-            self.vizInput['userOptions']['optimization']['type'] = 2 # not currently supported.
+        elif self.modeling_options['Level2']['flag']:
+            self.vizInput['userOptions']['optimization']['type'] = 2    # not currently supported.
             warnings.warn("Current WEIS run configuration is not supported by WEIS_Viz")
 
-        elif self.fname_modeling_options['driver']['Level3']['Flag']:
-            self.vizInput['userOptions']['optimization']['type'] = 3
+        elif self.modeling_options['Level3']['flag']:
+            self.vizInput['userOptions']['optimization']['type'] = 3    # OpenFAST, Control
 
         else:
-            self.vizInput['userOptions']['optimization']['type'] = 0
+            self.vizInput['userOptions']['optimization']['type'] = 0    # not currently supported.
             warnings.warn("Current WEIS run configuration is not supported by WEIS_Viz")
 
 
@@ -61,7 +62,7 @@ def userOptions(self):
 
     def setDefaultUserPreferencs(self):
 
-        # Set the default user preferences based on the comment above
+        # Set the default user preferences
         self.vizInput['userPreferences'] = {}
         self.vizInput['userPreferences']['openfast'] = {}
         self.vizInput['userPreferences']['openfast']['file_path'] = {}
@@ -73,18 +74,21 @@ def setDefaultUserPreferencs(self):
 
         self.vizInput['userPreferences']['openfast']['graph'] = {}
         self.vizInput['userPreferences']['openfast']['graph']['xaxis'] = 'Time'
-        self.vizInput['userPreferences']['openfast']['graph']['yaxis'] = ['Wind1VelX', 'Wind1VelY', 'Wind1VelZ']
+        self.vizInput['userPreferences']['openfast']['graph']['yaxis'] = ['Wind1VelX', 'GenPwr', 'BldPitch1', 'GenSpeed', 'PtfmPitch']
 
         self.vizInput['userPreferences']['optimization'] = {}
         self.vizInput['userPreferences']['optimization']['convergence'] = {}
-        self.vizInput['userPreferences']['optimization']['convergence']['channels'] = ['raft.pitch_period', 'floatingse.constr_draft_heel_margin', 'floating.jointdv_0', 'floating.memgrp1.outer_diameter_in']
-        self.vizInput['userPreferences']['optimization']['dlc'] = {}
-        self.vizInput['userPreferences']['optimization']['dlc']['xaxis'] = 'Wind1VelX'
-        self.vizInput['userPreferences']['optimization']['dlc']['xaxis_stat'] = 'mean'
-        self.vizInput['userPreferences']['optimization']['dlc']['yaxis'] = ['Wind1VelY', 'Wind1VelZ']
-        self.vizInput['userPreferences']['optimization']['dlc']['yaxis_stat'] = 'max'
-        self.vizInput['userPreferences']['optimization']['timeseries'] = {}
-        self.vizInput['userPreferences']['optimization']['timeseries']['channels'] = ['Wind1VelX', 'Wind1VelY', 'Wind1VelZ']
+        self.vizInput['userPreferences']['optimization']['convergence']['channels'] = ['floating.jointdv_0', 'floating.jointdv_1', 'floating.memgrp1.outer_diameter_in', 'raft.Max_PtfmPitch', 'floatingse.system_structural_mass']
+
+        # Only for OpenFAST Optimization type
+        if self.vizInput['userOptions']['optimization']['type'] == 3:
+            self.vizInput['userPreferences']['optimization']['dlc'] = {}
+            self.vizInput['userPreferences']['optimization']['dlc']['xaxis'] = 'Wind1VelX'
+            self.vizInput['userPreferences']['optimization']['dlc']['xaxis_stat'] = 'mean'
+            self.vizInput['userPreferences']['optimization']['dlc']['yaxis'] = ['Wind1VelY', 'GenSpeed', 'PtfmPitch']
+            self.vizInput['userPreferences']['optimization']['dlc']['yaxis_stat'] = 'max'
+            self.vizInput['userPreferences']['optimization']['timeseries'] = {}
+            self.vizInput['userPreferences']['optimization']['timeseries']['channels'] = ['Wind1VelX', 'GenPwr', 'BldPitch1', 'GenSpeed', 'PtfmPitch']
 
         self.vizInput['userPreferences']['wisdem'] = {}
         self.vizInput['userPreferences']['wisdem']['blade'] = {}