lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.1.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-07-01 10:44:02 +02:00
parent b3bf75a2a1
commit c07cea1fe0
2172 changed files with 183300 additions and 123938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/extended/parallel/MPI/source/src/G4MPIhistoMerger.cc
+3 -3
View File
@@ -31,7 +31,7 @@
#include "G4MPIhistoMerger.hh"
#include "G4MPImanager.hh"
#include "G4ios.hh"
#include "tools/mpi/hmpi"
#include "toolx/mpi/hmpi"
#include <mpi.h>
#include "G4VAnalysisManager.hh"
@@ -54,8 +54,8 @@ void G4MPIhistoMerger::Merge()
G4bool verbose = ( verboseLevel > 1 );
G4int tag = G4MPImanager::kTAG_HISTO;
//const MPI::Intracomm* comm = &COMM_G4COMMAND_;
tools::mpi::hmpi* hmpi
= new tools::mpi::hmpi(G4cout, destination, tag, comm, verbose);
toolx::mpi::hmpi* hmpi
= new toolx::mpi::hmpi(G4cout, destination, tag, comm, verbose);
if ( ! manager->Merge(hmpi) ) {
G4cout<<" Merge FAILED"<<G4endl;
}
examples/extended/parallel/MPI/source/src/G4MPIntupleMerger.cc
+2 -2
View File
@@ -31,7 +31,7 @@
#include "G4RootMpiAnalysisManager.hh"
#include "G4ios.hh"
#include "tools/mpi/wrmpi"
#include "toolx/mpi/wrmpi"
#include <mpi.h>
@@ -57,7 +57,7 @@ G4MPIntupleMerger::G4MPIntupleMerger(G4int nofReducedNtupleFiles,
auto comm = mpiManager->GetAllComm();
// G4int tag = G4MPImanager::kTAG_NTUPLE;
fWrmpi = new tools::mpi::wrmpi(G4cout, *comm);
fWrmpi = new toolx::mpi::wrmpi(G4cout, *comm);
analysisManager->SetMpiNtupleMerging(
fWrmpi, mpiRank, mpiSize, nofReducedNtupleFiles);