dOptionsRealUnits: put the nondimensional value and the scale in -hel…

…p output
jedbrown · Jun 1, 2011 · ddc4fd1 · ddc4fd1
1 parent b4754b8
commit ddc4fd1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/util/dunits.c b/src/util/dunits.c
@@ -280,19 +280,20 @@ dErr dUnitsDestroy(dUnits *unp)
 dErr dOptionsRealUnits(const char opt[],const char text[],const char man[],dUnit unit,PetscReal defaultv,PetscReal *value,PetscBool *set)
 {
   char text2[512];
-  PetscReal default2,value2;
+  PetscReal default2,value2,one;
   dBool set2;
   dErr err;
 
   dFunctionBegin;
   if (unit) {
     default2 = dUnitDimensionalize(unit,defaultv);
-    err = PetscSNPrintf(text2,sizeof text2,"%s (%s)",text,dUnitName(unit));dCHK(err);
+    one = dUnitDimensionalize(unit,1);
+    err = PetscSNPrintf(text2,sizeof text2,"%s [%G in %G %s]",text,defaultv,one,dUnitName(unit));dCHK(err);
     err = PetscOptionsReal(opt,text2,man,default2,&value2,&set2);dCHK(err);
     if (set2) *value = dUnitNonDimensionalize(unit,value2);
     if (set) *set = set2;
   } else {
-    err = PetscSNPrintf(text2,sizeof text2,"%s (nondimensional)",text);dCHK(err);
+    err = PetscSNPrintf(text2,sizeof text2,"%s [nondimensional]",text);dCHK(err);
     err = PetscOptionsReal(opt,text2,man,defaultv,value,set);dCHK(err);
   }
   dFunctionReturn(0);