Revert "Updates to skip WaterKin and write inertialf as an int"

This reverts commit 23645f4.

Author: dzalkind

openfast_io/openfast_io/FAST_reader.py

@@ -3453,10 +3453,7 @@ def read_MoorDyn(self, moordyn_file):
                     if option_name.upper() == 'WATERKIN':
                         self.fst_vt['MoorDyn']['WaterKin'] = option_value.strip('"')
                         WaterKin_file = os.path.normpath(os.path.join(os.path.dirname(moordyn_file), self.fst_vt['MoorDyn']['WaterKin']))
-                        if not os.path.isfile(WaterKin_file):
-                            print(f'WaterKin file {WaterKin_file} does not exist.')
-                        else:
-                            self.read_WaterKin(WaterKin_file)
+                        self.read_WaterKin(WaterKin_file)
 
                     self.fst_vt['MoorDyn']['option_values'].append(float_read(option_value.strip('"'))) # some options values can be strings or floats
                     self.fst_vt['MoorDyn']['option_names'].append(option_name)

openfast_io/openfast_io/FAST_writer.py

@@ -250,7 +250,7 @@ def execute(self):
             self.write_MAP()
         elif self.fst_vt['Fst']['CompMooring'] == 3:
             self.write_MoorDyn()
-            if self.fst_vt['WaterKin']:
+            if 'option_names' in self.fst_vt['MoorDyn'] and 'WATERKIN' in self.fst_vt['MoorDyn']['option_names']:
                 self.write_WaterKin(os.path.join(self.FAST_runDirectory,self.fst_vt['MoorDyn']['WaterKin_file']))
 
         #     # look at if the the self.fst_vt['BeamDyn'] is an array, if so, loop through the array
@@ -2667,13 +2667,8 @@ def write_MoorDyn(self): # TODO: see TODO's in FAST_reader/read_MoorDyn.py and m
         for i in range(len(self.fst_vt['MoorDyn']['option_values'])):
 
             if 'WATERKIN' in self.fst_vt['MoorDyn']['option_names'][i]:
-                if self.fst_vt['WaterKin']:
-                    self.fst_vt['MoorDyn']['WaterKin_file'] = self.FAST_namingOut + '_WaterKin.dat'
-                    f.write('{:<22} {:<11} {:}'.format('"'+self.fst_vt['MoorDyn']['WaterKin_file']+'"', self.fst_vt['MoorDyn']['option_names'][i], self.fst_vt['MoorDyn']['option_descriptions'][i]+'\n'))
-                else:
-                    f.write('{:<22} {:<11} {:}'.format('0', self.fst_vt['MoorDyn']['option_names'][i], self.fst_vt['MoorDyn']['option_descriptions'][i]+'\n'))
-            elif self.fst_vt['MoorDyn']['option_names'][i].lower() == 'inertialf': # if inertialF, write as integer
-                f.write('{:<22d} {:<11} {:}'.format(int(self.fst_vt['MoorDyn']['option_values'][i]), self.fst_vt['MoorDyn']['option_names'][i], self.fst_vt['MoorDyn']['option_descriptions'][i]+'\n'))
+                self.fst_vt['MoorDyn']['WaterKin_file'] = self.FAST_namingOut + '_WaterKin.dat'
+                f.write('{:<22} {:<11} {:}'.format('"'+self.fst_vt['MoorDyn']['WaterKin_file']+'"', self.fst_vt['MoorDyn']['option_names'][i], self.fst_vt['MoorDyn']['option_descriptions'][i]+'\n'))
             else: # if not waterkin handle normally
                 f.write('{:<22} {:<11} {:}'.format(float_default_out(self.fst_vt['MoorDyn']['option_values'][i]), self.fst_vt['MoorDyn']['option_names'][i], self.fst_vt['MoorDyn']['option_descriptions'][i]+'\n'))