Change of doc style.

AMDiS/src/AdaptInstationary.cc

@@ -408,9 +408,9 @@ namespace AMDiS {
   bool AdaptInstationary::checkQueueRuntime()
   {
     // If there is no time limited runtime queue, there is also nothing to check.
-    if (queueRuntime == -1) {
+    if (queueRuntime == -1)
       return false;
-    }
+    
     // Get the current time.
     time_t currentTimestamp = time(NULL);
 

AMDiS/src/AdaptInstationary.h

@@ -44,10 +44,8 @@ namespace AMDiS {
   class AdaptInstationary : public AdaptBase
   {
   public:
-    /** \brief
-     * Creates a AdaptInstationary object with the given name for the time 
-     * dependent problem problemInstat. TODO: Make obsolete!
-     */
+    /// Creates a AdaptInstationary object with the given name for the time 
+    /// dependent problem problemInstat. TODO: Make obsolete!
     AdaptInstationary(string name, 
 		      ProblemIterationInterface *problemStat,
 		      AdaptInfo *info,
@@ -55,10 +53,8 @@ namespace AMDiS {
 		      AdaptInfo *initialInfo,
                       time_t initialTimestampSet = 0);
 
-    /** \brief
-     * Creates a AdaptInstationary object with the given name for the time 
-     * dependent problem problemInstat.
-     */
+    /// Creates a AdaptInstationary object with the given name for the time 
+    /// dependent problem problemInstat.
     AdaptInstationary(string name, 
 		      ProblemIterationInterface &problemStat,
 		      AdaptInfo &info,
@@ -91,6 +87,7 @@ namespace AMDiS {
     {
       return strategy;
     }
+
     /// Implementation of AdaptBase::adapt()
     virtual int adapt();
 
@@ -149,42 +146,33 @@ namespace AMDiS {
     /// Parameter \f$ \delta_2 \f$ used in time step enlargement
     double timeDelta2;
 
-    /** \brief
-     * If this parameter is 1 and the instationary problem is stable, hence the number
-     * of solver iterations to solve the problem is zero, the adaption loop will stop.
-     */
+    /// If this parameter is 1 and the instationary problem is stable, hence the number
+    /// of solver iterations to solve the problem is zero, the adaption loop will stop.
     int breakWhenStable;
+
     ///
     bool fixedTimestep;
 
-    /** \brief
-     * Runtime of the queue (of the servers batch system) in seconds. If the problem
-     * runs on a computer/server without a time limited queue, the value is -1.
-     */
+    /// Runtime of the queue (of the servers batch system) in seconds. If the problem
+    /// runs on a computer/server without a time limited queue, the value is -1.
     int queueRuntime;
 
     /// Name of the file used to automatically serialize the problem.
     string queueSerializationFilename;
 
-    /** \brief
-     * Timestamp at the beginning of all calculations. It is used to calculate the 
-     * overall runtime of the problem.
-     */
+    /// Timestamp at the beginning of all calculations. It is used to calculate the 
+    /// overall runtime of the problem.
     time_t initialTimestamp;
 
-    /** \brief
-     * Timestamp at the beginning of the last timestep iteration. Is is used to 
-     * calculate the runtime of the last timestep.
-     */
+    /// Timestamp at the beginning of the last timestep iteration. Is is used to 
+    /// calculate the runtime of the last timestep.
     time_t iterationTimestamp;
 
     /// Stores the runtime (in seconds) of some last timestep iterations.
     queue<int> lastIterationsDuration;
 
-    /** \brief
-     * In debug mode, the adapt loop will print information about timestep decreasing 
-     * and increasing.
-     */
+    /// In debug mode, the adapt loop will print information about timestep decreasing 
+    /// and increasing.
     bool dbgMode;
   };
 

AMDiS/src/parallel/PetscSolverFeti.cc

@@ -288,11 +288,6 @@ namespace AMDiS {
 		    false, false);
     dualDofMap.setComputeMatIndex(true);
 
-    lagrangeMap.init(levelData, 
-		     feSpaces, meshDistributor->getFeSpaces(),
-		     true, true);
-    lagrangeMap.setComputeMatIndex(true);
-
     if (meshLevel == 0) {
       localDofMap.init(levelData, 
 		       feSpaces, meshDistributor->getFeSpaces(),
@@ -305,6 +300,12 @@ namespace AMDiS {
       localDofMap.setComputeMatIndex(true);
     }
 
+    lagrangeMap.init(levelData, 
+		     feSpaces, meshDistributor->getFeSpaces(),
+		     true, true);
+    lagrangeMap.setComputeMatIndex(true);
+
+
     if (fetiPreconditioner != FETI_NONE) {
       TEST_EXIT(meshLevel == 0)
 	("Dirichlet preconditioner not yet implemented for multilevel FETI-DP\n");
@@ -498,9 +499,9 @@ namespace AMDiS {
 
     boundaryDofRanks[feSpace].clear();
 
-    // Stores for all rank own communication DOFs, if the counterpart is
-    // a rank owmed DOF in its subdomain. Thus, the following map stores to
-    // each rank number all DOFS that fulfill this requirenment.
+    // Stores for all rank owned communication DOFs, if the counterpart is
+    // a rank owned DOF in its subdomain. Thus, the following map stores to
+    // each rank number all DOFs that fulfill this requirenment.
     map<int, std::set<DegreeOfFreedom> > sdRankDofs;
 
     if (meshLevel > 0) {
@@ -554,10 +555,8 @@ namespace AMDiS {
 	  boundaryDofRanks[feSpace][it.getDofIndex()].insert(mpiRank);
 
  	  if (meshLevel == 0 ||
- 	      (meshLevel > 0 && sdRankDofs[it.getRank()].count(it.getDofIndex()))) {
+ 	      (meshLevel > 0 && sdRankDofs[it.getRank()].count(it.getDofIndex())))
 	    boundaryDofRanks[feSpace][it.getDofIndex()].insert(it.getRank());	  
- 	  }
-
 	}
       }
     }

AMDiS/src/parallel/PetscSolverFeti.h

@@ -199,19 +199,20 @@ namespace AMDiS {
     /// Mapping from dual DOF indices to a global index of duals.
     ParallelDofMapping dualDofMap;
 
+    /// Index for each non primal DOF to the global index of B variables (thus,
+    /// all pure local variables).
+    ParallelDofMapping localDofMap;
+
     /// Stores to each dual DOF index the index of the first Lagrange
     /// constraint that is assigned to this DOF.
     ParallelDofMapping lagrangeMap;
     
-    /// Index for each non primal DOF to the global index of B variables.
-    ParallelDofMapping localDofMap;
-
     /// Mapping of pure local DOF indices, thus no primal and no dual DOFs are
     /// in this map. Is used for the Dirichlet preconditioner only.
     ParallelDofMapping interiorDofMap;
 
-    /// Stores to each dual boundary DOF in each FE space the set of
-    /// ranks in which the DOF is contained in.
+    /// Stores to all dual boundary DOFs in each FE space the set of
+    /// ranks which contain this global DOF.
     map<const FiniteElemSpace*, DofIndexToPartitions> boundaryDofRanks;
 
     /// Global PETSc matrix of Lagrange variables.