From e74d1f6c7326dfceac938d504af66fd58b946ce2 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Wed, 23 Oct 2019 17:42:22 +0200 Subject: moved ignore_table_test block at the beginning of InitBW and InitQS methods --- Source/Particles/MultiParticleContainer.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'Source/Particles/MultiParticleContainer.cpp') diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index 74409a57f..f56a34525 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -767,6 +767,13 @@ void MultiParticleContainer::InitQED () void MultiParticleContainer::InitQuantumSync () { + //Only temporary for test purposes, will be removed + ParmParse pp("qed_qs"); + bool ignore_tables = false; + pp.query("ignore_tables_for_test", ignore_tables); + if(ignore_tables) return; + //_________________________________________________ + bool generate_table; PicsarQuantumSynchrotronCtrl ctrl; std::string filename; @@ -779,13 +786,6 @@ void MultiParticleContainer::InitQuantumSync () } ParallelDescriptor::Barrier(); - //Only temporary for test purposes, will be removed - ParmParse pp("qed_qs"); - bool ignore_tables = false; - pp.query("ignore_tables_for_test", ignore_tables); - if(ignore_tables) return; - //_________________________________________________ - Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); if(!qs_engine.init_lookup_tables_from_raw_data(table_data)) @@ -794,6 +794,14 @@ void MultiParticleContainer::InitQuantumSync () void MultiParticleContainer::InitBreitWheeler () { + + //Only temporary for test purposes, will be removed + ParmParse pp("qed_bw"); + bool ignore_tables = false; + pp.query("ignore_tables_for_test", ignore_tables); + if(ignore_tables) return; + //_________________________________________________ + bool generate_table; PicsarBreitWheelerCtrl ctrl; std::string filename; @@ -806,13 +814,6 @@ void MultiParticleContainer::InitBreitWheeler () } ParallelDescriptor::Barrier(); - //Only temporary for test purposes, will be removed - ParmParse pp("qed_bw"); - bool ignore_tables = false; - pp.query("ignore_tables_for_test", ignore_tables); - if(ignore_tables) return; - //_________________________________________________ - Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); if(!bw_engine.init_lookup_tables_from_raw_data(table_data)) -- cgit v1.2.3 From e10894084b934b0d973ef44c6c1dde84002d9acf Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Wed, 23 Oct 2019 18:02:48 +0200 Subject: Revert "moved ignore_table_test block at the beginning of InitBW and InitQS methods" This reverts commit e74d1f6c7326dfceac938d504af66fd58b946ce2. --- Source/Particles/MultiParticleContainer.cpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'Source/Particles/MultiParticleContainer.cpp') diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index f56a34525..74409a57f 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -767,13 +767,6 @@ void MultiParticleContainer::InitQED () void MultiParticleContainer::InitQuantumSync () { - //Only temporary for test purposes, will be removed - ParmParse pp("qed_qs"); - bool ignore_tables = false; - pp.query("ignore_tables_for_test", ignore_tables); - if(ignore_tables) return; - //_________________________________________________ - bool generate_table; PicsarQuantumSynchrotronCtrl ctrl; std::string filename; @@ -786,6 +779,13 @@ void MultiParticleContainer::InitQuantumSync () } ParallelDescriptor::Barrier(); + //Only temporary for test purposes, will be removed + ParmParse pp("qed_qs"); + bool ignore_tables = false; + pp.query("ignore_tables_for_test", ignore_tables); + if(ignore_tables) return; + //_________________________________________________ + Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); if(!qs_engine.init_lookup_tables_from_raw_data(table_data)) @@ -794,14 +794,6 @@ void MultiParticleContainer::InitQuantumSync () void MultiParticleContainer::InitBreitWheeler () { - - //Only temporary for test purposes, will be removed - ParmParse pp("qed_bw"); - bool ignore_tables = false; - pp.query("ignore_tables_for_test", ignore_tables); - if(ignore_tables) return; - //_________________________________________________ - bool generate_table; PicsarBreitWheelerCtrl ctrl; std::string filename; @@ -814,6 +806,13 @@ void MultiParticleContainer::InitBreitWheeler () } ParallelDescriptor::Barrier(); + //Only temporary for test purposes, will be removed + ParmParse pp("qed_bw"); + bool ignore_tables = false; + pp.query("ignore_tables_for_test", ignore_tables); + if(ignore_tables) return; + //_________________________________________________ + Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); if(!bw_engine.init_lookup_tables_from_raw_data(table_data)) -- cgit v1.2.3 From 98467d93f8d2dda5f9e361797b5d88df16cef04b Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Wed, 23 Oct 2019 18:03:28 +0200 Subject: added barriers --- Source/Particles/MultiParticleContainer.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/Particles/MultiParticleContainer.cpp') diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index 74409a57f..95b9089fb 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -788,6 +788,7 @@ void MultiParticleContainer::InitQuantumSync () Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); + ParallelDescriptor::Barrier(); if(!qs_engine.init_lookup_tables_from_raw_data(table_data)) amrex::Error("Table initialization has failed!\n"); } @@ -815,6 +816,7 @@ void MultiParticleContainer::InitBreitWheeler () Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); + ParallelDescriptor::Barrier(); if(!bw_engine.init_lookup_tables_from_raw_data(table_data)) amrex::Error("Table initialization has failed!\n"); } -- cgit v1.2.3 From 7ce6fa3e8c4e1050ae5511350cdc4095631a6272 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Wed, 23 Oct 2019 18:18:56 +0200 Subject: Improved parsing of inputfile --- Source/Particles/MultiParticleContainer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Source/Particles/MultiParticleContainer.cpp') diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index 95b9089fb..1c240bed1 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -859,7 +859,7 @@ MultiParticleContainer::ParseQuantumSyncParams () std::string load_table_name; pp.query("load_table_from", load_table_name); if(load_table_name != ""s){ - if(ParallelDescriptor::IOProcessor()){ + if(generate_table && ParallelDescriptor::IOProcessor()){ amrex::Print() << "Warning, Quantum Synchrotron table will be loaded, not generated. \n"; } table_name = load_table_name; @@ -917,7 +917,7 @@ MultiParticleContainer::ParseBreitWheelerParams () std::string load_table_name; pp.query("load_table_from", load_table_name); if(load_table_name != ""s){ - if(ParallelDescriptor::IOProcessor()){ + if(generate_table && ParallelDescriptor::IOProcessor()){ amrex::Print() << "Warning, Breit Wheeler table will be loaded, not generated. \n"; } table_name = load_table_name; @@ -936,7 +936,6 @@ MultiParticleContainer::ParseBreitWheelerParams () amrex::Error("Error: Breit Wheeler table has either to be generated or to be loaded.\n"); } - return std::make_tuple(generate_table, table_name, ctrl); } #endif -- cgit v1.2.3