Changed: Derive class NLargs from SIMargsBase

Author: kmokstad

NLargs.C

@@ -37,11 +37,15 @@ bool NLargs::parseArg (const char* argv)
   else if (!strcmp(argv,"-fixDup"))
     fixDup = true;
   else if (!strncmp(argv,"-2Dpstra",8))
-    twoD = Elastic::planeStrain = true;
+  {
+    dim = 2;
+    Elastic::planeStrain = true;
+  }
   else if (!strncmp(argv,"-2Daxi",6))
-    twoD = Elastic::axiSymmetry = true;
-  else if (!strncmp(argv,"-2D",3))
-    twoD = true;
+  {
+    dim = 2;
+    Elastic::axiSymmetry = true;
+  }
   else if (!strcmp(argv,"-linear"))
     form = SIM::LINEAR;
   else if (!strcmp(argv,"-UL"))
@@ -81,10 +85,8 @@ bool NLargs::parseArg (const char* argv)
     algor = NEWHHT;
   else if (!strcmp(argv,"-arclen"))
     algor = ARCLEN;
-  else if (!strncmp(argv,"-adap",5))
-    adaptive = true;
   else
-    return false;
+    return this->SIMargsBase::parseArg(argv);
 
   this->setFormulation(form,pOrd);
   return true;
@@ -93,16 +95,8 @@ bool NLargs::parseArg (const char* argv)
 
 bool NLargs::parse (const tinyxml2::XMLElement* elem)
 {
-  if (!strcasecmp(elem->Value(),"geometry"))
-  {
-    int dim = 3;
-    if (!utl::getAttribute(elem,"dimension",dim))
-      utl::getAttribute(elem,"dim",dim);
-    twoD = dim == 2;
-  }
-  else if (!strcasecmp(elem->Value(),"finitedeformation"))
+  if (!strcasecmp(elem->Value(),"finitedeformation"))
   {
-    utl::getAttribute(elem,"adaptive",adaptive);
     const tinyxml2::XMLElement* child = elem->FirstChildElement("formulation");
     if (child) this->parseFormulation(child);
   }
@@ -123,7 +117,7 @@ bool NLargs::parse (const tinyxml2::XMLElement* elem)
       algor = NEWHHT;
   }
 
-  return IFEM::getOptions().parseDiscretizationTag(elem);
+  return this->SIMargsBase::parse(elem);
 }
 
 
@@ -135,9 +129,9 @@ void NLargs::parseFormulation (const tinyxml2::XMLElement* elem)
   const tinyxml2::XMLElement* child = elem->FirstChildElement();
   for (; child; child = child->NextSiblingElement())
     if (!strcasecmp(child->Value(),"planestrain"))
-      Elastic::planeStrain = twoD;
+      Elastic::planeStrain = dim == 2;
     else if (!strcasecmp(child->Value(),"axisymmetric"))
