Changeset 1337 for trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPImessenger.cc

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPImessenger.cc (modified) (7 diffs)

trunk/examples/extended/parallel/MPI/mpi_interface/src/G4MPImessenger.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4MPImessenger.cc,v 1.1 2007/11/16 14:05:41 kmura Exp $
-// $Name:  $
+// $Id: G4MPImessenger.cc,v 1.2 2010/05/18 06:06:21 kmura Exp $
+// $Name: geant4-09-04-beta-01 $
 //
 // ====================================================================
@@ -72 +72 @@
   execute= new G4UIcmdWithAString("/mpi/execute", this);
   execute-> SetGuidance("Execute a macro file. (=/control/execute)");
-  execute-> SetParameterName("fileName", false, false);  
+  execute-> SetParameterName("fileName", false, false);
 
   // /mpi/beamOn
@@ -88 +88 @@
 
   // /mpi/.beamOn
-  dotbeamOn= new G4UIcmdWithAnInteger("/mpi/.beamOn", this);
-  dotbeamOn-> SetGuidance("Start a parallel run w/o thread. (=/run/beamOn)");
-  dotbeamOn-> SetParameterName("numberOfEvent", true, false);
-  dotbeamOn-> SetDefaultValue(1);
-  dotbeamOn-> SetRange("numberOfEvent>=0");
+  dotbeamOn= new G4UIcommand("/mpi/.beamOn", this);
+  dotbeamOn-> SetGuidance("Start a parallel run w/o thread.");
+
+  p1= new G4UIparameter("numberOfEvent", 'i', true);
+  p1-> SetDefaultValue(1);
+  p1-> SetParameterRange("numberOfEvent>=0");
+  dotbeamOn-> SetParameter(p1);
+
+  p2= new G4UIparameter("divide", 'b', true);
+  p2-> SetDefaultValue(true);
+  dotbeamOn-> SetParameter(p2);
 
   // /mpi/weightForMaster
@@ -99 +105 @@
   masterWeight-> SetParameterName("weight", false, false);
   masterWeight-> SetRange("weight>=0. && weight<=1.");
+
+  // /mpi/wait
+  waitall= new G4UIcmdWithoutParameter("/mpi/wait", this);
+  waitall-> SetGuidance( "Wait until beamOn-s on all nodes are done. "
+                         "(batch mode only)");
 
   // /mpi/showSeeds
@@ -132 +143 @@
   delete dotbeamOn;
   delete masterWeight;
+  delete waitall;
   delete showSeeds;
   delete setMasterSeed;
   delete setSeed;
-  
+
   delete dir;
 }
@@ -162 +174 @@
 
   } else if (command == dotbeamOn){ // /mpi/.beamOn
-    G4int nevent= dotbeamOn-> GetNewIntValue(newValue);
-    g4MPI-> BeamOn(nevent);
+    std::istringstream is(newValue);
+    G4int nevent;
+    G4bool qdivide;
+    is >> nevent >> qdivide;
+    g4MPI-> BeamOn(nevent, qdivide);
 
   } else if (command == masterWeight){ // /mpi/masterWeight
     G4double weight= masterWeight-> GetNewDoubleValue(newValue);
     g4MPI-> SetMasterWeight(weight);
-    
+
+  } else if (command == waitall) {
+    g4MPI-> WaitBeamOn();
+
   } else if (command == showSeeds){ // /mpi/showSeeds
     g4MPI-> ShowSeeds();
-  
+
   } else if (command == setMasterSeed){ // /mpi/setMasterSeed
     std::istringstream is(newValue);
@@ -178 +196 @@
     g4MPI-> GetSeedGenerator()-> SetMasterSeed(seed);
     g4MPI-> DistributeSeeds();
-    
+
   } else if (command == setSeed){ // /mpi/setSeed
     std::istringstream is(newValue);