Merge pull request #6 from andre-barbe/dev

Dev
andre-barbe · Jun 29, 2018 · 95135bd · 95135bd
2 parents 024f36d + abcaa1e
commit 95135bd
Show file tree

Hide file tree

Showing 113 changed files with 69 additions and 2,196 deletions.
diff --git a/Main.py b/Main.py
@@ -24,7 +24,7 @@
         ag.CopyInputFiles(simulation_name, part_input_folder, part_work_folder).copy()
 
         for additional_input_folder in config.part_additional_input_folders(simulation_name, part_num):
-            # need to use this copy method to overwrite files/folders (or copy files to folders taht already exist)
+            # need to use this copy method to overwrite files/folders (or copy files to folders that already exist)
             distutils.dir_util.copy_tree("InputFiles\{0}".format(additional_input_folder),
                                          "WorkFiles\{0}\{1}".format(simulation_name, part_work_folder))
 

diff --git a/OutputFiles/2018-03-15 14-32 Results j.csv b/OutputFiles/2018-03-15 14-32 Results j.csv
diff --git a/OutputFiles/2018-03-23 12-56 Results GTAP-E.csv b/OutputFiles/2018-03-23 12-56 Results GTAP-E.csv
diff --git a/OutputFiles/2018-03-23 13-49 Results GTAP-E.csv b/OutputFiles/2018-03-23 13-49 Results GTAP-E.csv
diff --git a/OutputFiles/2018-03-23 14-06 Results.csv b/OutputFiles/2018-03-23 14-06 Results.csv
diff --git a/OutputFiles/2018-03-23 14-35 Results.csv b/OutputFiles/2018-03-23 14-35 Results.csv
diff --git a/OutputFiles/2018-03-23 15-25 Results.csv b/OutputFiles/2018-03-23 15-25 Results.csv
diff --git a/OutputFiles/2018-03-23 15-46 Results.csv b/OutputFiles/2018-03-23 15-46 Results.csv
diff --git a/OutputFiles/2018-03-23 15-54 Results.csv b/OutputFiles/2018-03-23 15-54 Results.csv