Use the case name by default as part of the output from -viewdhm

jedbrown · May 30, 2011 · 753026f · 753026f
1 parent f854f1c
commit 753026f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/fs/tests/vht.c b/src/fs/tests/vht.c
@@ -54,6 +54,7 @@ static dErr VHTCaseSetType(VHTCase scase,const VHTCaseType type)
 
   dFunctionBegin;
   err = VHTCaseFind(type,&f);dCHK(err);
+  err = dStrcpyS(scase->name,sizeof scase->name,type);dCHK(err);
   err = (*f)(scase);dCHK(err);
   dFunctionReturn(0);
 }
@@ -1937,7 +1938,7 @@ int main(int argc,char *argv[])
     err = PetscOptionsBool("-check_error","Compute errors","",check_error,&check_error,NULL);dCHK(err);
     err = PetscOptionsBool("-use_jblock","Use blocks to apply Jacobian instead of unified (more efficient) version","",use_jblock=dFALSE,&use_jblock,NULL);dCHK(err);
     err = PetscOptionsString("-viewdhm","View the solution (filename optional)","","vht.dhm",dhmfilename,sizeof dhmfilename,&viewdhm);dCHK(err);
-    if (viewdhm && !dhmfilename[0]) {err = PetscStrcpy(dhmfilename,"vht.dhm");dCHK(err);}
+    if (viewdhm && !dhmfilename[0]) {err = PetscSNPrintf(dhmfilename,sizeof dhmfilename,"vht-%s.dhm",vht->scase->name);dCHK(err);}
     err = PetscOptionsBool("-check_null","Check that constant pressure really is in the null space","",check_null=dFALSE,&check_null,NULL);dCHK(err);
     if (check_null) {
       err = PetscOptionsBool("-compute_explicit","Compute explicit Jacobian (only very small sizes)","",compute_explicit=dFALSE,&compute_explicit,NULL);dCHK(err);

diff --git a/src/fs/tests/vhtimpl.h b/src/fs/tests/vhtimpl.h
@@ -70,6 +70,7 @@ struct _n_VHTCase {
   dBool reality; // The "solution" is just a guess or boundary conditions
   dUnits units;
   struct VHTUnitTable utable;
+  char name[dNAME_LEN];
   void *data;
 };
 typedef dErr (*VHTCaseCreateFunction)(VHTCase);