aboutsummaryrefslogtreecommitdiff
path: root/Source/Particles/MultiParticleContainer.cpp
diff options
context:
space:
mode:
authorGravatar Luca Fedeli <luca.fedeli@cea.fr> 2019-10-23 18:22:17 +0200
committerGravatar Luca Fedeli <luca.fedeli@cea.fr> 2019-10-23 18:22:17 +0200
commit388551d117d323840538f5ecf34c39992ba4b7ef (patch)
tree4daf86518f33f1936bf36db65524fa09faea14d8 /Source/Particles/MultiParticleContainer.cpp
parentc1f4051110836f2161a946ee7c38b53cbd286bb6 (diff)
parent666b59ed16d2adfcba94b9b0a908d4ad6b228a16 (diff)
downloadWarpX-388551d117d323840538f5ecf34c39992ba4b7ef.tar.gz
WarpX-388551d117d323840538f5ecf34c39992ba4b7ef.tar.zst
WarpX-388551d117d323840538f5ecf34c39992ba4b7ef.zip
Merge remote-tracking branch 'origin/qed_bw_qs_factory_class' into qed_evolve_optical_depth
Diffstat (limited to 'Source/Particles/MultiParticleContainer.cpp')
-rw-r--r--Source/Particles/MultiParticleContainer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
index 74409a57f..1c240bed1 100644
--- a/Source/Particles/MultiParticleContainer.cpp
+++ b/Source/Particles/MultiParticleContainer.cpp
@@ -788,6 +788,7 @@ void MultiParticleContainer::InitQuantumSync ()
Vector<char> 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<char> 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");
}
@@ -857,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;
@@ -915,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;
@@ -934,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