Changeset dfed1c for src/mg.cpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1136 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/mg.cpp (modified) (11 diffs)

src/mg.cpp

@@ -21 +21 @@
 #include <string>
 #include <fstream>
-#include <iostream>
 #include <sstream>
+
+#ifdef DEBUG_MEASURE_TIME
+#ifdef HAVE_MPI
+#include <mpi.h>
+#endif
+#endif
 
 #include "base/command_list.hpp"
 #include "base/discretization.hpp"
 #include "base/factory.hpp"
+#include "base/timer.hpp"
 #include "comm/comm.hpp"
+#include "grid/grid.hpp"
 #include "grid/tempgrid.hpp"
 #include "interface/interface.hpp"
+#include "interface/interface_particles_cf.hpp"
 #include "level/level_operator.hpp"
 #include "smoother/smoother.hpp"
@@ -39 +47 @@
 #define REGISTER_COMMAND(a) extern void Initialize##a();Initialize##a();
 
-Factory MG::factory;
+VMG::CommandFactory MG::command_factory;
 
 static void VMGRegisterBuiltinCommands()
@@ -49 +57 @@
   REGISTER_COMMAND(VMGCommandClearCoarseLevels);
   REGISTER_COMMAND(VMGCommandClearGrid);
+  REGISTER_COMMAND(VMGCommandComputeResidualNorm);
   REGISTER_COMMAND(VMGCommandCopyBoundary);
   REGISTER_COMMAND(VMGCommandExecuteCycle);
@@ -58 +67 @@
   REGISTER_COMMAND(VMGCommandImportRightHandSide);
   REGISTER_COMMAND(VMGCommandInterpolateFMG);
+  REGISTER_COMMAND(VMGCommandInitializeIterationCounter);
   REGISTER_COMMAND(VMGCommandInitializeResidualNorm);
+  REGISTER_COMMAND(VMGCommandNOP);
+  REGISTER_COMMAND(VMGCommandPrintAllSettings);
   REGISTER_COMMAND(VMGCommandPrintDefect);
   REGISTER_COMMAND(VMGCommandPrintGridStructure);
@@ -64 +76 @@
   REGISTER_COMMAND(VMGCommandPrintInnerGrid);
   REGISTER_COMMAND(VMGCommandPrintResidualNorm);
+  REGISTER_COMMAND(VMGCommandPrintRunningTime);
   REGISTER_COMMAND(VMGCommandProlongate);
   REGISTER_COMMAND(VMGCommandRestrict);
@@ -75 +88 @@
 MG::MG()
 {
+  state = 0;
   VMGRegisterBuiltinCommands();
 }
@@ -86 +100 @@
 void MG::Destroy()
 {
-  MG::factory.Destroy();
+  MG::Instance()->factories.clear();
+  MG::Instance()->state = 0;
+  Timer::Clear();
 }
 
@@ -95 +111 @@
   Multigrid* sol = new Multigrid(comm, interface);
   Multigrid* rhs = new Multigrid(comm, interface);
-  VMG::TempGrid* temp = new VMG::TempGrid();
+  TempGrid* temp = new TempGrid();
+  TempGrid* global_grid = new TempGrid();
+
+  global_grid->SetPropertiesToGlobalCoarseGrid();
 
   sol->Register("SOL");
   rhs->Register("RHS");
   temp->Register("TEMPGRID");
+  global_grid->Register("GLOBAL_COARSE_GRID");
 
   new ObjectStorage<int>("GLOBAL_MAXLEVEL", sol->GlobalMaxLevel());
@@ -106 +126 @@
 }
 
