Chemora: Recognize "I3D" in calculation.

Update parsing of I3D to reflect changes in b34605. Remove dead code.
ianhinder · Oct 9, 2015 · 74cf2a2 · 74cf2a2
1 parent b346059
commit 74cf2a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/Tools/CodeGen/CodeGenCalculation.m b/Tools/CodeGen/CodeGenCalculation.m
@@ -372,8 +372,7 @@ General Utility Functions (could be moved outside this package)
 chemoraExpandRulesSeqNum = 1;
 
 chemoraExpandRules =
-   { Global`RawMath[op_] -> op,
-     Rule[lhs_,IfThen[Parameter[cond_]|cond_,ifpart_,elsepart_]] :>
+   { Rule[lhs_,IfThen[Parameter[cond_]|cond_,ifpart_,elsepart_]] :>
         Sequence@@Module[{lhs1,lhs2},
           lhs1 = Symbol[ ToString[lhs] <> "xxxI" ];
           lhs2 = Symbol[ ToString[lhs] <> "xxxE" ];
@@ -383,13 +382,14 @@ General Utility Functions (could be moved outside this package)
      Rule[lhs_, chemoraIfElse[Parameter[cond_],rest___]] :>
         lhs -> chemoraIfElse[cond,rest],
      Rule[lhs_, h1_[op1___,
-                    h2_String?(StringMatchQ[#,RegularExpression["^KRANC.*"]]&),
+                    h2_String?(StringMatchQ[#,RegularExpression["I3D\\(.*"]]&),
                     op3___]] :>
         Sequence@@Module[{lhs2, seq = chemoraExpandRulesSeqNum++},
-          lhs2 = Symbol[ ToString[lhs] <> "xDiffOpx" <> ToString[seq] ];
-                    { lhs2 -> ChemoraNDO["_"<>h2], lhs -> h1[op1,lhs2,op3] }],
+          lhs2 = Symbol[ ToString[lhs] <> "xOffsetLd" <> ToString[seq] ];
+                    { lhs2 -> ChemoraI3DParse["_"<>h2],
+                      lhs -> h1[op1,lhs2,op3] }],
      Rule[lhs_, h1_[op1___,
-                    h2_?(Not[MemberQ[{Parameter,Global`RawMath},#]]&)[op2__],
+                    h2_?(Not[MemberQ[{Parameter},#]]&)[op2__],
                     op3___]] :>
         Sequence@@Module[{lhs2, seq = chemoraExpandRulesSeqNum++},
           lhs2 = Symbol[ ToString[lhs] <> "x" <> 
@@ -402,19 +402,13 @@ General Utility Functions (could be moved outside this package)
                     { lhs2 -> h1[op1,op2], lhs -> h1[lhs2,op3] } ]
      }
 
-chemoraCExpressionEQstr[lhs_->ChemoraNDO[rhs_]]:=
-   Module[{offsetsRaw},
-     offsetsRaw =
-        StringCases
+chemoraCExpressionEQstr[lhs_->ChemoraI3DParse[rhs_]]:= Module[
+   { argsRaw = StringCases
         [ rhs,
           RegularExpression[
-            "^_KRANC_GFOFFSET3D\\(u,([^,]+),([^,]+),([^,]+)\\)"]
-             :> ToExpression /@ {"$1","$2","$3"} ] // Flatten;
-     " assign_from_offset_load("
-          <> chemoraQuote[lhs] <> ", "
-          <> "grid_function_name_placeholder,"
-          <> StringJoin[chemoraQuote[#] <> ", " & /@ offsetsRaw ]
-          <> ");\n"];
+            "_I3D\\(([^,]+),([^,]+),([^,]+),([^,]+)\\)"]
+             :> ToExpression /@ {"$1","$2","$3","$3"} ] // Flatten },
+    chemoraCExpressionEQstr[ lhs -> (ChemoraNOffset@@argsRaw) ] ];
 
 chemoraCExpressionEQstr[lhs_->(I3D|ChemoraNOffset)[gf_,di_,dj_,dk_]]:=
   Module[{},

diff --git a/Tools/CodeGen/Kranc.m b/Tools/CodeGen/Kranc.m
@@ -172,7 +172,6 @@
 
 chemoraQuote;
 
-ChemoraNDO;
 ChemoraNOffset;