first commit of the new year

GeoscienceAustralia · Jan 21, 2020 · ea7b54a · ea7b54a
1 parent f077d41
commit ea7b54a
Show file tree

Hide file tree

Showing 3,714 changed files with 75 additions and 7 deletions.
diff --git a/catalogue/data/NSHA18CAT_V0.2_hmtk_declustered.csv b/catalogue/data/NSHA18CAT_V0.2_hmtk_declustered.csv
diff --git a/catalogue/data/au_station_data.dat b/catalogue/data/au_station_data.dat
diff --git a/catalogue/decluster_V02.py b/catalogue/decluster_V02.py
diff --git a/catalogue/get_nsha18_cat_stats.py b/catalogue/get_nsha18_cat_stats.py
diff --git a/catalogue/matlab/mdat_ml_rev.mat b/catalogue/matlab/mdat_ml_rev.mat
diff --git a/catalogue/matlab/mdat_mw_pref.mat b/catalogue/matlab/mdat_mw_pref.mat
diff --git a/catalogue/matlab/mdat_pref_mag_types.mat b/catalogue/matlab/mdat_pref_mag_types.mat
diff --git a/catalogue/matlab/ml_comparisons.csv b/catalogue/matlab/ml_comparisons.csv
diff --git a/ground_motion/gaull_1990.py b/ground_motion/gaull_1990.py
diff --git a/jobs/.run_oq_deag_high_mem_mde_batch.py.swp b/jobs/.run_oq_deag_high_mem_mde_batch.py.swp
diff --git a/jobs/deaggregations/Jindabyne/job_deag_mag_Jindabyne_SA02.ini b/jobs/deaggregations/Jindabyne/job_deag_mag_Jindabyne_SA02.ini
diff --git a/jobs/deaggregations/Jindabyne/job_deag_mll_Jindabyne_SA02.ini b/jobs/deaggregations/Jindabyne/job_deag_mll_Jindabyne_SA02.ini
diff --git a/jobs/deaggregations/Jindabyne/params_deag_mag_hi_mem_Jindabyne.txt b/jobs/deaggregations/Jindabyne/params_deag_mag_hi_mem_Jindabyne.txt
diff --git a/jobs/deaggregations/Jindabyne/params_deag_mde_hi_mem_Jindabyne.txt b/jobs/deaggregations/Jindabyne/params_deag_mde_hi_mem_Jindabyne.txt
diff --git a/jobs/deaggregations/Jindabyne/params_deag_mll_hi_mem_Jindabyne.txt b/jobs/deaggregations/Jindabyne/params_deag_mll_hi_mem_Jindabyne.txt
diff --git a/jobs/deaggregations/Morwell/job_deag_mde_Morwell_SA02.ini b/jobs/deaggregations/Morwell/job_deag_mde_Morwell_SA02.ini
diff --git a/jobs/deaggregations/Morwell/job_deag_mll_Morwell_SA02.ini b/jobs/deaggregations/Morwell/job_deag_mll_Morwell_SA02.ini
diff --git a/jobs/deaggregations/Morwell/params_deag_mde_hi_mem_Morwell.txt b/jobs/deaggregations/Morwell/params_deag_mde_hi_mem_Morwell.txt
diff --git a/jobs/deaggregations/Morwell/params_deag_mll_hi_mem_Morwell.txt b/jobs/deaggregations/Morwell/params_deag_mll_hi_mem_Morwell.txt
diff --git a/jobs/deaggregations/NSW_OEM_sites.csv b/jobs/deaggregations/NSW_OEM_sites.csv
diff --git a/jobs/deaggregations/Newcastle/job_deag_mag_Newcastle_SA02.ini b/jobs/deaggregations/Newcastle/job_deag_mag_Newcastle_SA02.ini
diff --git a/jobs/deaggregations/Newcastle/job_deag_mde_Newcastle_SA02.ini b/jobs/deaggregations/Newcastle/job_deag_mde_Newcastle_SA02.ini
diff --git a/jobs/deaggregations/Newcastle/job_deag_mll_Newcastle_SA02.ini b/jobs/deaggregations/Newcastle/job_deag_mll_Newcastle_SA02.ini
diff --git a/jobs/deaggregations/Newcastle/params_deag_mag_hi_mem_Newcastle.txt b/jobs/deaggregations/Newcastle/params_deag_mag_hi_mem_Newcastle.txt
diff --git a/jobs/deaggregations/Newcastle/params_deag_mde_hi_mem_Newcastle.txt b/jobs/deaggregations/Newcastle/params_deag_mde_hi_mem_Newcastle.txt
diff --git a/jobs/deaggregations/Newcastle/params_deag_mll_hi_mem_Newcastle.txt b/jobs/deaggregations/Newcastle/params_deag_mll_hi_mem_Newcastle.txt
diff --git a/jobs/deaggregations/Pakenham/job_deag_mde_Pakenham_SA02.ini b/jobs/deaggregations/Pakenham/job_deag_mde_Pakenham_SA02.ini
diff --git a/jobs/deaggregations/Pakenham/job_deag_mll_Pakenham_SA02.ini b/jobs/deaggregations/Pakenham/job_deag_mll_Pakenham_SA02.ini
diff --git a/jobs/deaggregations/Pakenham/params_deag_mde_hi_mem_Pakenham.txt b/jobs/deaggregations/Pakenham/params_deag_mde_hi_mem_Pakenham.txt
diff --git a/jobs/deaggregations/Pakenham/params_deag_mll_hi_mem_Pakenham.txt b/jobs/deaggregations/Pakenham/params_deag_mll_hi_mem_Pakenham.txt
diff --git a/jobs/deaggregations/Queanbeyan/job_deag_mag_Queanbeyan_SA02.ini b/jobs/deaggregations/Queanbeyan/job_deag_mag_Queanbeyan_SA02.ini
diff --git a/jobs/deaggregations/Queanbeyan/job_deag_mde_Queanbeyan_SA02.ini b/jobs/deaggregations/Queanbeyan/job_deag_mde_Queanbeyan_SA02.ini
diff --git a/jobs/deaggregations/Queanbeyan/job_deag_mll_Queanbeyan_SA02.ini b/jobs/deaggregations/Queanbeyan/job_deag_mll_Queanbeyan_SA02.ini
diff --git a/jobs/deaggregations/Queanbeyan/params_deag_mde_hi_mem_Queanbeyan.txt b/jobs/deaggregations/Queanbeyan/params_deag_mde_hi_mem_Queanbeyan.txt
diff --git a/jobs/deaggregations/Queanbeyan/params_deag_mll_hi_mem_Queanbeyan.txt b/jobs/deaggregations/Queanbeyan/params_deag_mll_hi_mem_Queanbeyan.txt
diff --git a/...ggregations/Western_Syndey_Aerotropolis/job_deag_mag_Western_Syndey_Aerotropolis_SA02.ini b/...ggregations/Western_Syndey_Aerotropolis/job_deag_mag_Western_Syndey_Aerotropolis_SA02.ini
diff --git a/...ggregations/Western_Syndey_Aerotropolis/job_deag_mde_Western_Syndey_Aerotropolis_SA02.ini b/...ggregations/Western_Syndey_Aerotropolis/job_deag_mde_Western_Syndey_Aerotropolis_SA02.ini
diff --git a/...ggregations/Western_Syndey_Aerotropolis/job_deag_mll_Western_Syndey_Aerotropolis_SA02.ini b/...ggregations/Western_Syndey_Aerotropolis/job_deag_mll_Western_Syndey_Aerotropolis_SA02.ini
diff --git a/...ations/Western_Syndey_Aerotropolis/params_deag_mag_hi_mem_Western_Syndey_Aerotropolis.txt b/...ations/Western_Syndey_Aerotropolis/params_deag_mag_hi_mem_Western_Syndey_Aerotropolis.txt
diff --git a/...ations/Western_Syndey_Aerotropolis/params_deag_mde_hi_mem_Western_Syndey_Aerotropolis.txt b/...ations/Western_Syndey_Aerotropolis/params_deag_mde_hi_mem_Western_Syndey_Aerotropolis.txt
diff --git a/...ations/Western_Syndey_Aerotropolis/params_deag_mll_hi_mem_Western_Syndey_Aerotropolis.txt b/...ations/Western_Syndey_Aerotropolis/params_deag_mll_hi_mem_Western_Syndey_Aerotropolis.txt
diff --git a/jobs/deaggregations/adelaide/\ b/jobs/deaggregations/adelaide/\
diff --git a/jobs/deaggregations/adelaide/job_deag_adelaide_SA02.ini b/jobs/deaggregations/adelaide/job_deag_adelaide_SA02.ini
diff --git a/jobs/deaggregations/adelaide/job_deag_mde_adelaide_SA02.ini b/jobs/deaggregations/adelaide/job_deag_mde_adelaide_SA02.ini
diff --git a/jobs/deaggregations/adelaide/job_deag_mde_adelaide_SA10.ini b/jobs/deaggregations/adelaide/job_deag_mde_adelaide_SA10.ini
diff --git a/jobs/deaggregations/adelaide/job_deag_mde_adelaide_SA20.ini b/jobs/deaggregations/adelaide/job_deag_mde_adelaide_SA20.ini
diff --git a/jobs/deaggregations/adelaide/job_deag_mll_adelaide_SA02.ini b/jobs/deaggregations/adelaide/job_deag_mll_adelaide_SA02.ini
diff --git a/jobs/deaggregations/adelaide/job_deag_mll_adelaide_SA10.ini b/jobs/deaggregations/adelaide/job_deag_mll_adelaide_SA10.ini
diff --git a/jobs/deaggregations/adelaide/job_deag_mll_adelaide_SA20.ini b/jobs/deaggregations/adelaide/job_deag_mll_adelaide_SA20.ini
diff --git a/jobs/deaggregations/adelaide/params_deag_adelaide_hi_mem_SA02.txt b/jobs/deaggregations/adelaide/params_deag_adelaide_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/adelaide/params_deag_mde_adelaide_hi_mem_SA02.txt b/jobs/deaggregations/adelaide/params_deag_mde_adelaide_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/adelaide/params_deag_mde_adelaide_hi_mem_SA10.txt b/jobs/deaggregations/adelaide/params_deag_mde_adelaide_hi_mem_SA10.txt
diff --git a/jobs/deaggregations/adelaide/params_deag_mde_adelaide_hi_mem_SA20.txt b/jobs/deaggregations/adelaide/params_deag_mde_adelaide_hi_mem_SA20.txt
diff --git a/jobs/deaggregations/adelaide/params_deag_mll_adelaide_hi_mem_SA02.txt b/jobs/deaggregations/adelaide/params_deag_mll_adelaide_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/adelaide/params_deag_mll_adelaide_hi_mem_SA10.txt b/jobs/deaggregations/adelaide/params_deag_mll_adelaide_hi_mem_SA10.txt
diff --git a/jobs/deaggregations/adelaide/params_deag_mll_adelaide_hi_mem_SA20.txt b/jobs/deaggregations/adelaide/params_deag_mll_adelaide_hi_mem_SA20.txt
diff --git a/jobs/deaggregations/canberra/job_deag_mde_canberra_PGA.ini b/jobs/deaggregations/canberra/job_deag_mde_canberra_PGA.ini
diff --git a/jobs/deaggregations/canberra/job_deag_mde_canberra_SA02.ini b/jobs/deaggregations/canberra/job_deag_mde_canberra_SA02.ini
diff --git a/jobs/deaggregations/canberra/job_deag_mll_canberra_PGA.ini b/jobs/deaggregations/canberra/job_deag_mll_canberra_PGA.ini
diff --git a/jobs/deaggregations/canberra/job_deag_mll_canberra_SA02.ini b/jobs/deaggregations/canberra/job_deag_mll_canberra_SA02.ini
diff --git a/jobs/deaggregations/canberra/params_deag_mde_canberra_hi_mem_PGA.txt b/jobs/deaggregations/canberra/params_deag_mde_canberra_hi_mem_PGA.txt
diff --git a/jobs/deaggregations/canberra/params_deag_mde_canberra_hi_mem_SA02.txt b/jobs/deaggregations/canberra/params_deag_mde_canberra_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/canberra/params_deag_mll_canberra_hi_mem_PGA.txt b/jobs/deaggregations/canberra/params_deag_mll_canberra_hi_mem_PGA.txt
diff --git a/jobs/deaggregations/canberra/params_deag_mll_canberra_hi_mem_SA02.txt b/jobs/deaggregations/canberra/params_deag_mll_canberra_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/cities_021019.csv b/jobs/deaggregations/cities_021019.csv
diff --git a/jobs/deaggregations/darwin/\ b/jobs/deaggregations/darwin/\
diff --git a/jobs/deaggregations/darwin/job_deag_darwin_SA02.ini b/jobs/deaggregations/darwin/job_deag_darwin_SA02.ini
diff --git a/jobs/deaggregations/darwin/job_deag_mde_darwin_SA20.ini b/jobs/deaggregations/darwin/job_deag_mde_darwin_SA20.ini
diff --git a/jobs/deaggregations/darwin/job_deag_mll_darwin_SA02.ini b/jobs/deaggregations/darwin/job_deag_mll_darwin_SA02.ini
diff --git a/jobs/deaggregations/darwin/job_deag_mll_darwin_SA20.ini b/jobs/deaggregations/darwin/job_deag_mll_darwin_SA20.ini
diff --git a/jobs/deaggregations/darwin/params_deag_darwin_hi_mem_SA02.txt b/jobs/deaggregations/darwin/params_deag_darwin_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/darwin/params_deag_mde_dawrin_hi_mem_SA20.txt b/jobs/deaggregations/darwin/params_deag_mde_dawrin_hi_mem_SA20.txt
diff --git a/jobs/deaggregations/darwin/params_deag_mll_darwin_hi_mem_SA02.txt b/jobs/deaggregations/darwin/params_deag_mll_darwin_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/darwin/params_deag_mll_darwin_hi_mem_SA20.txt b/jobs/deaggregations/darwin/params_deag_mll_darwin_hi_mem_SA20.txt
diff --git a/jobs/deaggregations/job_deag_mag_Newcastle_SA02.ini b/jobs/deaggregations/job_deag_mag_Newcastle_SA02.ini
diff --git a/jobs/deaggregations/job_deag_mde_TEMPLATE.ini b/jobs/deaggregations/job_deag_mde_TEMPLATE.ini
diff --git a/jobs/deaggregations/job_deag_mll_Newcastle_SA02.ini b/jobs/deaggregations/job_deag_mll_Newcastle_SA02.ini
diff --git a/jobs/deaggregations/job_deag_mll_TEMPLATE.ini b/jobs/deaggregations/job_deag_mll_TEMPLATE.ini
diff --git a/jobs/deaggregations/job_deag_mll_Western_Syndey_Aerotropolis_SA02.ini b/jobs/deaggregations/job_deag_mll_Western_Syndey_Aerotropolis_SA02.ini
@@ -0,0 +1,54 @@
+[general]
+
+description = COMPLETE NSHA18 - Western_Syndey_Aerotropolis DEAGGREGATION
+calculation_mode = disaggregation
+random_seed = 23
+optimize_same_id_sources=True
+concurrent_tasks = 560
+
+[geometry]
+
+sites = 150.74 -33.90
+
+[logic_tree]
+
+number_of_logic_tree_samples = 40
+prefilter_sources = no
+
+[erf]
+
+rupture_mesh_spacing = 2
+complex_fault_mesh_spacing = 20
+width_of_mfd_bin = 0.1
+area_source_discretization = 15.0
+
+[site_params]
+
+reference_vs30_type = measured
+reference_vs30_value = 760.0
+reference_depth_to_2pt5km_per_sec = 5.0
+reference_depth_to_1pt0km_per_sec = 100.0
+
+[calculation]
+
+source_model_logic_tree_file = ../../../master_lt_files_for_deagg/nsha18_source_model_logic_tree.xml
+gsim_logic_tree_file = ../../../master_lt_files_for_deagg/NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p0.4_simplified_July18.xml
+investigation_time = 50.0
+
+intensity_measure_types_and_levels = {"SA(0.2)": [0.0001, 0.0003, 0.0005, 0.0007, 0.001, 0.003, 0.005, 0.007, 0.0098, 0.0137, 0.0192, 0.0269, 0.0376, 0.0527, 0.0738, 0.103, 0.145, 0.203, 0.284, 0.397, 0.556, 0.778, 1.09, 1.52, 2.13, 2.50]}
+
+truncation_level = 3
+maximum_distance = {"Cratonic": 400.0, "Non_cratonic": 400.0, "Subduction": 400.0}
+
+[disaggregation]
+
+poes_disagg = 0.1, 0.02, 0.005
+mag_bin_width = 0.2
+distance_bin_width = 1000.
+coordinate_bin_width = 0.2
+num_epsilon_bins = 3
+disagg_outputs = Mag_Lon_Lat
+
+[output]
+
+export_dir = ./results
diff --git a/jobs/deaggregations/melbourne/\ b/jobs/deaggregations/melbourne/\
diff --git a/jobs/deaggregations/melbourne/job_deag_mde_Melbourne_SA02.ini b/jobs/deaggregations/melbourne/job_deag_mde_Melbourne_SA02.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_mde_melbourne_SA02.ini b/jobs/deaggregations/melbourne/job_deag_mde_melbourne_SA02.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_mde_melbourne_SA10.ini b/jobs/deaggregations/melbourne/job_deag_mde_melbourne_SA10.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_mde_melbourne_SA20.ini b/jobs/deaggregations/melbourne/job_deag_mde_melbourne_SA20.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_melbourne_SA02.ini b/jobs/deaggregations/melbourne/job_deag_melbourne_SA02.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_mll_Melbourne_SA02.ini b/jobs/deaggregations/melbourne/job_deag_mll_Melbourne_SA02.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_mll_melbourne_SA02.ini b/jobs/deaggregations/melbourne/job_deag_mll_melbourne_SA02.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_mll_melbourne_SA10.ini b/jobs/deaggregations/melbourne/job_deag_mll_melbourne_SA10.ini
diff --git a/jobs/deaggregations/melbourne/job_deag_mll_melbourne_SA20.ini b/jobs/deaggregations/melbourne/job_deag_mll_melbourne_SA20.ini
diff --git a/jobs/deaggregations/melbourne/params_deag_mde_hi_mem_Melbourne.txt b/jobs/deaggregations/melbourne/params_deag_mde_hi_mem_Melbourne.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_mde_melbourne_hi_mem_SA02.txt b/jobs/deaggregations/melbourne/params_deag_mde_melbourne_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_mde_melbourne_hi_mem_SA10.txt b/jobs/deaggregations/melbourne/params_deag_mde_melbourne_hi_mem_SA10.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_mde_melbourne_hi_mem_SA20.txt b/jobs/deaggregations/melbourne/params_deag_mde_melbourne_hi_mem_SA20.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_melbourne_hi_mem_SA02.txt b/jobs/deaggregations/melbourne/params_deag_melbourne_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_mll_hi_mem_Melbourne.txt b/jobs/deaggregations/melbourne/params_deag_mll_hi_mem_Melbourne.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_mll_melbourne_hi_mem_SA02.txt b/jobs/deaggregations/melbourne/params_deag_mll_melbourne_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_mll_melbourne_hi_mem_SA10.txt b/jobs/deaggregations/melbourne/params_deag_mll_melbourne_hi_mem_SA10.txt
diff --git a/jobs/deaggregations/melbourne/params_deag_mll_melbourne_hi_mem_SA20.txt b/jobs/deaggregations/melbourne/params_deag_mll_melbourne_hi_mem_SA20.txt
diff --git a/jobs/deaggregations/params_deag_mag_hi_mem_Newcastle.txt b/jobs/deaggregations/params_deag_mag_hi_mem_Newcastle.txt
diff --git a/jobs/deaggregations/params_deag_mde_hi_mem_TEMPLATE.txt b/jobs/deaggregations/params_deag_mde_hi_mem_TEMPLATE.txt
diff --git a/jobs/deaggregations/params_deag_mll_hi_mem_Newcastle.txt b/jobs/deaggregations/params_deag_mll_hi_mem_Newcastle.txt
@@ -1,12 +1,12 @@
-ncpus = 560
+ncpus = 528
 mem = 1000GB
 walltime = 1:00:00
 jobfs = 1000GB