+void MG::InitializeFromParticleConfigFile(const char* filename)
+{
+  InterfaceParticlesCF interface_particles(filename);
+}
+
 /**
  * Solves a given system with a multigrid method
@@ -112 +137 @@
 void MG::Solve()
 {
-  CommandList* cl_init = factory.GetObject("COMMANDLIST_INIT")->Cast<CommandList>();
-  CommandList* cl_loop = factory.GetObject("COMMANDLIST_LOOP")->Cast<CommandList>();
-  CommandList* cl_finalize = factory.GetObject("COMMANDLIST_FINALIZE")->Cast<CommandList>();
+#ifdef DEBUG_MEASURE_TIME
+#ifdef HAVE_MPI
+  MPI_Barrier(MPI_COMM_WORLD);
+  Timer::Start("CompleteRunningTime");
+#endif
+#endif
+
+  CommandList* cl_init = MG::GetFactory().Get("COMMANDLIST_INIT")->Cast<CommandList>();
+  CommandList* cl_loop = MG::GetFactory().Get("COMMANDLIST_LOOP")->Cast<CommandList>();
+  CommandList* cl_finalize = MG::GetFactory().Get("COMMANDLIST_FINALIZE")->Cast<CommandList>();
 
   cl_init->ExecuteList();
@@ -121 +153 @@
 
   cl_finalize->ExecuteList();
+
+#ifdef DEBUG_MEASURE_TIME
+#ifdef HAVE_MPI
+  MPI_Barrier(MPI_COMM_WORLD);
+  Timer::Stop("CompleteRunningTime");
+  GetComm()->PrintXMLAll("time.xml", Timer::ToString());
+#ifdef DEBUG_OUTPUT
+  Timer::Print();
+#endif
+#endif
+#endif
+}
+
+void MG::SetState(const int& state_)
+{
+  MG::Instance()->state = state_;
+}
+
+VMG::Factory& MG::GetFactory()
+{
+  std::map<int, VMG::Factory>::iterator iter = MG::Instance()->factories.find(MG::Instance()->state);
+
+  if (iter == MG::Instance()->factories.end())
+    iter = MG::Instance()->factories.insert(std::make_pair(MG::Instance()->state, Factory())).first;
+
+  assert(iter != MG::Instance()->factories.end());
+
+  return iter->second;
+}
+
+VMG::CommandFactory& MG::GetCommands()
+{
+  return MG::command_factory;
 }
 
 Comm* MG::GetComm()
 {
-  return factory.GetObject("COMM")->Cast<VMG::Comm>();
+  return MG::GetFactory().Get("COMM")->Cast<VMG::Comm>();
 }
 
 Discretization* MG::GetDiscretization()
 {
-  return factory.GetObject("DISCRETIZATION")->Cast<VMG::Discretization>();
+  return MG::GetFactory().Get("DISCRETIZATION")->Cast<VMG::Discretization>();
 }
 
 LevelOperator* MG::GetLevelOperator()
 {
-  return factory.GetObject("LEVEL_OPERATOR")->Cast<VMG::LevelOperator>();
+  return MG::GetFactory().Get("LEVEL_OPERATOR")->Cast<VMG::LevelOperator>();
 }
 
 Multigrid* MG::GetRhs()
 {
-  return factory.GetObject("RHS")->Cast<VMG::Multigrid>();
+  return MG::GetFactory().Get("RHS")->Cast<VMG::Multigrid>();
 }
 
 Multigrid* MG::GetSol()
 {
-  return factory.GetObject("SOL")->Cast<VMG::Multigrid>();
+  return MG::GetFactory().Get("SOL")->Cast<VMG::Multigrid>();
 }
 
 Smoother* MG::GetSmoother()
 {
-  return factory.GetObject("SMOOTHER")->Cast<VMG::Smoother>();
+  return MG::GetFactory().Get("SMOOTHER")->Cast<VMG::Smoother>();
 }
 
 Solver* MG::GetSolver()
 {
-  return factory.GetObject("SOLVER")->Cast<VMG::Solver>();
+  return MG::GetFactory().Get("SOLVER")->Cast<VMG::Solver>();
 }
 
 TempGrid* MG::GetTempGrid()
 {
-  return factory.GetObject("TEMPGRID")->Cast<VMG::TempGrid>();
-}
-
-Factory& MG::GetFactory()
-{
-  return MG::factory;
+  return MG::GetFactory().Get("TEMPGRID")->Cast<VMG::TempGrid>();
+}
+
+Grid* MG::GetGlobalCoarseGrid()
+{
+  return MG::GetFactory().Get("GLOBAL_COARSE_GRID")->Cast<VMG::Grid>();
 }
 
 Interface* MG::GetInterface()
 {
-  return factory.GetObject("INTERFACE")->Cast<VMG::Interface>();
+  return MG::GetFactory().Get("INTERFACE")->Cast<VMG::Interface>();
 }
 
 static bool CheckObject(std::string id)
 {
-  Object *obj = MG::GetFactory().GetObject(id);
-
-#ifdef DEBUG
+  Object *obj = MG::GetFactory().Get(id);
+
+#ifdef DEBUG_OUTPUT
   if (obj == NULL)
     printf("\nMultigrid: CLASS %s NOT INITIALIZED\n\n", id.c_str());