Changed: writeGlvN() no longer require projection names as input

Author: kmokstad

Elasticity/NonlinearDriver.C

@@ -382,21 +382,15 @@ int NonlinearDriver::solveProblem (DataExporter* writer, HDF5Restart* restart,
         if (!model.writeGlvV(myForces,"Internal forces",iStep,nBlock,2))
           return 11;
 
-        if (doProject)
-        {
-          // Write projected solution fields to VTF-file
+        if (doProject) // Write projected solution fields to VTF-file
           if (!model.writeGlvP(proSol.front(),iStep,
                                nBlock,110,pit->second.c_str(),
                                elp ? elp->getMaxVals() : nullptr))
             return 11;
 
-          // Write element norms
-          if (!model.writeGlvN(eNorm,iStep,nBlock,{pit->second}))
-            return 11;
-        }
-        else // Write element norms without projections
-          if (!model.writeGlvN(eNorm,iStep,nBlock))
-            return 11;
+        // Write element norms
+        if (!model.writeGlvN(eNorm,iStep,nBlock))
+          return 11;
       }
 
       if (elp) elp->enableMaxValCalc(false);

main_LinEl.C

@@ -926,23 +926,11 @@ int main (int argc, char** argv)
         return terminate(18);
 
     // Write element norms
-    if (!eNorm.empty())
-    {
-      std::vector<std::string> prefix;
-      prefix.reserve(pOpt.size());
-      for (pit = pOpt.begin(); pit != pOpt.end(); ++pit)
-        prefix.push_back(pit->second);
-
-      if (!model->writeGlvN(eNorm,1,nBlock,prefix))
-        return terminate(19);
-    }
+    if (!model->writeGlvN(eNorm,1,nBlock))
+      return terminate(19);
 
-    if (!fNorm.empty())
-    {
-      std::vector<std::string> prefix = { "Dual projected" };
-      if (!model->writeGlvN(fNorm,1,nBlock,prefix,300,"Dual"))
-        return terminate(19);
-    }
+    if (!model->writeGlvN(fNorm,1,nBlock,300,"Dual"))
+      return terminate(19);
 
     model->writeGlvStep(1,0.0,-1);
   }