-      Elastic::axiSymmetry = twoD;
+      Elastic::axiSymmetry = dim == 2;
     else if (!strcasecmp(child->Value(),"totallagrange"))
       form = SIM::TOTAL_LAGRANGE;
     else if (!strcasecmp(child->Value(),"updatedlagrange") &&

NLargs.h

@@ -14,7 +14,7 @@
 #ifndef _NL_ARGS_H
 #define _NL_ARGS_H
 
-#include "XMLInputBase.h"
+#include "SIMargsBase.h"
 
 
 //! \brief Enum defining various solution drivers.
@@ -25,11 +25,13 @@ enum Algorithm { ARCLEN, STATIC, GENALPHA, OLDHHT, NEWHHT };
   \brief Class for input file pre-parsing and command-line argument values.
 */
 
-class NLargs : public XMLInputBase
+class NLargs : public SIMargsBase
 {
 public:
+  //! \brief Default constructor.
+  explicit NLargs() : SIMargsBase("finitedeformation") {}
   //! \brief Parses a command-line argument.
-  bool parseArg(const char* argv);
+  virtual bool parseArg(const char* argv);
 
 protected:
   //! \brief Parses a data section from an XML element.
@@ -44,10 +46,8 @@ class NLargs : public XMLInputBase
 public:
   std::vector<int> options; //!< Problem formulation options
   Algorithm algor = STATIC; //!< Solution algorithm driver flag
-  bool adaptive = false; //!< Run and adaptive simulation?
   bool checkRHS = false; //!< Check for right-hand-side patch orientation?
   bool fixDup   = false; //!< Check and resolve duplicated nodes?
-  bool twoD     = false; //!< Use the 2D driver?
   char printMax = false; //!< Print out max field values?
   bool dNodeMap = false; //!< Dump node mapping to HDF5 file?
 };

main_NonLinEl.C

@@ -312,18 +312,15 @@ int main (int argc, char** argv)
       stopTime = atof(argv[++i]);
     else if (!strcmp(argv[i],"-check"))
       stopTime = -1.0;
-    else if (!infile)
+    else if (infile)
+      std::cerr <<"  ** Unknown option ignored: "<< argv[i] << std::endl;
+    else if (strcasestr(infile = argv[i],".xinp"))
     {
-      infile = argv[i];
-      if (strcasestr(infile,".xinp"))
-      {
-        if (!args.readXML(infile,false))
-          return 1;
+      if (args.readXML(infile,false))
         i = 0; // start over and let command-line options override input file
-      }
+      else
+        return 1; // pre-parse failure
     }
-    else
-      std::cerr <<"  ** Unknown option ignored: "<< argv[i] << std::endl;
 
   if (!infile)
   {
@@ -342,10 +339,10 @@ int main (int argc, char** argv)
     return 0;
   }
 
-  if (IFEM::getOptions().discretization == ASM::Spline && args.adaptive)
+  if (IFEM::getOptions().discretization == ASM::Spline && args.adap)
     IFEM::getOptions().discretization = ASM::LRSpline;
   else if (IFEM::getOptions().discretization < ASM::LRSpline)
-    args.adaptive = false;
+    args.adap = false;
 
   IFEM::cout <<"\nInput file: "<< infile;
   IFEM::getOptions().print(IFEM::cout);
@@ -378,7 +375,7 @@ int main (int argc, char** argv)
   if (linear && args.algor > STATIC)
   {
     // Create the linear continuum model
-    if (args.twoD)
+    if (args.dim == 2)
       model = new SIMElasticity<SIM2D>(args.checkRHS);
     else
       model = new SIMElasticity<SIM3D>(args.checkRHS);
@@ -400,7 +397,7 @@ int main (int argc, char** argv)
   }
 
   // Create the nonlinear continuum model
-  if (args.twoD)
+  if (args.dim == 2)
     model = new SIMFiniteDefEl<SIM2D>(args.checkRHS,args.options);
   else
     model = new SIMFiniteDefEl<SIM3D>(args.checkRHS,args.options);
@@ -409,15 +406,15 @@ int main (int argc, char** argv)
   case STATIC:
   {
     // Invoke the nonlinear quasi-static solver with fixed load increments
-    NonlinearDriver simulator(*model,linear,args.adaptive);
+    NonlinearDriver simulator(*model,linear,args.adap);
     return runSimulator(simulator,model,infile,ignoredPatches,args.fixDup,
                         args.printMax,dtDump,stopTime,zero_tol,outPrec,
                         args.dNodeMap);
   }
   case ARCLEN:
   {
     // Invoke the nonlinear quasi-static arc-length solver
-    ArcLengthDriver simulator(*model,args.adaptive);
+    ArcLengthDriver simulator(*model,args.adap);
     return runSimulator(simulator,model,infile,ignoredPatches,args.fixDup,
                         args.printMax,dtDump,stopTime,zero_tol,outPrec,
                         args.dNodeMap);