From 5ceaa8679e6e8dd8fde91b07719d883662206a98 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Mon, 21 Oct 2019 18:55:08 +0200 Subject: correct bug --- Source/Particles/PhotonParticleContainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Particles/PhotonParticleContainer.cpp') diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp index 3c70a957f..3e678fb26 100644 --- a/Source/Particles/PhotonParticleContainer.cpp +++ b/Source/Particles/PhotonParticleContainer.cpp @@ -31,7 +31,7 @@ PhotonParticleContainer::PhotonParticleContainer (AmrCore* amr_core, int ispecie pp.query("do_qed_breit_wheeler", do_qed_breit_wheeler); //Check for processes which do not make sense for photons - bool test_quantum_sync; + bool test_quantum_sync = false; pp.query("do_qed_quantum_sync", test_quantum_sync); AMREX_ALWAYS_ASSERT_WITH_MESSAGE( test_quantum_sync == 0, -- cgit v1.2.3 From fa33c9e67a23ca0cfc48a7a54fea5ec8fd0da015 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Wed, 30 Oct 2019 11:38:16 +0100 Subject: refactoring to comply with new style guidelines --- Source/Diagnostics/ParticleIO.cpp | 2 +- Source/Particles/MultiParticleContainer.H | 12 +-- Source/Particles/MultiParticleContainer.cpp | 36 ++++---- Source/Particles/PhotonParticleContainer.cpp | 6 +- Source/Particles/PhysicalParticleContainer.H | 8 +- Source/Particles/PhysicalParticleContainer.cpp | 24 +++--- Source/Particles/WarpXParticleContainer.H | 2 +- Source/QED/BreitWheelerEngineWrapper.H | 44 +++++----- Source/QED/BreitWheelerEngineWrapper.cpp | 114 ++++++++++++------------- Source/QED/QuantumSyncEngineWrapper.H | 44 +++++----- Source/QED/QuantumSyncEngineWrapper.cpp | 108 +++++++++++------------ 11 files changed, 200 insertions(+), 200 deletions(-) (limited to 'Source/Particles/PhotonParticleContainer.cpp') diff --git a/Source/Diagnostics/ParticleIO.cpp b/Source/Diagnostics/ParticleIO.cpp index d55660b39..3b7481b8c 100644 --- a/Source/Diagnostics/ParticleIO.cpp +++ b/Source/Diagnostics/ParticleIO.cpp @@ -113,7 +113,7 @@ MultiParticleContainer::WritePlotFile (const std::string& dir) const } #ifdef WARPX_QED - if(pc->do_qed){ + if(pc->m_do_qed){ real_names.push_back("tau"); } #endif diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H index 7df0fbdf8..f9a0e51d7 100644 --- a/Source/Particles/MultiParticleContainer.H +++ b/Source/Particles/MultiParticleContainer.H @@ -220,8 +220,8 @@ protected: #ifdef WARPX_QED // The QED engines - std::shared_ptr shr_p_bw_engine; - std::shared_ptr shr_p_qs_engine; + std::shared_ptr m_shr_p_bw_engine; + std::shared_ptr m_shr_p_qs_engine; //_______________________________ /** @@ -231,19 +231,19 @@ protected: void InitQED (); //Variables to store how many species need a QED process - int nspecies_quantum_sync = 0; - int nspecies_breit_wheeler = 0; + int m_nspecies_quantum_sync = 0; + int m_nspecies_breit_wheeler = 0; //________ /** * Returns the number of species having Quantum Synchrotron process enabled */ - int NSpeciesQuantumSync() const { return nspecies_quantum_sync;} + int NSpeciesQuantumSync() const { return m_nspecies_quantum_sync;} /** * Returns the number of species having Breit Wheeler process enabled */ - int NSpeciesBreitWheeler() const { return nspecies_breit_wheeler;} + int NSpeciesBreitWheeler() const { return m_nspecies_breit_wheeler;} /** * Initializes the Quantum Synchrotron engine diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index a30d0699c..8dc969e8f 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -623,22 +623,22 @@ MultiParticleContainer::doFieldIonization () #ifdef WARPX_QED void MultiParticleContainer::InitQED () { - shr_p_qs_engine = std::make_shared(); - shr_p_bw_engine = std::make_shared(); + m_shr_p_qs_engine = std::make_shared(); + m_shr_p_bw_engine = std::make_shared(); - nspecies_quantum_sync = 0; - nspecies_breit_wheeler = 0; + m_nspecies_quantum_sync = 0; + m_nspecies_breit_wheeler = 0; for (auto& pc : allcontainers) { if(pc->has_quantum_sync()){ pc->set_quantum_sync_engine_ptr - (shr_p_qs_engine); - nspecies_quantum_sync++; + (m_shr_p_qs_engine); + m_nspecies_quantum_sync++; } if(pc->has_breit_wheeler()){ pc->set_breit_wheeler_engine_ptr - (shr_p_bw_engine); - nspecies_breit_wheeler++; + (m_shr_p_bw_engine); + m_nspecies_breit_wheeler++; } } @@ -666,8 +666,8 @@ void MultiParticleContainer::InitQuantumSync () if(generate_table && ParallelDescriptor::IOProcessor()){ - shr_p_qs_engine->compute_lookup_tables(ctrl); - Vector all_data = shr_p_qs_engine->export_lookup_tables_data(); + m_shr_p_qs_engine->compute_lookup_tables(ctrl); + Vector all_data = m_shr_p_qs_engine->export_lookup_tables_data(); WarpXUtilIO::WriteBinaryDataOnFile(filename, all_data); } ParallelDescriptor::Barrier(); @@ -679,10 +679,10 @@ void MultiParticleContainer::InitQuantumSync () //No need to initialize from raw data for the processor that //has just generated the table if(!generate_table || !ParallelDescriptor::IOProcessor()){ - shr_p_qs_engine->init_lookup_tables_from_raw_data(table_data); + m_shr_p_qs_engine->init_lookup_tables_from_raw_data(table_data); } - if(!shr_p_qs_engine->are_lookup_tables_initialized()) + if(!m_shr_p_qs_engine->are_lookup_tables_initialized()) amrex::Error("Table initialization has failed!\n"); } @@ -701,8 +701,8 @@ void MultiParticleContainer::InitBreitWheeler () //_________________________________________________ if(generate_table && ParallelDescriptor::IOProcessor()){ - shr_p_bw_engine->compute_lookup_tables(ctrl); - Vector all_data =shr_p_bw_engine->export_lookup_tables_data(); + m_shr_p_bw_engine->compute_lookup_tables(ctrl); + Vector all_data = m_shr_p_bw_engine->export_lookup_tables_data(); WarpXUtilIO::WriteBinaryDataOnFile(filename, all_data); } ParallelDescriptor::Barrier(); @@ -714,10 +714,10 @@ void MultiParticleContainer::InitBreitWheeler () //No need to initialize from raw data for the processor that //has just generated the table if(!generate_table || !ParallelDescriptor::IOProcessor()){ - shr_p_bw_engine->init_lookup_tables_from_raw_data(table_data); + m_shr_p_bw_engine->init_lookup_tables_from_raw_data(table_data); } - if(!shr_p_bw_engine->are_lookup_tables_initialized()) + if(!m_shr_p_bw_engine->are_lookup_tables_initialized()) amrex::Error("Table initialization has failed!\n"); } @@ -725,7 +725,7 @@ std::tuple MultiParticleContainer::ParseQuantumSyncParams () { PicsarQuantumSynchrotronCtrl ctrl = - shr_p_qs_engine->get_default_ctrl(); + m_shr_p_qs_engine->get_default_ctrl(); bool generate_table{false}; std::string table_name; @@ -783,7 +783,7 @@ std::tuple MultiParticleContainer::ParseBreitWheelerParams () { PicsarBreitWheelerCtrl ctrl = - shr_p_bw_engine->get_default_ctrl(); + m_shr_p_bw_engine->get_default_ctrl(); bool generate_table{false}; std::string table_name; diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp index 612da01ca..7e52b52e1 100644 --- a/Source/Particles/PhotonParticleContainer.cpp +++ b/Source/Particles/PhotonParticleContainer.cpp @@ -26,9 +26,9 @@ PhotonParticleContainer::PhotonParticleContainer (AmrCore* amr_core, int ispecie ParmParse pp(species_name); #ifdef WARPX_QED - //IF do_qed is enabled, find out if Breit Wheeler process is enabled - if(do_qed) - pp.query("do_qed_breit_wheeler", do_qed_breit_wheeler); + //IF m_do_qed is enabled, find out if Breit Wheeler process is enabled + if(m_do_qed) + pp.query("do_qed_breit_wheeler", m_do_qed_breit_wheeler); //Check for processes which do not make sense for photons bool test_quantum_sync = false; diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H index ed3a698e2..17a504719 100644 --- a/Source/Particles/PhysicalParticleContainer.H +++ b/Source/Particles/PhysicalParticleContainer.H @@ -220,16 +220,16 @@ protected: #ifdef WARPX_QED // A flag to enable quantum_synchrotron process for leptons - bool do_qed_quantum_sync = false; + bool m_do_qed_quantum_sync = false; // A flag to enable breit_wheeler process [photons only!!] - bool do_qed_breit_wheeler = false; + bool m_do_qed_breit_wheeler = false; // A smart pointer to an instance of a Quantum Synchrotron engine - std::shared_ptr shr_ptr_qs_engine; + std::shared_ptr m_shr_p_qs_engine; // A smart pointer to an instance of a Breit Wheeler engine [photons only!] - std::shared_ptr shr_ptr_bw_engine; + std::shared_ptr m_shr_p_bw_engine; #endif }; diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index fed7266e1..51690d659 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -74,13 +74,13 @@ PhysicalParticleContainer::PhysicalParticleContainer (AmrCore* amr_core, int isp #ifdef WARPX_QED //Add real component if QED is enabled - pp.query("do_qed", do_qed); - if(do_qed) + pp.query("do_qed", m_do_qed); + if(m_do_qed) AddRealComp("tau"); //IF do_qed is enabled, find out if Quantum Synchrotron process is enabled - if(do_qed) - pp.query("do_qed_quantum_sync", do_qed_quantum_sync); + if(m_do_qed) + pp.query("do_qed_quantum_sync", m_do_qed_quantum_sync); //TODO: SHOULD CHECK IF SPECIES IS EITHER ELECTRONS OR POSITRONS!! #endif @@ -91,7 +91,7 @@ PhysicalParticleContainer::PhysicalParticleContainer (AmrCore* amr_core, int isp plot_flag_size += 6; #ifdef WARPX_QED - if(do_qed){ + if(m_do_qed){ // plot_flag will have an entry for the optical depth plot_flag_size++; } @@ -123,7 +123,7 @@ PhysicalParticleContainer::PhysicalParticleContainer (AmrCore* amr_core, int isp } #ifdef WARPX_QED - if(do_qed){ + if(m_do_qed){ //Optical depths is always plotted if QED is on plot_flags[plot_flag_size-1] = 1; } @@ -544,11 +544,11 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) BreitWheelerGetOpticalDepth breit_wheeler_get_opt; if(loc_has_quantum_sync){ quantum_sync_get_opt = - shr_ptr_qs_engine->build_optical_depth_functor(); + m_shr_p_qs_engine->build_optical_depth_functor(); } if(loc_has_breit_wheeler){ breit_wheeler_get_opt = - shr_ptr_bw_engine->build_optical_depth_functor(); + m_shr_p_bw_engine->build_optical_depth_functor(); } #endif @@ -2238,25 +2238,25 @@ PhysicalParticleContainer::AmIALepton(){ bool PhysicalParticleContainer::has_quantum_sync() { - return do_qed_quantum_sync; + return m_do_qed_quantum_sync; } bool PhysicalParticleContainer::has_breit_wheeler() { - return do_qed_breit_wheeler; + return m_do_qed_breit_wheeler; } void PhysicalParticleContainer:: set_breit_wheeler_engine_ptr(std::shared_ptr ptr) { - shr_ptr_bw_engine = ptr; + m_shr_p_bw_engine = ptr; } void PhysicalParticleContainer:: set_quantum_sync_engine_ptr(std::shared_ptr ptr) { - shr_ptr_qs_engine = ptr; + m_shr_p_qs_engine = ptr; } #endif diff --git a/Source/Particles/WarpXParticleContainer.H b/Source/Particles/WarpXParticleContainer.H index b41dcede3..dbd913c5b 100644 --- a/Source/Particles/WarpXParticleContainer.H +++ b/Source/Particles/WarpXParticleContainer.H @@ -320,7 +320,7 @@ protected: int do_back_transformed_diagnostics = 1; #ifdef WARPX_QED - bool do_qed = false; + bool m_do_qed = false; virtual bool has_quantum_sync(){return false;}; virtual bool has_breit_wheeler(){return false;}; diff --git a/Source/QED/BreitWheelerEngineWrapper.H b/Source/QED/BreitWheelerEngineWrapper.H index 3badf78c3..86fdbb1b4 100644 --- a/Source/QED/BreitWheelerEngineWrapper.H +++ b/Source/QED/BreitWheelerEngineWrapper.H @@ -79,8 +79,8 @@ public: size_t TTfunc_size, amrex::Real* TTfunc_coords, amrex::Real* TTfunc_data): - ctrl{t_ctrl}, - lookup_table{ + m_ctrl{t_ctrl}, + m_lookup_table{ TTfunc_size, TTfunc_coords, TTfunc_data @@ -103,7 +103,7 @@ public: amrex::Real bx, amrex::Real by, amrex::Real bz, amrex::Real dt, amrex::Real& opt_depth) const { - bool has_event_happend{false}; + bool has_event_happened{false}; //the library provides the time (< dt) at which the event occurs, but this //feature won't be used in WarpX for now. @@ -115,20 +115,20 @@ public: ex, ey, ez, bx, by, bz, dt, opt_depth, - has_event_happend, unused_event_time, - dummy_lambda, - lookup_table, - ctrl); + has_event_happened, unused_event_time, + m_dummy_lambda, + m_lookup_table, + m_ctrl); - return has_event_happend; + return has_event_happened; } private: //laser wavelenght is not used with SI units - const amrex::Real dummy_lambda{1.0}; + const amrex::Real m_dummy_lambda{1.0}; - const PicsarBreitWheelerCtrl ctrl; - const picsar::multi_physics::lookup_1d lookup_table; + const PicsarBreitWheelerCtrl m_ctrl; + const picsar::multi_physics::lookup_1d m_lookup_table; }; /** @@ -146,8 +146,8 @@ public: */ BreitWheelerGeneratePairs( BreitWheelerEngineInnards& r_innards): - ctrl{r_innards.ctrl}, - lookup_table{ + m_ctrl{r_innards.ctrl}, + m_lookup_table{ r_innards.cum_distrib_coords_1.size(), r_innards.cum_distrib_coords_1.data(), r_innards.cum_distrib_coords_2.size(), @@ -192,18 +192,18 @@ public: e_px, e_py, e_pz, p_px, p_py, p_pz, e_weight, p_weight, - dummy_lambda, - lookup_table, - ctrl, + m_dummy_lambda, + m_lookup_table, + m_ctrl, rand_zero_one_minus_epsi.data()); } private: //laser wavelenght is not used with SI units - const amrex::Real dummy_lambda{1.0}; + const amrex::Real m_dummy_lambda{1.0}; - const PicsarBreitWheelerCtrl ctrl; - const picsar::multi_physics::lookup_2d lookup_table; + const PicsarBreitWheelerCtrl m_ctrl; + const picsar::multi_physics::lookup_2d m_lookup_table; }; // Factory class ============================= @@ -266,13 +266,13 @@ public: PicsarBreitWheelerCtrl get_default_ctrl() const; private: - bool lookup_tables_initialized = false; + bool m_lookup_tables_initialized = false; - BreitWheelerEngineInnards innards; + BreitWheelerEngineInnards m_innards; //Table builing is available only if WarpX is compiled with QED_TABLE_GEN=TRUE #ifdef WARPX_QED_TABLE_GEN - BreitWheelerEngineTableBuilder table_builder; + BreitWheelerEngineTableBuilder m_table_builder; #endif }; diff --git a/Source/QED/BreitWheelerEngineWrapper.cpp b/Source/QED/BreitWheelerEngineWrapper.cpp index f84754462..76d28d66a 100644 --- a/Source/QED/BreitWheelerEngineWrapper.cpp +++ b/Source/QED/BreitWheelerEngineWrapper.cpp @@ -24,25 +24,25 @@ BreitWheelerEngine::build_optical_depth_functor () BreitWheelerEvolveOpticalDepth BreitWheelerEngine::build_evolve_functor () { - AMREX_ALWAYS_ASSERT(lookup_tables_initialized); + AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return BreitWheelerEvolveOpticalDepth(innards.ctrl, - innards.TTfunc_coords.size(), - innards.TTfunc_coords.dataPtr(), - innards.TTfunc_data.dataPtr() ); + return BreitWheelerEvolveOpticalDepth(m_innards.ctrl, + m_innards.TTfunc_coords.size(), + m_innards.TTfunc_coords.dataPtr(), + m_innards.TTfunc_data.dataPtr() ); } BreitWheelerGeneratePairs BreitWheelerEngine::build_pair_functor () { - AMREX_ALWAYS_ASSERT(lookup_tables_initialized); + AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return BreitWheelerGeneratePairs(innards); + return BreitWheelerGeneratePairs(m_innards); } bool BreitWheelerEngine::are_lookup_tables_initialized () const { - return lookup_tables_initialized; + return m_lookup_tables_initialized; } bool @@ -54,91 +54,91 @@ BreitWheelerEngine::init_lookup_tables_from_raw_data ( bool is_ok; //Header (control parameters) - tie(is_ok, innards.ctrl.chi_phot_min, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_phot_min, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_phot_tdndt_min, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_phot_tdndt_min, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_phot_tdndt_max, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_phot_tdndt_max, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_phot_tdndt_how_many, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_phot_tdndt_how_many, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_phot_tpair_min, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_phot_tpair_min, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_phot_tpair_max, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_phot_tpair_max, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_phot_tpair_how_many, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_phot_tpair_how_many, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_frac_tpair_how_many, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_frac_tpair_how_many, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; //___________________________ //Data - Vector tndt_coords(innards.ctrl.chi_phot_tdndt_how_many); - Vector tndt_data(innards.ctrl.chi_phot_tdndt_how_many); - Vector cum_tab_coords1(innards.ctrl.chi_phot_tpair_how_many); - Vector cum_tab_coords2(innards.ctrl.chi_frac_tpair_how_many); - Vector cum_tab_data(innards.ctrl.chi_phot_tpair_how_many* - innards.ctrl.chi_frac_tpair_how_many); + Vector tndt_coords(m_innards.ctrl.chi_phot_tdndt_how_many); + Vector tndt_data(m_innards.ctrl.chi_phot_tdndt_how_many); + Vector cum_tab_coords1(m_innards.ctrl.chi_phot_tpair_how_many); + Vector cum_tab_coords2(m_innards.ctrl.chi_frac_tpair_how_many); + Vector cum_tab_data(m_innards.ctrl.chi_phot_tpair_how_many* + m_innards.ctrl.chi_frac_tpair_how_many); tie(is_ok, tndt_coords, p_data) = parse_raw_data_vec( p_data, tndt_coords.size(), p_last); if(!is_ok) return false; - innards.TTfunc_coords.assign(tndt_coords.begin(), tndt_coords.end()); + m_innards.TTfunc_coords.assign(tndt_coords.begin(), tndt_coords.end()); tie(is_ok, tndt_data, p_data) = parse_raw_data_vec( p_data, tndt_data.size(), p_last); if(!is_ok) return false; - innards.TTfunc_data.assign(tndt_data.begin(), tndt_data.end()); + m_innards.TTfunc_data.assign(tndt_data.begin(), tndt_data.end()); tie(is_ok, cum_tab_coords1, p_data) = parse_raw_data_vec( p_data, cum_tab_coords1.size(), p_last); if(!is_ok) return false; - innards.cum_distrib_coords_1.assign( + m_innards.cum_distrib_coords_1.assign( cum_tab_coords1.begin(), cum_tab_coords1.end()); tie(is_ok, cum_tab_coords2, p_data) = parse_raw_data_vec( p_data, cum_tab_coords2.size(), p_last); if(!is_ok) return false; - innards.cum_distrib_coords_2.assign( + m_innards.cum_distrib_coords_2.assign( cum_tab_coords2.begin(), cum_tab_coords2.end()); tie(is_ok, cum_tab_data, p_data) = parse_raw_data_vec( p_data, cum_tab_data.size(), p_last); if(!is_ok) return false; - innards.cum_distrib_data.assign( + m_innards.cum_distrib_data.assign( cum_tab_data.begin(), cum_tab_data.end()); //___________________________ - lookup_tables_initialized = true; + m_lookup_tables_initialized = true; return true; } @@ -147,7 +147,7 @@ Vector BreitWheelerEngine::export_lookup_tables_data () const { Vector res{}; - if(!lookup_tables_initialized) + if(!m_lookup_tables_initialized) return res; auto add_data_to_buf = [&res](auto data){ @@ -157,14 +157,14 @@ Vector BreitWheelerEngine::export_lookup_tables_data () const sizeof(data)); }; - add_data_to_buf(innards.ctrl.chi_phot_min); - add_data_to_buf(innards.ctrl.chi_phot_tdndt_min); - add_data_to_buf(innards.ctrl.chi_phot_tdndt_max); - add_data_to_buf(innards.ctrl.chi_phot_tdndt_how_many); - add_data_to_buf(innards.ctrl.chi_phot_tpair_min); - add_data_to_buf(innards.ctrl.chi_phot_tpair_max); - add_data_to_buf(innards.ctrl.chi_phot_tpair_how_many); - add_data_to_buf(innards.ctrl.chi_frac_tpair_how_many); + add_data_to_buf(m_innards.ctrl.chi_phot_min); + add_data_to_buf(m_innards.ctrl.chi_phot_tdndt_min); + add_data_to_buf(m_innards.ctrl.chi_phot_tdndt_max); + add_data_to_buf(m_innards.ctrl.chi_phot_tdndt_how_many); + add_data_to_buf(m_innards.ctrl.chi_phot_tpair_min); + add_data_to_buf(m_innards.ctrl.chi_phot_tpair_max); + add_data_to_buf(m_innards.ctrl.chi_phot_tpair_how_many); + add_data_to_buf(m_innards.ctrl.chi_frac_tpair_how_many); auto add_data_to_buf_vv = [&res](const auto* data, size_t how_many){ res.insert(res.end(), @@ -173,16 +173,16 @@ Vector BreitWheelerEngine::export_lookup_tables_data () const sizeof(*data)*how_many); }; - add_data_to_buf_vv(innards.TTfunc_coords.data(), - innards.TTfunc_coords.size()); - add_data_to_buf_vv(innards.TTfunc_data.data(), - innards.TTfunc_data.size()); - add_data_to_buf_vv(innards.cum_distrib_coords_1.data(), - innards.cum_distrib_coords_1.size()); - add_data_to_buf_vv(innards.cum_distrib_coords_2.data(), - innards.cum_distrib_coords_2.size()); - add_data_to_buf_vv(innards.cum_distrib_data.data(), - innards.cum_distrib_data.size()); + add_data_to_buf_vv(m_innards.TTfunc_coords.data(), + m_innards.TTfunc_coords.size()); + add_data_to_buf_vv(m_innards.TTfunc_data.data(), + m_innards.TTfunc_data.size()); + add_data_to_buf_vv(m_innards.cum_distrib_coords_1.data(), + m_innards.cum_distrib_coords_1.size()); + add_data_to_buf_vv(m_innards.cum_distrib_coords_2.data(), + m_innards.cum_distrib_coords_2.size()); + add_data_to_buf_vv(m_innards.cum_distrib_data.data(), + m_innards.cum_distrib_data.size()); return res; } @@ -197,8 +197,8 @@ void BreitWheelerEngine::compute_lookup_tables ( PicsarBreitWheelerCtrl ctrl) { #ifdef WARPX_QED_TABLE_GEN - table_builder.compute_table(ctrl, innards); - lookup_tables_initialized = true; + m_table_builder.compute_table(ctrl, m_innards); + m_lookup_tables_initialized = true; #endif } diff --git a/Source/QED/QuantumSyncEngineWrapper.H b/Source/QED/QuantumSyncEngineWrapper.H index 1d74e9bbb..7d7fe5b6b 100644 --- a/Source/QED/QuantumSyncEngineWrapper.H +++ b/Source/QED/QuantumSyncEngineWrapper.H @@ -79,8 +79,8 @@ public: */ QuantumSynchrotronEvolveOpticalDepth( QuantumSynchrotronEngineInnards& r_innards): - ctrl{r_innards.ctrl}, - lookup_table{ + m_ctrl{r_innards.ctrl}, + m_lookup_table{ r_innards.KKfunc_data.size(), r_innards.KKfunc_coords.data(), r_innards.KKfunc_data.data() @@ -103,7 +103,7 @@ public: amrex::Real bx, amrex::Real by, amrex::Real bz, amrex::Real dt, amrex::Real& opt_depth) const { - bool has_event_happend{false}; + bool has_event_happened{false}; //the library provides the time (< dt) at which the event occurs, but this //feature won't be used in WarpX for now. @@ -115,20 +115,20 @@ public: ex, ey, ez, bx, by, bz, dt, opt_depth, - has_event_happend, unused_event_time, - dummy_lambda, - lookup_table, - ctrl); + has_event_happened, unused_event_time, + m_dummy_lambda, + m_lookup_table, + m_ctrl); - return has_event_happend; + return has_event_happened; } private: //laser wavelenght is not used with SI units - const amrex::Real dummy_lambda{1.0}; + const amrex::Real m_dummy_lambda{1.0}; - const PicsarQuantumSynchrotronCtrl ctrl; - const picsar::multi_physics::lookup_1d lookup_table; + const PicsarQuantumSynchrotronCtrl m_ctrl; + const picsar::multi_physics::lookup_1d m_lookup_table; }; /** @@ -146,8 +146,8 @@ public: */ QuantumSynchrotronGeneratePhotonAndUpdateMomentum( QuantumSynchrotronEngineInnards& r_innards): - ctrl{r_innards.ctrl}, - lookup_table{ + m_ctrl{r_innards.ctrl}, + m_lookup_table{ r_innards.cum_distrib_coords_1.size(), r_innards.cum_distrib_coords_1.data(), r_innards.cum_distrib_coords_2.size(), @@ -189,18 +189,18 @@ public: weight, sampling, g_px, g_py, g_pz, g_weight, - dummy_lambda, - lookup_table, - ctrl, + m_dummy_lambda, + m_lookup_table, + m_ctrl, rand_zero_one_minus_epsi.data()); } private: //laser wavelenght is not used with SI units - const amrex::Real dummy_lambda{1.0}; + const amrex::Real m_dummy_lambda{1.0}; - const PicsarQuantumSynchrotronCtrl ctrl; - const picsar::multi_physics::lookup_2d lookup_table; + const PicsarQuantumSynchrotronCtrl m_ctrl; + const picsar::multi_physics::lookup_2d m_lookup_table; }; // Factory class ============================= @@ -263,13 +263,13 @@ public: PicsarQuantumSynchrotronCtrl get_default_ctrl() const; private: - bool lookup_tables_initialized = false; + bool m_lookup_tables_initialized = false; - QuantumSynchrotronEngineInnards innards; + QuantumSynchrotronEngineInnards m_innards; //Table builing is available only if the libray is compiled with QED_TABLE_GEN=TRUE #ifdef WARPX_QED_TABLE_GEN - QuantumSynchrotronEngineTableBuilder table_builder; + QuantumSynchrotronEngineTableBuilder m_table_builder; #endif }; diff --git a/Source/QED/QuantumSyncEngineWrapper.cpp b/Source/QED/QuantumSyncEngineWrapper.cpp index 13bc178d3..8606d19ae 100644 --- a/Source/QED/QuantumSyncEngineWrapper.cpp +++ b/Source/QED/QuantumSyncEngineWrapper.cpp @@ -23,22 +23,22 @@ QuantumSynchrotronEngine::build_optical_depth_functor () QuantumSynchrotronEvolveOpticalDepth QuantumSynchrotronEngine::build_evolve_functor () { - AMREX_ALWAYS_ASSERT(lookup_tables_initialized); + AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return QuantumSynchrotronEvolveOpticalDepth(innards); + return QuantumSynchrotronEvolveOpticalDepth(m_innards); } QuantumSynchrotronGeneratePhotonAndUpdateMomentum QuantumSynchrotronEngine::build_phot_em_functor () { - AMREX_ALWAYS_ASSERT(lookup_tables_initialized); + AMREX_ALWAYS_ASSERT(m_lookup_tables_initialized); - return QuantumSynchrotronGeneratePhotonAndUpdateMomentum(innards); + return QuantumSynchrotronGeneratePhotonAndUpdateMomentum(m_innards); } bool QuantumSynchrotronEngine::are_lookup_tables_initialized () const { - return lookup_tables_initialized; + return m_lookup_tables_initialized; } bool @@ -50,91 +50,91 @@ QuantumSynchrotronEngine::init_lookup_tables_from_raw_data ( bool is_ok; //Header (control parameters) - tie(is_ok, innards.ctrl.chi_part_min, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_part_min, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_part_tdndt_min, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_part_tdndt_min, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_part_tdndt_max, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_part_tdndt_max, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_part_tdndt_how_many, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_part_tdndt_how_many, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_part_tem_min, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_part_tem_min, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_part_tem_max, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_part_tem_max, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.chi_part_tem_how_many, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.chi_part_tem_how_many, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; - tie(is_ok, innards.ctrl.prob_tem_how_many, p_data) = - parse_raw_data( + tie(is_ok, m_innards.ctrl.prob_tem_how_many, p_data) = + parse_raw_data( p_data, p_last); if(!is_ok) return false; //___________________________ //Data - Vector tndt_coords(innards.ctrl.chi_part_tdndt_how_many); - Vector tndt_data(innards.ctrl.chi_part_tdndt_how_many); - Vector cum_tab_coords1(innards.ctrl.chi_part_tem_how_many); - Vector cum_tab_coords2(innards.ctrl.prob_tem_how_many); - Vector cum_tab_data(innards.ctrl.chi_part_tem_how_many* - innards.ctrl.prob_tem_how_many); + Vector tndt_coords(m_innards.ctrl.chi_part_tdndt_how_many); + Vector tndt_data(m_innards.ctrl.chi_part_tdndt_how_many); + Vector cum_tab_coords1(m_innards.ctrl.chi_part_tem_how_many); + Vector cum_tab_coords2(m_innards.ctrl.prob_tem_how_many); + Vector cum_tab_data(m_innards.ctrl.chi_part_tem_how_many* + m_innards.ctrl.prob_tem_how_many); tie(is_ok, tndt_coords, p_data) = parse_raw_data_vec( p_data, tndt_coords.size(), p_last); if(!is_ok) return false; - innards.KKfunc_coords.assign(tndt_coords.begin(), tndt_coords.end()); + m_innards.KKfunc_coords.assign(tndt_coords.begin(), tndt_coords.end()); tie(is_ok, tndt_data, p_data) = parse_raw_data_vec( p_data, tndt_data.size(), p_last); if(!is_ok) return false; - innards.KKfunc_data.assign(tndt_data.begin(), tndt_data.end()); + m_innards.KKfunc_data.assign(tndt_data.begin(), tndt_data.end()); tie(is_ok, cum_tab_coords1, p_data) = parse_raw_data_vec( p_data, cum_tab_coords1.size(), p_last); if(!is_ok) return false; - innards.cum_distrib_coords_1.assign( + m_innards.cum_distrib_coords_1.assign( cum_tab_coords1.begin(), cum_tab_coords1.end()); tie(is_ok, cum_tab_coords2, p_data) = parse_raw_data_vec( p_data, cum_tab_coords2.size(), p_last); if(!is_ok) return false; - innards.cum_distrib_coords_2.assign( + m_innards.cum_distrib_coords_2.assign( cum_tab_coords2.begin(), cum_tab_coords2.end()); tie(is_ok, cum_tab_data, p_data) = parse_raw_data_vec( p_data, cum_tab_data.size(), p_last); if(!is_ok) return false; - innards.cum_distrib_data.assign( + m_innards.cum_distrib_data.assign( cum_tab_data.begin(), cum_tab_data.end()); //___________________________ - lookup_tables_initialized = true; + m_lookup_tables_initialized = true; return true; } @@ -143,7 +143,7 @@ Vector QuantumSynchrotronEngine::export_lookup_tables_data () const { Vector res{}; - if(!lookup_tables_initialized) + if(!m_lookup_tables_initialized) return res; auto add_data_to_buf = [&res](auto data){ @@ -153,14 +153,14 @@ Vector QuantumSynchrotronEngine::export_lookup_tables_data () const sizeof(data)); }; - add_data_to_buf(innards.ctrl.chi_part_min); - add_data_to_buf(innards.ctrl.chi_part_tdndt_min); - add_data_to_buf(innards.ctrl.chi_part_tdndt_max); - add_data_to_buf(innards.ctrl.chi_part_tdndt_how_many); - add_data_to_buf(innards.ctrl.chi_part_tem_min); - add_data_to_buf(innards.ctrl.chi_part_tem_max); - add_data_to_buf(innards.ctrl.chi_part_tem_how_many); - add_data_to_buf(innards.ctrl.prob_tem_how_many); + add_data_to_buf(m_innards.ctrl.chi_part_min); + add_data_to_buf(m_innards.ctrl.chi_part_tdndt_min); + add_data_to_buf(m_innards.ctrl.chi_part_tdndt_max); + add_data_to_buf(m_innards.ctrl.chi_part_tdndt_how_many); + add_data_to_buf(m_innards.ctrl.chi_part_tem_min); + add_data_to_buf(m_innards.ctrl.chi_part_tem_max); + add_data_to_buf(m_innards.ctrl.chi_part_tem_how_many); + add_data_to_buf(m_innards.ctrl.prob_tem_how_many); auto add_data_to_buf_vv = [&res](const auto* data, size_t how_many){ res.insert(res.end(), @@ -169,16 +169,16 @@ Vector QuantumSynchrotronEngine::export_lookup_tables_data () const sizeof(*data)*how_many); }; - add_data_to_buf_vv(innards.KKfunc_coords.data(), - innards.KKfunc_coords.size()); - add_data_to_buf_vv(innards.KKfunc_data.data(), - innards.KKfunc_data.size()); - add_data_to_buf_vv(innards.cum_distrib_coords_1.data(), - innards.cum_distrib_coords_1.size()); - add_data_to_buf_vv(innards.cum_distrib_coords_2.data(), - innards.cum_distrib_coords_2.size()); - add_data_to_buf_vv(innards.cum_distrib_data.data(), - innards.cum_distrib_data.size()); + add_data_to_buf_vv(m_innards.KKfunc_coords.data(), + m_innards.KKfunc_coords.size()); + add_data_to_buf_vv(m_innards.KKfunc_data.data(), + m_innards.KKfunc_data.size()); + add_data_to_buf_vv(m_innards.cum_distrib_coords_1.data(), + m_innards.cum_distrib_coords_1.size()); + add_data_to_buf_vv(m_innards.cum_distrib_coords_2.data(), + m_innards.cum_distrib_coords_2.size()); + add_data_to_buf_vv(m_innards.cum_distrib_data.data(), + m_innards.cum_distrib_data.size()); return res; } @@ -193,8 +193,8 @@ void QuantumSynchrotronEngine::compute_lookup_tables ( PicsarQuantumSynchrotronCtrl ctrl) { #ifdef WARPX_QED_TABLE_GEN - table_builder.compute_table(ctrl, innards); - lookup_tables_initialized = true; + m_table_builder.compute_table(ctrl, m_innards); + m_lookup_tables_initialized = true; #endif } -- cgit v1.2.3