-sandpit_path = /short/w84/NSHA18/sandpit/
+sandpit_path = /scratch/w84/NSHA18/sandpit/
 deag_rel_path = NSHA2018/jobs/deaggregations/
 model_rel_path = NSHA2018/source_models/complete_model/final/
 shared_rel_path = NSHA2018/shared
 gsim_lt_filename = NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p0.4_simplified_July18.xml
-model_output_base = /short/w84/NSHA18/PSHA_modelling/NSHA_deaggregation_testing/Newcastle/SA02/
+model_output_base = /scratch/w84/NSHA18/PSHA_modelling/NSHA_deaggregation_testing/Newcastle/SA02/
 job_file = job_deag_mll_Newcastle_SA02.ini
 job_type = deag_mll
diff --git a/jobs/deaggregations/params_deag_mll_hi_mem_TEMPLATE.txt b/jobs/deaggregations/params_deag_mll_hi_mem_TEMPLATE.txt
diff --git a/jobs/deaggregations/params_deag_mll_hi_mem_Western_Syndey_Aerotropolis.txt b/jobs/deaggregations/params_deag_mll_hi_mem_Western_Syndey_Aerotropolis.txt
@@ -0,0 +1,12 @@
+ncpus = 560
+mem = 1000GB
+walltime = 1:00:00
+jobfs = 1000GB
+sandpit_path = /short/w84/NSHA18/sandpit/
+deag_rel_path = NSHA2018/jobs/deaggregations/
+model_rel_path = NSHA2018/source_models/complete_model/final/
+shared_rel_path = NSHA2018/shared
+gsim_lt_filename = NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p0.4_simplified_July18.xml
+model_output_base = /short/w84/NSHA18/PSHA_modelling/NSHA_deaggregation_testing/Western_Syndey_Aerotropolis/SA02/
+job_file = job_deag_mll_Western_Syndey_Aerotropolis_SA02.ini
+job_type = deag_mll
diff --git a/jobs/deaggregations/york/\ b/jobs/deaggregations/york/\
diff --git a/jobs/deaggregations/york/job_deag_mde_york_SA02.ini b/jobs/deaggregations/york/job_deag_mde_york_SA02.ini
diff --git a/jobs/deaggregations/york/job_deag_mll_york_SA02.ini b/jobs/deaggregations/york/job_deag_mll_york_SA02.ini
diff --git a/jobs/deaggregations/york/job_deag_york_SA02.ini b/jobs/deaggregations/york/job_deag_york_SA02.ini
diff --git a/jobs/deaggregations/york/params_deag_mde_york_hi_mem_SA02.txt b/jobs/deaggregations/york/params_deag_mde_york_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/york/params_deag_mll_york_hi_mem_SA02.txt b/jobs/deaggregations/york/params_deag_mll_york_hi_mem_SA02.txt
diff --git a/jobs/deaggregations/york/params_deag_york_hi_mem_SA02.txt b/jobs/deaggregations/york/params_deag_york_hi_mem_SA02.txt
diff --git a/jobs/run_oq_deag.py b/jobs/run_oq_deag.py
diff --git a/jobs/run_oq_deag_high_mem.py b/jobs/run_oq_deag_high_mem.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Wrapper script for running model and capturing provenance
 """
 
@@ -109,7 +108,8 @@
 
 # Build run_<model>.sh
 outlines = '#PBS -P w84\n'
-outlines += '#PBS -q normalbw\n' # for high-memory jobs
+outlines += '#PBS -q normal\n' # for high-memory jobs
+outlines += '#PBS -l storage=scratch/w84\n'
 outlines += '#PBS -l walltime=%s\n' % params['walltime']
 outlines += '#PBS -l ncpus=%s\n' % params['ncpus']
 outlines += '#PBS -l mem=%s\n' % params['mem']
@@ -122,7 +122,8 @@
 #outlines += 'module load openquake/2.4\n'
 #outlines += 'module load openquake/3.1\n' # used for NSHA18
 #outlines += 'module load openquake/3.3.1\n'
-outlines += 'module load openquake/3.6\n'
+#outlines += 'module load openquake/3.6\n'
+outlines += 'module load openquake/3.7.1\n'
 outlines += 'oq-ini.all.sh\n'
 outlines += 'oq engine --run %s --exports csv >&  parjob.log\n' % params['job_file']
 outlines += 'oq-end.sh'

diff --git a/jobs/run_oq_model_24.py b/jobs/run_oq_model_24.py
diff --git a/jobs/run_oq_model_high_mem.py b/jobs/run_oq_model_high_mem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 """Wrapper script for running model and capturing provenance
 """
 
@@ -100,6 +100,7 @@
 # Build run_<model>.sh
 outlines = '#PBS -P w84\n'
 outlines += '#PBS -q normalbw\n' # for high-memory jobs
+outlines += '#PBS -l storage=scratch/w84\n'
 outlines += '#PBS -l walltime=%s\n' % params['walltime']
 outlines += '#PBS -l ncpus=%s\n' % params['ncpus']
 outlines += '#PBS -l mem=%s\n' % params['mem']

diff --git a/licence/README.MD b/licence/README.MD
diff --git a/postprocessing/maps/csv2geoTIFF.py b/postprocessing/maps/csv2geoTIFF.py
diff --git a/shared/NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p0.0.xml b/shared/NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p0.0.xml
diff --git a/shared/NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p0.4_simplified_July18.xml b/shared/NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p0.4_simplified_July18.xml
diff --git a/shared/NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p1.0.xml b/shared/NSHA18_Aus_GMPE_75thp_logic_tree_cal_power_p1.0.xml
diff --git a/shared/north_aus_profile.csv b/shared/north_aus_profile.csv
diff --git a/shared/seismic_source_model_weights_rounded_p0.0.csv b/shared/seismic_source_model_weights_rounded_p0.0.csv
diff --git a/shared/seismic_source_model_weights_rounded_p0.4.catalogue_test.csv b/shared/seismic_source_model_weights_rounded_p0.4.catalogue_test.csv
diff --git a/shared/seismic_source_model_weights_rounded_p1.0.csv b/shared/seismic_source_model_weights_rounded_p1.0.csv
diff --git a/source_models/complete_model/ee_working/job_fractiles_cat_test_mw.ini b/source_models/complete_model/ee_working/job_fractiles_cat_test_mw.ini
diff --git a/source_models/complete_model/ee_working/job_fractiles_expert8.ini b/source_models/complete_model/ee_working/job_fractiles_expert8.ini
diff --git a/source_models/complete_model/ee_working/job_fractiles_ga_preferred.ini b/source_models/complete_model/ee_working/job_fractiles_ga_preferred.ini
diff --git a/source_models/complete_model/ee_working/job_fractiles_p0.0.ini b/source_models/complete_model/ee_working/job_fractiles_p0.0.ini
diff --git a/source_models/complete_model/ee_working/job_fractiles_p1.0.ini b/source_models/complete_model/ee_working/job_fractiles_p1.0.ini
diff --git a/source_models/complete_model/ee_working/job_fractiles_uniform.ini b/source_models/complete_model/ee_working/job_fractiles_uniform.ini
diff --git a/source_models/complete_model/ee_working/job_fractiles_uniform_inter-class.ini b/source_models/complete_model/ee_working/job_fractiles_uniform_inter-class.ini
diff --git a/source_models/complete_model/ee_working/job_fractiles_uniform_intra-class.ini b/source_models/complete_model/ee_working/job_fractiles_uniform_intra-class.ini
diff --git a/source_models/complete_model/ee_working/job_maps_PGA_expert8.ini b/source_models/complete_model/ee_working/job_maps_PGA_expert8.ini
diff --git a/source_models/complete_model/ee_working/job_maps_PGA_ga_preferred.ini b/source_models/complete_model/ee_working/job_maps_PGA_ga_preferred.ini
diff --git a/source_models/complete_model/ee_working/job_maps_PGA_p0.0.ini b/source_models/complete_model/ee_working/job_maps_PGA_p0.0.ini
diff --git a/source_models/complete_model/ee_working/job_maps_PGA_p1.0.ini b/source_models/complete_model/ee_working/job_maps_PGA_p1.0.ini
diff --git a/source_models/complete_model/ee_working/job_maps_PGA_uniform.ini b/source_models/complete_model/ee_working/job_maps_PGA_uniform.ini
diff --git a/source_models/complete_model/ee_working/job_maps_PGA_uniform_interclass.ini b/source_models/complete_model/ee_working/job_maps_PGA_uniform_interclass.ini
diff --git a/source_models/complete_model/ee_working/job_maps_PGA_uniform_intra-class.ini b/source_models/complete_model/ee_working/job_maps_PGA_uniform_intra-class.ini
diff --git a/source_models/complete_model/ee_working/nsha18_source_model_logic_tree.p0.0.xml b/source_models/complete_model/ee_working/nsha18_source_model_logic_tree.p0.0.xml
diff --git a/source_models/complete_model/ee_working/nsha18_source_model_logic_tree.p0.4.xml b/source_models/complete_model/ee_working/nsha18_source_model_logic_tree.p0.4.xml
diff --git a/source_models/complete_model/ee_working/nsha18_source_model_logic_tree.p1.0.xml b/source_models/complete_model/ee_working/nsha18_source_model_logic_tree.p1.0.xml
diff --git a/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_cat_test.xml b/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_cat_test.xml
diff --git a/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_expert8.xml b/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_expert8.xml
diff --git a/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_ga_preferred.xml b/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_ga_preferred.xml
diff --git a/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_uniform.xml b/source_models/complete_model/ee_working/nsha18_source_model_logic_tree_uniform.xml
diff --git a/...e_models/complete_model/ee_working/nsha18_source_model_logic_tree_uniform_inter-class.xml b/...e_models/complete_model/ee_working/nsha18_source_model_logic_tree_uniform_inter-class.xml
diff --git a/...e_models/complete_model/ee_working/nsha18_source_model_logic_tree_uniform_intra-class.xml b/...e_models/complete_model/ee_working/nsha18_source_model_logic_tree_uniform_intra-class.xml
diff --git a/source_models/complete_model/ee_working/params_fractiles_cat_test_mw.txt b/source_models/complete_model/ee_working/params_fractiles_cat_test_mw.txt
diff --git a/source_models/complete_model/ee_working/params_fractiles_expert8.txt b/source_models/complete_model/ee_working/params_fractiles_expert8.txt
diff --git a/source_models/complete_model/ee_working/params_fractiles_ga_preferred.txt b/source_models/complete_model/ee_working/params_fractiles_ga_preferred.txt
diff --git a/source_models/complete_model/ee_working/params_fractiles_p0.0.txt b/source_models/complete_model/ee_working/params_fractiles_p0.0.txt
diff --git a/source_models/complete_model/ee_working/params_fractiles_p1.0.txt b/source_models/complete_model/ee_working/params_fractiles_p1.0.txt
diff --git a/source_models/complete_model/ee_working/params_fractiles_uniform.txt b/source_models/complete_model/ee_working/params_fractiles_uniform.txt
diff --git a/source_models/complete_model/ee_working/params_fractiles_uniform_inter-class.txt b/source_models/complete_model/ee_working/params_fractiles_uniform_inter-class.txt
diff --git a/source_models/complete_model/ee_working/params_fractiles_uniform_intra-class.txt b/source_models/complete_model/ee_working/params_fractiles_uniform_intra-class.txt
diff --git a/source_models/complete_model/ee_working/params_maps_PGA_himem_expert8.txt b/source_models/complete_model/ee_working/params_maps_PGA_himem_expert8.txt
diff --git a/source_models/complete_model/ee_working/params_maps_PGA_himem_ga_preferred.txt b/source_models/complete_model/ee_working/params_maps_PGA_himem_ga_preferred.txt
diff --git a/source_models/complete_model/ee_working/params_maps_PGA_himem_p0.0.txt b/source_models/complete_model/ee_working/params_maps_PGA_himem_p0.0.txt
diff --git a/source_models/complete_model/ee_working/params_maps_PGA_himem_p1.0.txt b/source_models/complete_model/ee_working/params_maps_PGA_himem_p1.0.txt
diff --git a/source_models/complete_model/ee_working/params_maps_PGA_himem_uniform.txt b/source_models/complete_model/ee_working/params_maps_PGA_himem_uniform.txt
diff --git a/source_models/complete_model/ee_working/params_maps_PGA_himem_uniform_inter-class.txt b/source_models/complete_model/ee_working/params_maps_PGA_himem_uniform_inter-class.txt
diff --git a/source_models/complete_model/ee_working/params_maps_PGA_himem_uniform_intra-class.txt b/source_models/complete_model/ee_working/params_maps_PGA_himem_uniform_intra-class.txt
diff --git a/source_models/complete_model/final/ARUP_Background_collapsed.xml b/source_models/complete_model/final/ARUP_Background_collapsed.xml
diff --git a/source_models/complete_model/final/ARUP_collapsed.xml b/source_models/complete_model/final/ARUP_collapsed.xml
diff --git a/source_models/complete_model/final/AUS6_collapsed.xml b/source_models/complete_model/final/AUS6_collapsed.xml
diff --git a/source_models/complete_model/final/DIMAUS_collapsed.xml b/source_models/complete_model/final/DIMAUS_collapsed.xml
diff --git a/source_models/complete_model/final/Domains_collapsed.xml b/source_models/complete_model/final/Domains_collapsed.xml
diff --git a/source_models/complete_model/final/Leonard2008_collapsed.xml b/source_models/complete_model/final/Leonard2008_collapsed.xml
diff --git a/source_models/complete_model/final/NSHA13_BACKGROUND_collapsed.xml b/source_models/complete_model/final/NSHA13_BACKGROUND_collapsed.xml
diff --git a/source_models/complete_model/final/NSHA13_collapsed.xml b/source_models/complete_model/final/NSHA13_collapsed.xml
diff --git a/source_models/complete_model/final/SIN_MCC_collapsed.xml b/source_models/complete_model/final/SIN_MCC_collapsed.xml
diff --git a/source_models/complete_model/final/interp_nsha18_hazgrids.py b/source_models/complete_model/final/interp_nsha18_hazgrids.py
diff --git a/source_models/complete_model/final/interpolate_hazard_grid.py b/source_models/complete_model/final/interpolate_hazard_grid.py
diff --git a/source_models/complete_model/final/job_fractiles_background.ini b/source_models/complete_model/final/job_fractiles_background.ini
diff --git a/source_models/complete_model/final/job_fractiles_fault_test.ini b/source_models/complete_model/final/job_fractiles_fault_test.ini
diff --git a/source_models/complete_model/final/job_fractiles_regional.ini b/source_models/complete_model/final/job_fractiles_regional.ini
diff --git a/source_models/complete_model/final/job_fractiles_seismotectonic.ini b/source_models/complete_model/final/job_fractiles_seismotectonic.ini
diff --git a/source_models/complete_model/final/job_fractiles_smoothedseismicity.ini b/source_models/complete_model/final/job_fractiles_smoothedseismicity.ini
diff --git a/source_models/complete_model/final/job_fractiles_smoothedseismicity_faults.ini b/source_models/complete_model/final/job_fractiles_smoothedseismicity_faults.ini
diff --git a/source_models/complete_model/final/job_maps_PGA_cat_test.ini b/source_models/complete_model/final/job_maps_PGA_cat_test.ini
diff --git a/source_models/complete_model/final/job_maps_PGA_gmm_test.ini b/source_models/complete_model/final/job_maps_PGA_gmm_test.ini
diff --git a/source_models/complete_model/final/job_maps_SA005.ini b/source_models/complete_model/final/job_maps_SA005.ini
diff --git a/source_models/complete_model/final/job_maps_SA01.ini b/source_models/complete_model/final/job_maps_SA01.ini
diff --git a/source_models/complete_model/final/job_maps_SA03.ini b/source_models/complete_model/final/job_maps_SA03.ini
diff --git a/source_models/complete_model/final/job_maps_SA05.ini b/source_models/complete_model/final/job_maps_SA05.ini
diff --git a/source_models/complete_model/final/job_maps_SA07.ini b/source_models/complete_model/final/job_maps_SA07.ini
diff --git a/source_models/complete_model/final/job_maps_SA15.ini b/source_models/complete_model/final/job_maps_SA15.ini
diff --git a/source_models/complete_model/final/job_maps_SA40.ini b/source_models/complete_model/final/job_maps_SA40.ini
diff --git a/source_models/complete_model/final/job_stats.ini b/source_models/complete_model/final/job_stats.ini
diff --git a/source_models/complete_model/final/nsha18_source_model_logic_tree.xml b/source_models/complete_model/final/nsha18_source_model_logic_tree.xml
diff --git a/source_models/complete_model/final/nsha18_source_model_logic_tree_background.xml b/source_models/complete_model/final/nsha18_source_model_logic_tree_background.xml
diff --git a/source_models/complete_model/final/nsha18_source_model_logic_tree_cat_test.xml b/source_models/complete_model/final/nsha18_source_model_logic_tree_cat_test.xml
diff --git a/source_models/complete_model/final/nsha18_source_model_logic_tree_fault_test.xml b/source_models/complete_model/final/nsha18_source_model_logic_tree_fault_test.xml
diff --git a/source_models/complete_model/final/nsha18_source_model_logic_tree_regional.xml b/source_models/complete_model/final/nsha18_source_model_logic_tree_regional.xml
diff --git a/source_models/complete_model/final/nsha18_source_model_logic_tree_seismotectonic.xml b/source_models/complete_model/final/nsha18_source_model_logic_tree_seismotectonic.xml
diff --git a/source_models/complete_model/final/nsha18_source_model_logic_tree_smoothedseismicity.xml b/source_models/complete_model/final/nsha18_source_model_logic_tree_smoothedseismicity.xml
diff --git a/..._models/complete_model/final/nsha18_source_model_logic_tree_smoothedseismicity_faults.xml b/..._models/complete_model/final/nsha18_source_model_logic_tree_smoothedseismicity_faults.xml
diff --git a/source_models/complete_model/final/params_fractiles_background.txt b/source_models/complete_model/final/params_fractiles_background.txt
diff --git a/source_models/complete_model/final/params_fractiles_fault_test.txt b/source_models/complete_model/final/params_fractiles_fault_test.txt
diff --git a/source_models/complete_model/final/params_fractiles_regional.txt b/source_models/complete_model/final/params_fractiles_regional.txt
diff --git a/source_models/complete_model/final/params_fractiles_seismotectonic.txt b/source_models/complete_model/final/params_fractiles_seismotectonic.txt
diff --git a/source_models/complete_model/final/params_fractiles_smoothedseismicity.txt b/source_models/complete_model/final/params_fractiles_smoothedseismicity.txt
diff --git a/source_models/complete_model/final/params_fractiles_smoothedseismicity_faults.txt b/source_models/complete_model/final/params_fractiles_smoothedseismicity_faults.txt
diff --git a/source_models/complete_model/final/params_info_PGA_himem.txt b/source_models/complete_model/final/params_info_PGA_himem.txt
diff --git a/source_models/complete_model/final/params_maps_PGA_cat_test.txt b/source_models/complete_model/final/params_maps_PGA_cat_test.txt
diff --git a/source_models/complete_model/final/params_maps_PGA_gmm_test.txt b/source_models/complete_model/final/params_maps_PGA_gmm_test.txt
diff --git a/source_models/complete_model/final/params_maps_SA005_himem.txt b/source_models/complete_model/final/params_maps_SA005_himem.txt
diff --git a/source_models/complete_model/final/params_maps_SA01_himem.txt b/source_models/complete_model/final/params_maps_SA01_himem.txt
diff --git a/source_models/complete_model/final/params_maps_SA03_himem.txt b/source_models/complete_model/final/params_maps_SA03_himem.txt
diff --git a/source_models/complete_model/final/params_maps_SA05_himem.txt b/source_models/complete_model/final/params_maps_SA05_himem.txt
diff --git a/source_models/complete_model/final/params_maps_SA07_himem.txt b/source_models/complete_model/final/params_maps_SA07_himem.txt
diff --git a/source_models/complete_model/final/params_maps_SA15_himem.txt b/source_models/complete_model/final/params_maps_SA15_himem.txt
diff --git a/source_models/complete_model/final/params_maps_SA20_himem.txt b/source_models/complete_model/final/params_maps_SA20_himem.txt
diff --git a/source_models/complete_model/final/params_maps_SA40_himem.txt b/source_models/complete_model/final/params_maps_SA40_himem.txt
diff --git a/source_models/complete_model/final_mx/ARUP_Background_collapsed_mx.xml b/source_models/complete_model/final_mx/ARUP_Background_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/ARUP_collapsed_mx.xml b/source_models/complete_model/final_mx/ARUP_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/AUS6_collapsed_mx.xml b/source_models/complete_model/final_mx/AUS6_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/DIMAUS_collapsed_mx.xml b/source_models/complete_model/final_mx/DIMAUS_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/Domains_collapsed_mx.xml b/source_models/complete_model/final_mx/Domains_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/Leonard2008_collapsed_mx.xml b/source_models/complete_model/final_mx/Leonard2008_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/NSHA13_BACKGROUND_collapsed_mx.xml b/source_models/complete_model/final_mx/NSHA13_BACKGROUND_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/NSHA13_collapsed_mx.xml b/source_models/complete_model/final_mx/NSHA13_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/SIN_MCC_collapsed_mx.xml b/source_models/complete_model/final_mx/SIN_MCC_collapsed_mx.xml
diff --git a/source_models/complete_model/final_mx/job_fractiles_cat_test_mx.ini b/source_models/complete_model/final_mx/job_fractiles_cat_test_mx.ini
diff --git a/source_models/complete_model/final_mx/job_maps_PGA_cat_test.ini b/source_models/complete_model/final_mx/job_maps_PGA_cat_test.ini
diff --git a/source_models/complete_model/final_mx/nsha18_source_model_logic_tree_cat_test_mx.xml b/source_models/complete_model/final_mx/nsha18_source_model_logic_tree_cat_test_mx.xml
diff --git a/source_models/complete_model/final_mx/params_fractiles_cat_test_mx.txt b/source_models/complete_model/final_mx/params_fractiles_cat_test_mx.txt
diff --git a/source_models/complete_model/final_mx/params_maps_PGA_cat_test.txt b/source_models/complete_model/final_mx/params_maps_PGA_cat_test.txt
diff --git a/source_models/complete_model/plt_epistemic_cdf.py b/source_models/complete_model/plt_epistemic_cdf.py
diff --git a/source_models/faults/FSM/FSD_simple_faults_plus_vert2.dbf b/source_models/faults/FSM/FSD_simple_faults_plus_vert2.dbf
diff --git a/source_models/faults/FSM/FSD_simple_faults_plus_vert2.prj b/source_models/faults/FSM/FSD_simple_faults_plus_vert2.prj
diff --git a/source_models/faults/FSM/FSD_simple_faults_plus_vert2.sbn b/source_models/faults/FSM/FSD_simple_faults_plus_vert2.sbn
diff --git a/source_models/faults/FSM/FSD_simple_faults_plus_vert2.sbx b/source_models/faults/FSM/FSD_simple_faults_plus_vert2.sbx
diff --git a/source_models/faults/FSM/FSD_simple_faults_plus_vert2.shp b/source_models/faults/FSM/FSD_simple_faults_plus_vert2.shp
diff --git a/source_models/faults/FSM/FSD_simple_faults_plus_vert2.shx b/source_models/faults/FSM/FSD_simple_faults_plus_vert2.shx
diff --git a/source_models/logic_trees/make_alt_source_model_logic_tree.py b/source_models/logic_trees/make_alt_source_model_logic_tree.py
diff --git a/source_models/logic_trees/nsha18_source_model_logic_tree.xml b/source_models/logic_trees/nsha18_source_model_logic_tree.xml
diff --git a/source_models/logic_trees/plot_expert_source_type_weights.py b/source_models/logic_trees/plot_expert_source_type_weights.py
diff --git a/...smoothing_collapsed_K3_single_corner_completeness/GA_adaptive_source_model_logic_tree.xml b/...smoothing_collapsed_K3_single_corner_completeness/GA_adaptive_source_model_logic_tree.xml
diff --git a/...seismicity/GA_adaptive_smoothing_collapsed_K3_single_corner_completeness/job_maps_PGA.ini b/...seismicity/GA_adaptive_smoothing_collapsed_K3_single_corner_completeness/job_maps_PGA.ini
diff --git a/...smicity/GA_adaptive_smoothing_collapsed_K3_single_corner_completeness/params_maps_PGA.txt b/...smicity/GA_adaptive_smoothing_collapsed_K3_single_corner_completeness/params_maps_PGA.txt
diff --git a/..._smoothing_50_3_collapsed_single_corner_completeness/GA_fixed_source_model_logic_tree.xml b/..._smoothing_50_3_collapsed_single_corner_completeness/GA_fixed_source_model_logic_tree.xml
diff --git a/..._seismicity/GA_fixed_smoothing_50_3_collapsed_single_corner_completeness/job_maps_PGA.ini b/..._seismicity/GA_fixed_smoothing_50_3_collapsed_single_corner_completeness/job_maps_PGA.ini
diff --git a/...ismicity/GA_fixed_smoothing_50_3_collapsed_single_corner_completeness/params_maps_PGA.txt b/...ismicity/GA_fixed_smoothing_50_3_collapsed_single_corner_completeness/params_maps_PGA.txt
diff --git a/source_models/smoothed_seismicity/Hall2007_2018/Hall2007_source_model_logic_tree.xml b/source_models/smoothed_seismicity/Hall2007_2018/Hall2007_source_model_logic_tree.xml
diff --git a/source_models/smoothed_seismicity/Hall2007_2018/job_maps_PGA.ini b/source_models/smoothed_seismicity/Hall2007_2018/job_maps_PGA.ini
diff --git a/source_models/smoothed_seismicity/Hall2007_2018/params_maps_PGA.txt b/source_models/smoothed_seismicity/Hall2007_2018/params_maps_PGA.txt
diff --git a/source_models/zones/2018_mw/ARUP/input/best/ARUP_best.xml b/source_models/zones/2018_mw/ARUP/input/best/ARUP_best.xml
diff --git a/source_models/zones/2018_mw/ARUP/input/best/ARUP_source_model_logic_tree.xml b/source_models/zones/2018_mw/ARUP/input/best/ARUP_source_model_logic_tree.xml
diff --git a/source_models/zones/2018_mw/ARUP/mfd/NWMB1/NWMB1_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/NWMB1/NWMB1_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/NWMB1/NWMB1_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/NWMB1/NWMB1_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/NWMB1/NWMB1_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/NWMB1/NWMB1_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/NWO/NWO_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/NWO/NWO_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/NWO/NWO_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/NWO/NWO_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/NWO/NWO_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/NWO/NWO_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/SEOB/SEOB_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/SEOB/SEOB_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/SEOB/SEOB_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/SEOB/SEOB_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/SEOB/SEOB_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/SEOB/SEOB_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/SWOB/SWOB_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/SWOB/SWOB_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/SWOB/SWOB_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/SWOB/SWOB_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/SWOB/SWOB_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/SWOB/SWOB_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/TP/TP_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/TP/TP_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/TP/TP_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/TP/TP_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/TP/TP_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/TP/TP_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN1a/ZN1a_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN1a/ZN1a_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN1a/ZN1a_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN1a/ZN1a_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN1a/ZN1a_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN1a/ZN1a_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN1b/ZN1b_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN1b/ZN1b_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN1b/ZN1b_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN1b/ZN1b_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN1b/ZN1b_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN1b/ZN1b_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN2a/ZN2a_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN2a/ZN2a_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN2a/ZN2a_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN2a/ZN2a_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN2a/ZN2a_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN2a/ZN2a_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN2b/ZN2b_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN2b/ZN2b_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN2b/ZN2b_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN2b/ZN2b_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN2b/ZN2b_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN2b/ZN2b_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3a/ZN3a_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN3a/ZN3a_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3a/ZN3a_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN3a/ZN3a_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3a/ZN3a_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN3a/ZN3a_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3b/ZN3b_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN3b/ZN3b_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3b/ZN3b_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN3b/ZN3b_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3b/ZN3b_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN3b/ZN3b_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3c/ZN3c_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN3c/ZN3c_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3c/ZN3c_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN3c/ZN3c_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN3c/ZN3c_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN3c/ZN3c_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN4a/ZN4a_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN4a/ZN4a_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN4a/ZN4a_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN4a/ZN4a_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN4a/ZN4a_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN4a/ZN4a_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN4b/ZN4b_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN4b/ZN4b_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN4b/ZN4b_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN4b/ZN4b_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN4b/ZN4b_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN4b/ZN4b_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN5/ZN5_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN5/ZN5_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN5/ZN5_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN5/ZN5_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN5/ZN5_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN5/ZN5_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN6a/ZN6a_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN6a/ZN6a_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN6a/ZN6a_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN6a/ZN6a_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN6a/ZN6a_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN6a/ZN6a_rates.csv
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN6b/ZN6b_failed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN6b/ZN6b_failed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN6b/ZN6b_passed.dat b/source_models/zones/2018_mw/ARUP/mfd/ZN6b/ZN6b_passed.dat
diff --git a/source_models/zones/2018_mw/ARUP/mfd/ZN6b/ZN6b_rates.csv b/source_models/zones/2018_mw/ARUP/mfd/ZN6b/ZN6b_rates.csv