Changeset ac6d04 for src/mg.cpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

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

src/mg.cpp

@@ -18 +18 @@
 #ifdef HAVE_MPI
 #include <mpi.h>
+#ifdef HAVE_MARMOT
+#include <enhancempicalls.h>
+#include <sourceinfompicalls.h>
+#endif
 #endif
 #endif
@@ -74 +78 @@
   REGISTER_COMMAND(VMGCommandPrintGridStructure);
   REGISTER_COMMAND(VMGCommandPrintGrid);
-  REGISTER_COMMAND(VMGCommandPrintInnerGrid);
   REGISTER_COMMAND(VMGCommandPrintResidualNorm);
   REGISTER_COMMAND(VMGCommandPrintRunningTime);
@@ -112 +115 @@
   Multigrid* rhs = new Multigrid(comm, interface);
   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());
@@ -148 +147 @@
 #ifdef HAVE_MPI
   MPI_Barrier(MPI_COMM_WORLD);
+#endif
   Timer::Start("CompleteRunningTime");
-#endif
 #endif
 
@@ -165 +164 @@
 #ifdef HAVE_MPI
   MPI_Barrier(MPI_COMM_WORLD);
+#endif
   Timer::Stop("CompleteRunningTime");
+#ifdef DEBUG_MEASURE_TIME_OUTPUT
+#ifdef HAVE_MPI
+  Timer::PrintGlobal();
+#else
+  Timer::Print();
+#endif
 #endif
 #endif
@@ -230 +236 @@
 {
   return MG::GetFactory().Get("TEMPGRID")->Cast<VMG::TempGrid>();
-}
-
-Grid* MG::GetGlobalCoarseGrid()
-{
-  return MG::GetFactory().Get("GLOBAL_COARSE_GRID")->Cast<VMG::Grid>();
 }