KrancThorn.m: Move input parameter checking earlier in CreateKrancThorn

ianhinder · Sep 13, 2013 · 32d0ab3 · 32d0ab3
1 parent 5a2501a
commit 32d0ab3
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
@@ -93,9 +93,12 @@ Thorn generation (main entry point for non-tensorial thorns)
        Read named arguments and apply nontrivial defaults
        ------------------------------------------------------------------------ *)
 
+    InfoMessage[Terse, "Verifying arguments"];
     cktCheckNamedArgs[{opts}];
-
     CheckGroups[groupsOrig];
+    VerifyGroups[groupsOrig];
+    VerifyString[parentDirectory];
+    VerifyString[thornName];
 
     c = NewObject[
       Code, 
@@ -115,6 +118,10 @@ Thorn generation (main entry point for non-tensorial thorns)
        "PartialDerivatives" -> OptionValue[PartialDerivatives],
        "Sources" -> {}}];
 
+    VerifyString[GetObjectField[c, "Implementation"]];
+    VerifyGroupNames[GetObjectField[c, "DeclaredGroups"]];
+    VerifyGroupNames[GetObjectField[c, "ODEGroups"]];
+
     (* ------------------------------------------------------------------------ 
        GenericFD
        ------------------------------------------------------------------------ *)
@@ -186,14 +193,6 @@ Thorn generation (main entry point for non-tensorial thorns)
        Check input parameters
        ------------------------------------------------------------------------ *)
 
-    InfoMessage[Terse, "Verifying arguments"];
-    VerifyGroups[GetObjectField[c, "Groups"]];
-    VerifyString[parentDirectory];
-    VerifyString[GetObjectField[c, "Name"]];
-    VerifyString[GetObjectField[c, "Implementation"]];
-    VerifyGroupNames[GetObjectField[c, "DeclaredGroups"]];
-    VerifyGroupNames[GetObjectField[c, "ODEGroups"]];
-
     If[OptionValue[UseJacobian], JacobianCheckGroups[GetObjectField[c, "Groups"]]];
 
     (* ------------------------------------------------------------------------