Added flags for compiling with Intel C++ compiler. Fixed some real compiler warnings.

AMDiS/src/parallel/PetscSolverFeti.cc

@@ -420,8 +420,8 @@ namespace AMDiS {
     // === appropriate number of Lagrange constraints.                      ===
 
     int nRankLagrange = 0;
-    map<DegreeOfFreedom, MultiIndex>& dualMap = dualDofMap[feSpace].getMap();
-    for (map<DegreeOfFreedom, MultiIndex>::iterator it = dualMap.begin(); it != dualMap.end(); ++it) {
+    DofMap& dualMap = dualDofMap[feSpace].getMap();
+    for (DofMap::iterator it = dualMap.begin(); it != dualMap.end(); ++it) {
       if (meshDistributor->getIsRankDof(feSpace, it->first)) {
 	lagrangeMap[feSpace].insertRankDof(it->first, nRankLagrange);
 	int degree = boundaryDofRanks[feSpace][it->first].size();
@@ -460,7 +460,7 @@ namespace AMDiS {
     
     // === And finally, add the global indicies of all dual nodes. ===
 
-    for (map<DegreeOfFreedom, MultiIndex>::iterator it = dualDofMap[feSpace].getMap().begin();
+    for (DofMap::iterator it = dualDofMap[feSpace].getMap().begin();
 	 it != dualDofMap[feSpace].getMap().end(); ++it)
       localDofMap[feSpace].insertRankDof(it->first);
   }
@@ -486,11 +486,9 @@ namespace AMDiS {
     // === constraint.                                                     ===
 
     for (unsigned int k = 0; k < feSpaces.size(); k++) {
-      map<DegreeOfFreedom, MultiIndex> &dualMap = 
-	dualDofMap[feSpaces[k]].getMap();
+      DofMap &dualMap = dualDofMap[feSpaces[k]].getMap();
 
-      for (map<DegreeOfFreedom, MultiIndex>::iterator it = dualMap.begin(); 
-	   it != dualMap.end(); ++it) {
+      for (DofMap::iterator it = dualMap.begin(); it != dualMap.end(); ++it) {
 	TEST_EXIT_DBG(boundaryDofRanks[feSpaces[k]].count(it->first))
 	  ("Should not happen!\n");
 	
@@ -735,10 +733,8 @@ namespace AMDiS {
 		 &(fetiDirichletPreconData.tmp_vec_interior));
 
       for (unsigned int i = 0; i < feSpaces.size(); i++) {
-	map<DegreeOfFreedom, MultiIndex> &dualMap = 
-	  dualDofMap[feSpaces[i]].getMap();
-	for (map<DegreeOfFreedom, MultiIndex>::iterator it = dualMap.begin(); 
-	     it != dualMap.end(); ++it) {
+	DofMap &dualMap = dualDofMap[feSpaces[i]].getMap();
+	for (DofMap::iterator it = dualMap.begin(); it != dualMap.end(); ++it) {
 	  DegreeOfFreedom d = it->first;
 	  int matIndexLocal = localDofMap.getLocalMatIndex(i, d);
 	  int matIndexDual = dualDofMap.getLocalMatIndex(i, d);
@@ -758,10 +754,8 @@ namespace AMDiS {
       fetiLumpedPreconData.mat_duals_duals = &mat_duals_duals;
 
       for (unsigned int i = 0; i < feSpaces.size(); i++) {
-	map<DegreeOfFreedom, MultiIndex> &dualMap = 
-	  dualDofMap[feSpaces[i]].getMap();
-	for (map<DegreeOfFreedom, MultiIndex>::iterator it = dualMap.begin(); 
-	     it != dualMap.end(); ++it) {
+	DofMap &dualMap = dualDofMap[feSpaces[i]].getMap();
+	for (DofMap::iterator it = dualMap.begin(); it != dualMap.end(); ++it) {
 	  DegreeOfFreedom d = it->first;
 	  int matIndexLocal = localDofMap.getLocalMatIndex(i, d);
 	  int matIndexDual = dualDofMap.getLocalMatIndex(i, d);
@@ -865,10 +859,8 @@ namespace AMDiS {
     {
       int cnt = 0;
       for (unsigned int i = 0; i < feSpaces.size(); i++) {
-	map<DegreeOfFreedom, MultiIndex>& dofMap = 
-	  primalDofMap[feSpaces[i]].getMap();
-	for (map<DegreeOfFreedom, MultiIndex>::iterator it = dofMap.begin();
-	     it != dofMap.end(); ++it) {
+	DofMap& dofMap = primalDofMap[feSpaces[i]].getMap();
+	for (DofMap::iterator it = dofMap.begin();it != dofMap.end(); ++it) {
 	  globalIsIndex.push_back(primalDofMap.getMatIndex(i, it->first));
 	  localIsIndex.push_back(cnt++);
 	}
@@ -913,13 +905,13 @@ namespace AMDiS {
     for (int i = 0; i < vec.getSize(); i++) {
       DOFVector<double>& dofVec = *(vec.getDOFVector(i));
 
-      for (map<DegreeOfFreedom, MultiIndex>::iterator it = localDofMap[feSpaces[i]].getMap().begin();
+      for (DofMap::iterator it = localDofMap[feSpaces[i]].getMap().begin();
 	   it != localDofMap[feSpaces[i]].getMap().end(); ++it) {
 	int petscIndex = localDofMap.getLocalMatIndex(i, it->first);
 	dofVec[it->first] = localSolB[petscIndex];
       }
 
-      for (map<DegreeOfFreedom, MultiIndex>::iterator it = primalDofMap[feSpaces[i]].getMap().begin();
+      for (DofMap::iterator it = primalDofMap[feSpaces[i]].getMap().begin();
 	   it != primalDofMap[feSpaces[i]].getMap().end(); ++it)
 	dofVec[it->first] = localSolPrimal[cnt++];
     }

AMDiS/src/parallel/PetscSolverGlobalMatrix.cc

@@ -22,6 +22,7 @@ namespace AMDiS {
     FUNCNAME("PetscSolverGlobalMatrix::fillPetscMatrix()");
 
     TEST_EXIT_DBG(meshDistributor)("No mesh distributor object defined!\n");
+    TEST_EXIT_DBG(dofMap)("No parallel mapping object defined!\n");
     TEST_EXIT_DBG(mat)("No DOF matrix defined!\n");
 
     double wtime = MPI::Wtime();

AMDiS/src/time/RosenbrockAdaptInstationary.cc

@@ -118,7 +118,7 @@ namespace AMDiS {
     bool rejected = false;
     double timeTol = adaptInfo->getTimeTolerance(0);
 
-    size_t studyTimestep = -1;
+    int studyTimestep = -1;
 
     do {
       if (dbgTimestepStudy) {