diff --git a/UNICADOworkflow/src/parameter_study/prepare_resume_of_parameter_study.py b/UNICADOworkflow/src/parameter_study/prepare_resume_of_parameter_study.py
index 7cac7875347697eb1eae82b991955660f0af7ac4..fbe16c251a34d6d2e9772dd2fab47019443a1b66 100644
--- a/UNICADOworkflow/src/parameter_study/prepare_resume_of_parameter_study.py
+++ b/UNICADOworkflow/src/parameter_study/prepare_resume_of_parameter_study.py
@@ -217,18 +217,18 @@ def prepare_resume_of_parameter_study(paths_and_names, path_to_folder_old_refere
else:
abort_parameter_study_flag = True
- # check if the current element contains the string 'CPACS'
+ # check if the current element contains the string 'start'
# -> if true: -> copy aircraft exchange file to project folder
if 'start' in element:
- # copy working version of aircraft exchange file
+ # copy start version and rename it to working version of aircraft exchange file
shutil.copyfile(path_to_folder_old_reference + element,
temporary_working_directory + '/' + aircraft_project[:-4] + '/'
+ aircraft_project)
- # copy csd version of aircraft exchange file
+ # copy start version of aircraft exchange file
shutil.copyfile(path_to_folder_old_reference + element,
temporary_working_directory + '/' + aircraft_project[:-4] + '/'
- + aircraft_project[:-4] + '_startCSD.xml')
+ + aircraft_project[:-4] + '_start.xml')
else:
abort_parameter_study_flag = True
diff --git a/UNICADOworkflow/src/pre_condition/check_design_logic.py b/UNICADOworkflow/src/pre_condition/check_design_logic.py
index 05c4c28890a5582ff9b2b5ee2eaf1a53250d7a03..c2b9cb466a9a4d491d4e19c203eb4968327e3a4a 100644
--- a/UNICADOworkflow/src/pre_condition/check_design_logic.py
+++ b/UNICADOworkflow/src/pre_condition/check_design_logic.py
@@ -246,22 +246,21 @@ def check_design_logic(paths_and_names, parameter_for_design_case, control_setti
''' set design mode specific settings and perform initializing steps '''
if design_mode == 1 or design_mode == 2 or design_mode == 4:
''' set design mode specific settings '''
- # design mode 1 or 4 is selected -> check existence of _startCSD.xml file
+ # design mode 1 or 4 is selected -> set mode to clean_sheet_design
if design_mode == 1 or design_mode == 4:
program_switch = "mode_0"
- file_name = aircraft_project + '_startCSD.xml'
- check_flag_for_start_file = os.path.isfile(path_of_working_directory_rce + current_workflow_name
- + '/' + aircraft_project + '/' + file_name)
design_type = 'clean_sheet_design'
- # design mode 2 is selected -> sizing with an existing
+ # design mode 2 is selected -> set mode to sizing with an existing geometry
if design_mode == 2:
program_switch = "mode_1"
- file_name = aircraft_project + '_startRFD.xml'
- check_flag_for_start_file = os.path.isfile(path_of_working_directory_rce + current_workflow_name
- + '/' + aircraft_project + '/' + file_name)
design_type = 'retrofit_design/without_calibration'
+ ''' check existance of start file '''
+ file_name = aircraft_project + '_start.xml'
+ check_flag_for_start_file = os.path.isfile(path_of_working_directory_rce + current_workflow_name
+ + '/' + aircraft_project + '/' + file_name)
+
''' perform initializing steps '''
# append final file separator to path_to_aircraft_project if not exiting
if not path_to_aircraft_projects[-1] == '/':
diff --git a/UNICADOworkflow/src/pre_condition/set_configuration_parameter.py b/UNICADOworkflow/src/pre_condition/set_configuration_parameter.py
index 4582cf1db52db44b48b2952d62a325e5470d040e..a765e31b6feecb12a6515ed9184ce07046c0ea0f 100644
--- a/UNICADOworkflow/src/pre_condition/set_configuration_parameter.py
+++ b/UNICADOworkflow/src/pre_condition/set_configuration_parameter.py
@@ -404,7 +404,7 @@ def set_configuration_parameter(paths_and_names, global_loop_counter):
elif set_to_default_before_run:
content_list_of_project_folder = os.listdir(path_to_project)
- starting_file = aircraft_project + '_startCSD.xml'
+ starting_file = aircraft_project + '_start.xml'
cpacs_file = aircraft_project + '_CPACS.xml'
for element in content_list_of_project_folder:
# delete current file from project folder
diff --git a/UNICADOworkflow/unicado_workflow_conf.xml b/UNICADOworkflow/unicado_workflow_conf.xml
index 0363d428c92063c806e8d7f04994b0a1a5d19333..9b5db737a48c87ed3c8201845c2e8701adbebf97 100644
--- a/UNICADOworkflow/unicado_workflow_conf.xml
+++ b/UNICADOworkflow/unicado_workflow_conf.xml
@@ -1,10 +1,10 @@
<module_configuration_file Name="UNICADOworkflow Runtime Configuration.">
<control_settings description="General control settings for tool behavior.">
<aircraft_exchange_file_name description="Specify the name of the exchange file">
- <value>CSMR-2020.xml</value>
+ <value>UNICADO-SMR-180-TF.xml</value>
</aircraft_exchange_file_name>
<aircraft_exchange_file_directory description="Specify the directory in which the aircraft exchange file can be found">
- <value>../projects/CSMR/CSMR-2020/</value>
+ <value>../projects/UNICADO-SMR/UNICADO-SMR-180-TF/</value>
</aircraft_exchange_file_directory>
<own_tool_level description="Specify the tool level of this tool">
<value>1</value>
@@ -156,8 +156,8 @@
<default>30</default>
</max_number_of_iterations_before_exit>
<bridge_constraint_analyzer description="Switch to bridge the module constraint_analysis. Switch: true (Module is bridged and not executed) / false (Module is executed during iteration)">
- <value>true</value>
- <default>true</default>
+ <value>false</value>
+ <default>false</default>
</bridge_constraint_analyzer>
<damp_MTOM_during_iteration description="Switch to activate damping MTOM during iteration; Switch: true (Mean value of the last 2 MTOM values is used to suppress vibrations if necessary.) / false (Damping MTOM is deactivated)">
<value>false</value>