Cleanup variables.yml

.ci-scripts/variables.yml

@@ -12,8 +12,8 @@ variables:
   DIR_LIBS: "libraries"
   DIR_SUBMODULE_LIBS: "libs"
   DIR_WORKFLOWONRCE: "rce_workflow"
-  DIR_GNUPLOT: "gnuplot-linux"
-  DIR_INKSCAPE: "inkscape-linux"
+  DIR_GNUPLOT: "gnuplot-linux" # REMOVE
+  DIR_INKSCAPE: "inkscape-linux" # REMOVE
   DIR_DESIGN_EVALUATOR: "design_evaluator"
   DIR_WORKING_DIR_RCE: "workingDirectoryRCE"
   DIR_UNICADO_WORKFLOW: "UNICADOworkflow"
@@ -41,50 +41,11 @@ variables:
   PATH_WORKFLOW_INSTALL: ${CI_PROJECT_DIR}/UNICADOworkflow
 
   ## Branches to be checked out for clean repo
-  BRANCH_UNICADO: "develop"
-  BRANCH_AIRCRAFT_DESIGN: "develop"
-  BRANCH_ADDITIONAL_SOFTWARE: "develop"
-  BRANCH_LIBRARIES: "develop"
-  BRANCH_AIRCRAFT_REFERENCES: "develop"
-
-  ## List of design tools
-  ## Directory names
-  DIR_UNICADO: "UNICADO"
-  DIR_RCE: "rce"
-  DIR_PROJECTS: "projects"
-  DIR_ADDITIONAL_SOFTWARE: "utilities"
-  DIR_AIRCRAFT_REFERENCES: "aircraft_references"
-  DIR_AIRCRAFT_DESIGN: "aircraft_design"
-  DIR_LIBS: "libraries"
-  DIR_SUBMODULE_LIBS: "libs"
-  DIR_WORKFLOWONRCE: "rce_workflow"
-  DIR_GNUPLOT: "gnuplot-linux"
-  DIR_INKSCAPE: "inkscape-linux"
-  DIR_DESIGN_EVALUATOR: "design_evaluator"
-  DIR_WORKING_DIR_RCE: "workingDirectoryRCE"
-  DIR_UNICADO_WORKFLOW: "UNICADOworkflow"
-  DIR_WORKFLOW_RESULTS: "workflowResults"
-
-  ## Will later be replaced by the modified tool or tool-list
-  NAME_MODIFIED_TOOL: "propulsion_design"
-  NAME_AIRCRAFT_VERSION: "CSMR-2020"
-  NAME_AIRCRAFT_TYPE: "CSMR"
-  NAME_RCE_CONFIG_FILE: "configuration_headless.json"
-  NAME_UNICADO_WF: "UNICADOworkflow.wf"
-
-  ## Directory paths
-  PATH_LOCAL_AIRCRAFT_DESIGN: ${CI_PROJECT_DIR}
-  PATH_LOCAL_PROJECTS: ${PATH_LOCAL_AIRCRAFT_DESIGN}/${DIR_PROJECTS}
-  PATH_LOCAL_IO_DIR: ${PATH_LOCAL_PROJECTS}/${NAME_AIRCRAFT_TYPE}/${NAME_AIRCRAFT_VERSION}
-  PATH_CLEAN_AIRCRAFT_DESIGN: ${CI_PROJECT_DIR}/${DIR_UNICADO}/${DIR_AIRCRAFT_DESIGN}
-  PATH_CLEAN_AIRCRAFT_REFERENCES: ${CI_PROJECT_DIR}/${DIR_UNICADO}/${DIR_AIRCRAFT_REFERENCES}
-  PATH_CLEAN_ADDITIONAL_SOFTWARE: ${CI_PROJECT_DIR}/${DIR_UNICADO}/${DIR_ADDITIONAL_SOFTWARE}
-  PATH_CLEAN_LIBRARIES: ${CI_PROJECT_DIR}/${DIR_UNICADO}/${DIR_LIBS}
-  PATH_CLEAN_PROJECTS: ${PATH_CLEAN_AIRCRAFT_DESIGN}/${DIR_PROJECTS}
-  PATH_CLEAN_IO_DIR: ${PATH_CLEAN_PROJECTS}/${NAME_AIRCRAFT_TYPE}/${NAME_AIRCRAFT_VERSION}
-  PATH_CLEAN_WORKFLOW_ON_RCE: ${CI_PROJECT_DIR}/${DIR_UNICADO}/${DIR_WORKFLOWONRCE}
-  PATH_CLEAN_UNICADO_INSTALLER: ${CI_PROJECT_DIR}/${DIR_UNICADO}/installer
-  PATH_WORKFLOW_INSTALL: ${CI_PROJECT_DIR}/UNICADOworkflow
+  BRANCH_UNICADO: "develop" # MODIFY to main
+  BRANCH_AIRCRAFT_DESIGN: "develop" # MODIFY to main
+  BRANCH_ADDITIONAL_SOFTWARE: "develop" # MODIFY to main
+  BRANCH_LIBRARIES: "develop" # MODIFY to main
+  BRANCH_AIRCRAFT_REFERENCES: "develop" # MODIFY to main
 
   ## List of design tools
   LIST_AD_TOOLS: >