Changeset b57b9b for src/mg.cpp

Timestamp:

Sep 20, 2012, 1:54:01 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

c3acbb

Parents:

2d3854

Message:

vmg: Simplified API.

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

File:

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

src/mg.cpp

@@ -57 +57 @@
 #include "base/timer.hpp"
 #include "comm/comm.hpp"
+#include "cycles/cycle.hpp"
 #include "grid/grid.hpp"
 #include "grid/tempgrid.hpp"
@@ -130 +131 @@
 void MG::PostInit()
 {
-  Multigrid* sol = new Multigrid(GetComm(), GetInterface());
-  sol->Register("SOL");
-
-  Multigrid* rhs = new Multigrid(GetComm(), GetInterface());
-  rhs->Register("RHS");
-
-  TempGrid* temp = new TempGrid();
-  temp->Register("TEMPGRID");
-
-  new ObjectStorage<int>("GLOBAL_MAXLEVEL", sol->GlobalMaxLevel());
-  new ObjectStorage<int>("MINLEVEL", sol->MinLevel());
-  new ObjectStorage<int>("MAXLEVEL", sol->MaxLevel());
-
-  GetComm()->PostInit(*GetSol(), *GetRhs());
+  if (GetFactory().TestObject("COMM") && GetFactory().TestObject("INTERFACE")) {
+
+    Multigrid* sol = new Multigrid(GetComm(), GetInterface());
+    sol->Register("SOL");
+
+    Multigrid* rhs = new Multigrid(GetComm(), GetInterface());
+    rhs->Register("RHS");
+
+    TempGrid* temp = new TempGrid();
+    temp->Register("TEMPGRID");
+
+    new ObjectStorage<int>("GLOBAL_MAXLEVEL", sol->GlobalMaxLevel());
+    new ObjectStorage<int>("MINLEVEL", sol->MinLevel());
+    new ObjectStorage<int>("MAXLEVEL", sol->MaxLevel());
+
+    if (GetFactory().TestObject("CYCLE"))
+      GetCycle()->Generate();
+
+    if (GetFactory().TestObject("COMM"))
+      GetComm()->PostInit(*GetSol(), *GetRhs());
+
+  }
 }
 
@@ -211 +220 @@
 }
 
+Cycle* MG::GetCycle()
+{
+  return MG::GetFactory().Get("CYCLE")->Cast<VMG::Cycle>();
+}
+
 Discretization* MG::GetDiscretization()
 {
@@ -261 +275 @@
 }
 
-static bool CheckObject(std::string id)
-{
-  Object *obj = MG::GetFactory().Get(id);
-
-#ifdef DEBUG_OUTPUT
-  if (obj == NULL)
-    printf("\nMultigrid: CLASS %s NOT INITIALIZED\n\n", id.c_str());
-#endif
-
-  return obj != NULL;
-}
-
 bool MG::IsInitialized()
 {
+  const Factory& f = GetFactory();
+
   bool init = true;
 
-  init &= CheckObject("COMM");
-  init &= CheckObject("LEVEL_OPERATOR");
-  init &= CheckObject("RHS");
-  init &= CheckObject("SOL");
-  init &= CheckObject("SOLVER");
-  init &= CheckObject("SMOOTHER");
-  init &= CheckObject("DISCRETIZATION");
-  init &= CheckObject("MAX_ITERATION");
-  init &= CheckObject("PRECISION");
-  init &= CheckObject("PRESMOOTHSTEPS");
-  init &= CheckObject("POSTSMOOTHSTEPS");
-  init &= CheckObject("COMMANDLIST_INIT");
-  init &= CheckObject("COMMANDLIST_LOOP");
-  init &= CheckObject("COMMANDLIST_FINALIZE");
-  init &= CheckObject("MINLEVEL");
-  init &= CheckObject("MAXLEVEL");
-  init &= CheckObject("GLOBAL_MAXLEVEL");
-  init &= CheckObject("INTERFACE");
+  init &= f.TestObject("COMM");
+  init &= f.TestObject("LEVEL_OPERATOR");
+  init &= f.TestObject("RHS");
+  init &= f.TestObject("SOL");
+  init &= f.TestObject("SOLVER");
+  init &= f.TestObject("SMOOTHER");
+  init &= f.TestObject("DISCRETIZATION");
+  init &= f.TestObject("MAX_ITERATION");
+  init &= f.TestObject("PRECISION");
+  init &= f.TestObject("PRESMOOTHSTEPS");
+  init &= f.TestObject("POSTSMOOTHSTEPS");
+  init &= f.TestObject("COMMANDLIST_INIT");
+  init &= f.TestObject("COMMANDLIST_LOOP");
+  init &= f.TestObject("COMMANDLIST_FINALIZE");
+  init &= f.TestObject("MINLEVEL");
+  init &= f.TestObject("MAXLEVEL");
+  init &= f.TestObject("GLOBAL_MAXLEVEL");
+  init &= f.TestObject("INTERFACE");
 
   return init;