Add -qmethod option to Jacobi tests

jedbrown · Nov 14, 2010 · 85bc2f3 · 85bc2f3
1 parent 254352d
commit 85bc2f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/jacobi/tests/ex1.c b/src/jacobi/tests/ex1.c
@@ -252,6 +252,7 @@ static dErr checkRulesAndEFS(dJacobi jac)
   Vec          u      = NULL;
   dQuadrature  quad;
   dInt         N,minrdeg,maxrdeg,minbdeg,maxbdeg;
+  dQuadratureMethod qmethod;
   dPolynomialOrder *rdeg,*bdeg;
   dEntTopology *topo;
   dBool        showrules,showefs;
@@ -264,13 +265,15 @@ static dErr checkRulesAndEFS(dJacobi jac)
   maxrdeg = 10;
   minbdeg = 1;
   maxbdeg = 5;
+  qmethod = dQUADRATURE_METHOD_FAST;
   showrules = dFALSE;
   showefs = dFALSE;
   err = PetscOptionsBegin(PETSC_COMM_WORLD,NULL,"Options for testing Jacobi",NULL);dCHK(err);
   err = PetscOptionsInt("-min_rdeg","Minimum rule degree",NULL,minrdeg,&minrdeg,NULL);dCHK(err);
   err = PetscOptionsInt("-max_rdeg","Maximum rule degree",NULL,maxrdeg,&maxrdeg,NULL);dCHK(err);
   err = PetscOptionsInt("-min_bdeg","Minimum basis degree",NULL,minbdeg,&minbdeg,NULL);dCHK(err);
   err = PetscOptionsInt("-max_bdeg","Maximum basis degree",NULL,maxbdeg,&maxbdeg,NULL);dCHK(err);
+  err = PetscOptionsEnum("-qmethod","Quadrature method",NULL,dQuadratureMethods,(PetscEnum)qmethod,(PetscEnum*)&qmethod,NULL);dCHK(err);
   err = PetscOptionsBool("-show_rules","Show rules",NULL,showrules,&showrules,NULL);dCHK(err);
   err = PetscOptionsBool("-show_efs","Show EFS",NULL,showefs,&showefs,NULL);dCHK(err);
   err = PetscOptionsEnd();dCHK(err);
@@ -285,7 +288,7 @@ static dErr checkRulesAndEFS(dJacobi jac)
     }
   }
 
-  err = dJacobiGetQuadrature(jac,dQUADRATURE_METHOD_FAST,&quad);dCHK(err);
+  err = dJacobiGetQuadrature(jac,qmethod,&quad);dCHK(err);
   err = dQuadratureGetRules(quad,N,topo,rdeg,&rule);dCHK(err);
   if (showrules) {
     for (dInt i=0; i<N; i++) {

diff --git a/src/jacobi/tests/ex3.c b/src/jacobi/tests/ex3.c
@@ -26,6 +26,7 @@ static dErr TestExplicitBases(dJacobi jac,PetscViewer viewer)
   dRule *rules;
   dEFS *efs;
   dQuadrature quad;
+  dQuadratureMethod qmethod = dQUADRATURE_METHOD_FAST;
   dInt rp = 6;
   dErr err;
 
@@ -35,6 +36,7 @@ static dErr TestExplicitBases(dJacobi jac,PetscViewer viewer)
   else if (!strcmp(jtype,dJACOBI_MODAL)) type = MODAL;
   else dERROR(PETSC_COMM_SELF,PETSC_ERR_SUP,"Unexpected Jacobi type '%s'",jtype);
 
+  err = PetscOptionsGetEnum(NULL,"-qmethod",dQuadratureMethods,(PetscEnum*)&qmethod,NULL);dCHK(err);
   err = PetscOptionsGetInt(NULL,"-rule_degree",&rp,NULL);dCHK(err);
   for (dInt i=0; i<4; i++) {
     switch (type) {
@@ -47,7 +49,7 @@ static dErr TestExplicitBases(dJacobi jac,PetscViewer viewer)
         bdegree[i] = dPolynomialOrderCreate(i,0,0,0);
     }
   }
-  err = dJacobiGetQuadrature(jac,dQUADRATURE_METHOD_FAST,&quad);dCHK(err);
+  err = dJacobiGetQuadrature(jac,qmethod,&quad);dCHK(err);
   err = dQuadratureGetRules(quad,4,topo,rdegree,&rules);dCHK(err);
   err = dJacobiGetEFS(jac,4,topo,bdegree,rules,&efs);dCHK(err);