attempt to let more CI tests pass

Flash-X · Aug 23, 2024 · ee4d8e8 · ee4d8e8
1 parent 7fdc9b5
commit ee4d8e8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 33 deletions.
diff --git a/tools/milhoja_pypkg/src/milhoja/parse_helpers.py b/tools/milhoja_pypkg/src/milhoja/parse_helpers.py
@@ -230,8 +230,7 @@ def parse_lbound_f(lbound: str):
     for idx, match in enumerate(matches):
         for keyword in keywords:
             if keyword in match:
-                if (("IFELSE_K2D(" in match) or
-                    ("IFELSE_K3D(" in match)):
+                if (("IFELSE_K2D(" in match) or ("IFELSE_K3D(" in match)):
                     matches[idx] = match.replace(
                         keyword, f'{keyword}.I(),{keyword}.J(),{keyword}.K()'
                     )

diff --git a/tools/milhoja_pypkg/src/milhoja/tests/data/FlashX/REF_cpu_tf_hydro_2D_Cpp2C.cxx b/tools/milhoja_pypkg/src/milhoja/tests/data/FlashX/REF_cpu_tf_hydro_2D_Cpp2C.cxx
@@ -106,40 +106,40 @@ extern "C" {
         };
         int   tile_hi_array[] = {
                 tile_hi.I(),
-                tile_hi.J(),
-                tile_hi.K()
+                IFELSE_K2D(tile_hi.J(),1),
+                IFELSE_K3D(tile_hi.K(),1)
         };
         int   tile_interior[] = {
                 tileDesc->lo().I(),tileDesc->hi().I(),
-                tileDesc->lo().J(),tileDesc->hi().J(),
-                tileDesc->lo().K(),tileDesc->hi().K()
+                IFELSE_K2D(tileDesc->lo().J(),1),IFELSE_K2D(tileDesc->hi().J(),1),
+                IFELSE_K3D(tileDesc->lo().K(),1),IFELSE_K3D(tileDesc->hi().K(),1)
         };
         int tile_lo_array[] = {
                 tile_lo.I(),
-                tile_lo.J(),
-                tile_lo.K()
+                IFELSE_K2D(tile_lo.J(),1),
+                IFELSE_K3D(tile_lo.K(),1)
         };
         int lbdd_CC_1[] = {
                 tile_lbound.I(),
-                tile_lbound.J(),
-                tile_lbound.K(),
+                IFELSE_K2D(tile_lbound.J(),1),
+                IFELSE_K3D(tile_lbound.K(),1),
                 1
         };
         int   lbdd_scratch_hydro_op1_auxC[] = {
                 tile_lo.I()-1,
-                tile_lo.J()-1,
-                tile_lo.K()-0
+                IFELSE_K2D(tile_lo.J(),1)-1,
+                IFELSE_K3D(tile_lo.K(),1)-0
         };
         int   lbdd_scratch_hydro_op1_flX[] = {
                 tile_lo.I(),
-                tile_lo.J(),
-                tile_lo.K(),
+                IFELSE_K2D(tile_lo.J(),1),
+                IFELSE_K3D(tile_lo.K(),1),
                 1
         };
         int   lbdd_scratch_hydro_op1_flY[] = {
                 tile_lo.I(),
-                tile_lo.J(),
-                tile_lo.K(),
+                IFELSE_K2D(tile_lo.J(),1),
+                IFELSE_K3D(tile_lo.K(),1),
                 1
         };
 

diff --git a/tools/milhoja_pypkg/src/milhoja/tests/data/FlashX/REF_cpu_tf_hydro_3D_Cpp2C.cxx b/tools/milhoja_pypkg/src/milhoja/tests/data/FlashX/REF_cpu_tf_hydro_3D_Cpp2C.cxx
@@ -107,46 +107,46 @@ extern "C" {
        };
        int tile_hi_array[] = {
               tile_hi.I(),
-              tile_hi.J(),
-              tile_hi.K()
+              IFELSE_K2D(tile_hi.J(),1),
+              IFELSE_K3D(tile_hi.K(),1)
        };
        int tile_interior[] = {
               tileDesc->lo().I(),tileDesc->hi().I(),
-              tileDesc->lo().J(),tileDesc->hi().J(),
-              tileDesc->lo().K(),tileDesc->hi().K()
+              IFELSE_K2D(tileDesc->lo().J(),1),IFELSE_K2D(tileDesc->hi().J(),1),
+              IFELSE_K3D(tileDesc->lo().K(),1),IFELSE_K3D(tileDesc->hi().K(),1)
        };
        int tile_lo_array[] = {
               tile_lo.I(),
-              tile_lo.J(),
-              tile_lo.K()
+              IFELSE_K2D(tile_lo.J(),1),
+              IFELSE_K3D(tile_lo.K(),1)
        };
        int lbdd_CC_1[] = {
               tile_lbound.I(),
-              tile_lbound.J(),
-              tile_lbound.K(),
+              IFELSE_K2D(tile_lbound.J(),1),
+              IFELSE_K3D(tile_lbound.K(),1),
               1
        };
        int lbdd_scratch_hydro_op1_auxC[] = {
               tile_lo.I()-1,
-              tile_lo.J()-1,
-              tile_lo.K()-1
+              IFELSE_K2D(tile_lo.J(),1)-1,
+              IFELSE_K3D(tile_lo.K(),1)-1
        };
        int lbdd_scratch_hydro_op1_flX[] = {
               tile_lo.I(),
-              tile_lo.J(),
-              tile_lo.K(),
+              IFELSE_K2D(tile_lo.J(),1),
+              IFELSE_K3D(tile_lo.K(),1),
               1
        };
         int lbdd_scratch_hydro_op1_flY[] = {
               tile_lo.I(),
-              tile_lo.J(),
-              tile_lo.K(),
+              IFELSE_K2D(tile_lo.J(),1),
+              IFELSE_K3D(tile_lo.K(),1),
               1
        };
         int lbdd_scratch_hydro_op1_flZ[] = {
               tile_lo.I(),
-              tile_lo.J(),
-              tile_lo.K(),
+              IFELSE_K2D(tile_lo.J(),1),
+              IFELSE_K3D(tile_lo.K(),1),
               1
        };
 
@@ -169,4 +169,4 @@ extern "C" {
        static_cast<void*>(lbdd_scratch_hydro_op1_flZ)
        );
     }
-}
+}