mode files included in output_files

wetb/hawc2/htc_file.py

@@ -110,14 +110,17 @@ class HTCFile(HTCContents, HTCDefaults):
                          ('new_htc_structure/body_eigenanalysis_file_name', 0),
                          ('new_htc_structure/constraint_output_file_name', 0),
                          ('new_htc_structure/structure_eigenanalysis_file_name', 0),
-                         ('new_htc_structure/system_eigenanalysis', 0),
-                         ('output_at_time/filename', 0),
                          ('turb_export/filename_u', 0),
                          ('turb_export/filename_v', 0),
                          ('turb_export/filename_w', 0)]:
             line = self.get(k)
             if line:
                 files.append(line[index])
+
+        if 'system_eigenanalysis' in self.new_htc_structure:
+            f = self.new_htc_structure.system_eigenanalysis[0]
+            files.append(f)
+            files.append(os.path.join(os.path.dirname(f), 'mode*.dat'))
         dataformat = self.output.get('data_format', 'hawc_ascii')
         res_filename = self.output.filename[0]
         if dataformat == "gtsdf" or dataformat == "gtsdf64":

wetb/hawc2/tests/test_files/htcfiles/test.htc

@@ -21,6 +21,7 @@ begin new_htc_structure;
   struct_inertia_output_file_name ./res_eigen/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_wsp10_wdir000_s1004_struct.dat;
   body_eigenanalysis_file_name ./res_eigen/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_wsp10_wdir000_s1004_body_eigen.dat;
   structure_eigenanalysis_file_name ./res_eigen/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_wsp10_wdir000_s1004_strc_eigen.dat;
+  system_eigenanalysis ./launcher_test/ssystem_eigenanalysis.dat;
 ;---------------------------------------------------------------------------------------------------
  begin main_body;         tower 115m
     name        tower;            

wetb/hawc2/tests/test_htc_file.py

@@ -151,6 +151,7 @@ class Test(unittest.TestCase):
                   './res_eigen/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_wsp10_wdir000_s1004_struct.dat',
                   './res_eigen/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_wsp10_wdir000_s1004_body_eigen.dat',
                   './res_eigen/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004/dlc12_wsp10_wdir000_s1004_strc_eigen.dat',
+                  './launcher_test/ssystem_eigenanalysis.dat', './launcher_test\\mode*.dat',
                   './res/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004.sel',
                   './res/dlc12_iec61400-1ed3/dlc12_wsp10_wdir000_s1004.dat',
                   './res/rotor_check_inipos',