diff --git a/crane b/crane index 9b883c5c1e3..e5a61930c70 160000 --- a/crane +++ b/crane @@ -1 +1 @@ -Subproject commit 9b883c5c1e394b6ecb09ab2d688240a523d24e6c +Subproject commit e5a61930c70c50c7dea21f494a244352d17f314f diff --git a/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables.i b/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables.i index 900f3434a5b..7321033e3f5 100644 --- a/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables.i +++ b/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables.i @@ -747,7 +747,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -755,7 +754,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -763,7 +761,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -771,7 +768,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At100mTorr.i b/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At100mTorr.i index d969822d378..f1af4823e20 100644 --- a/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At100mTorr.i +++ b/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At100mTorr.i @@ -801,14 +801,12 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_elastic.txt' reaction = 'em + Ar -> em + Ar' - file_location = '' electrons = em [] [reaction_0] type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' mean_energy = mean_en electrons = em [] @@ -816,7 +814,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' mean_energy = mean_en electrons = em [] @@ -824,7 +821,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' mean_energy = mean_en electrons = em [] @@ -832,7 +828,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' mean_energy = mean_en electrons = em [] diff --git a/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At1Torr.i b/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At1Torr.i index 0cdc6e50133..30d2ea1fc7a 100644 --- a/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At1Torr.i +++ b/test/tests/Conference_Syntax_Tests/Lymberopoulos_with_argon_metastables_2D_At1Torr.i @@ -802,14 +802,12 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_elastic.txt' reaction = 'em + Ar -> em + Ar' - file_location = '' electrons = em [] [reaction_0] type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' mean_energy = mean_en electrons = em [] @@ -817,7 +815,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' mean_energy = mean_en electrons = em [] @@ -825,7 +822,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' mean_energy = mean_en electrons = em [] @@ -833,7 +829,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' mean_energy = mean_en electrons = em [] diff --git a/test/tests/DriftDiffusionAction/2D_RF_Plasma_actions.i b/test/tests/DriftDiffusionAction/2D_RF_Plasma_actions.i index 73cdc1c7ff8..6eb2fdbb38b 100644 --- a/test/tests/DriftDiffusionAction/2D_RF_Plasma_actions.i +++ b/test/tests/DriftDiffusionAction/2D_RF_Plasma_actions.i @@ -565,14 +565,12 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_elastic.txt' reaction = 'em + Ar -> em + Ar' - file_location = '' electrons = em [] [reaction_0] type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' mean_energy = mean_en electrons = em [] @@ -580,7 +578,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' mean_energy = mean_en electrons = em [] @@ -588,7 +585,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant reaction = 'em + Ar* -> em + Ar' property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' - file_location = '' mean_energy = mean_en electrons = em [] @@ -596,7 +592,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant reaction = 'em + Ar* -> em + em + Ar+' property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' - file_location = '' mean_energy = mean_en electrons = em [] diff --git a/test/tests/DriftDiffusionAction/2D_RF_Plasma_no_actions.i b/test/tests/DriftDiffusionAction/2D_RF_Plasma_no_actions.i index f58274f2896..04c65f61cb9 100644 --- a/test/tests/DriftDiffusionAction/2D_RF_Plasma_no_actions.i +++ b/test/tests/DriftDiffusionAction/2D_RF_Plasma_no_actions.i @@ -773,14 +773,12 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_elastic.txt' reaction = 'em + Ar -> em + Ar' - file_location = '' electrons = em [] [reaction_0] type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' mean_energy = mean_en electrons = em [] @@ -788,7 +786,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' mean_energy = mean_en electrons = em [] @@ -796,7 +793,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant reaction = 'em + Ar* -> em + Ar' property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' - file_location = '' mean_energy = mean_en electrons = em [] @@ -804,7 +800,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant reaction = 'em + Ar* -> em + em + Ar+' property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' - file_location = '' mean_energy = mean_en electrons = em [] diff --git a/test/tests/DriftDiffusionAction/RF_Plasma_actions.i b/test/tests/DriftDiffusionAction/RF_Plasma_actions.i index 05027629c24..b477e623235 100644 --- a/test/tests/DriftDiffusionAction/RF_Plasma_actions.i +++ b/test/tests/DriftDiffusionAction/RF_Plasma_actions.i @@ -517,7 +517,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -525,7 +524,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -533,7 +531,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -541,7 +538,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/test/tests/DriftDiffusionAction/RF_Plasma_no_actions.i b/test/tests/DriftDiffusionAction/RF_Plasma_no_actions.i index b1139c598e0..a5f77d6763a 100644 --- a/test/tests/DriftDiffusionAction/RF_Plasma_no_actions.i +++ b/test/tests/DriftDiffusionAction/RF_Plasma_no_actions.i @@ -706,7 +706,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -714,7 +713,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -722,7 +720,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -730,7 +727,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables.i b/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables.i index 000265ddf4a..38d99795bea 100644 --- a/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables.i +++ b/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables.i @@ -749,7 +749,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -757,7 +756,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -765,7 +763,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -773,7 +770,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables_2D_At100mTorr_CoarseMesh.i b/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables_2D_At100mTorr_CoarseMesh.i index da6fe329dc0..6d6c344e7c3 100644 --- a/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables_2D_At100mTorr_CoarseMesh.i +++ b/test/tests/Lymberopoulos_rf_discharge/Lymberopoulos_with_argon_metastables_2D_At100mTorr_CoarseMesh.i @@ -804,14 +804,12 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/ar_elastic.txt' reaction = 'em + Ar -> em + Ar' - file_location = '' electrons = em [] [reaction_0] type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_excitation.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' mean_energy = mean_en electrons = em [] @@ -819,7 +817,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant property_file = 'Argon_reactions_paper_RateCoefficients/ar_ionization.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' mean_energy = mean_en electrons = em [] @@ -827,7 +824,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant reaction = 'em + Ar* -> em + Ar' property_file = 'Argon_reactions_paper_RateCoefficients/ar_deexcitation.txt' - file_location = '' mean_energy = mean_en electrons = em [] @@ -835,7 +831,6 @@ dom0Scale = 25.4e-3 type = ZapdosEEDFRateConstant reaction = 'em + Ar* -> em + em + Ar+' property_file = 'Argon_reactions_paper_RateCoefficients/ar_excited_ionization.txt' - file_location = '' mean_energy = mean_en electrons = em [] diff --git a/test/tests/accelerations/Acceleration_By_Averaging_acceleration_sub.i b/test/tests/accelerations/Acceleration_By_Averaging_acceleration_sub.i index 0fe0ad672d7..4160061e0c6 100644 --- a/test/tests/accelerations/Acceleration_By_Averaging_acceleration_sub.i +++ b/test/tests/accelerations/Acceleration_By_Averaging_acceleration_sub.i @@ -464,7 +464,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + Ar*.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -472,7 +471,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + em + Ar+.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -480,7 +478,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + Ar.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -488,7 +485,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + em + Ar+.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/test/tests/accelerations/Acceleration_By_Averaging_main.i b/test/tests/accelerations/Acceleration_By_Averaging_main.i index c9fe417ef7f..1f3b0e190b5 100644 --- a/test/tests/accelerations/Acceleration_By_Averaging_main.i +++ b/test/tests/accelerations/Acceleration_By_Averaging_main.i @@ -700,7 +700,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + Ar*.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -708,7 +707,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + em + Ar+.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -716,7 +714,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + Ar.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -724,7 +721,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + em + Ar+.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/test/tests/accelerations/Acceleration_By_Shooting_Method.i b/test/tests/accelerations/Acceleration_By_Shooting_Method.i index 1ff470cfc02..0cc34941118 100644 --- a/test/tests/accelerations/Acceleration_By_Shooting_Method.i +++ b/test/tests/accelerations/Acceleration_By_Shooting_Method.i @@ -659,7 +659,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + Ar*.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -667,7 +666,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + em + Ar+.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -675,7 +673,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + Ar.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -683,7 +680,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + em + Ar+.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/test/tests/accelerations/Acceleration_By_Shooting_Method_SensitivityMatrix.i b/test/tests/accelerations/Acceleration_By_Shooting_Method_SensitivityMatrix.i index 8a4f070a6e6..b755ce31d28 100644 --- a/test/tests/accelerations/Acceleration_By_Shooting_Method_SensitivityMatrix.i +++ b/test/tests/accelerations/Acceleration_By_Shooting_Method_SensitivityMatrix.i @@ -774,7 +774,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + Ar*.txt' reaction = 'em + Ar -> em + Ar*' - file_location = '' electrons = em [] [reaction_1] @@ -782,7 +781,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar -> em + em + Ar+.txt' reaction = 'em + Ar -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_2] @@ -790,7 +788,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + Ar.txt' reaction = 'em + Ar* -> em + Ar' - file_location = '' electrons = em [] [reaction_3] @@ -798,7 +795,6 @@ dom0Scale = 25.4e-3 mean_energy = mean_en property_file = 'Argon_reactions_paper_RateCoefficients/reaction_em + Ar* -> em + em + Ar+.txt' reaction = 'em + Ar* -> em + em + Ar+' - file_location = '' electrons = em [] [reaction_4] diff --git a/tutorial/tutorial06-Building-InputFile/RF_Plasma_Blank.i b/tutorial/tutorial06-Building-InputFile/RF_Plasma_Blank.i index 523205ef51e..ac3d3855280 100644 --- a/tutorial/tutorial06-Building-InputFile/RF_Plasma_Blank.i +++ b/tutorial/tutorial06-Building-InputFile/RF_Plasma_Blank.i @@ -78,8 +78,6 @@ dom0Scale=25.4e-3 electron_density = #Defines if electrons are tracked include_electrons = - #Defines directory holding rate text files - file_location = #Name of name for potential (usually 'potential') potential = #Defines if log form is used (true for Zapdos)