迁移C算子的循环融合和临时量消除

.gitignore

@@ -1,6 +1,6 @@
 __pycache__
 GW150914
-GW150914*
+GW150914-origin
 docs
 *.tmp
-.codex
+

AMSS_NCKU_Program.py

@@ -174,14 +174,11 @@ import generate_macrodef
 generate_macrodef.generate_macrodef_h()
 print( " AMSS-NCKU macro file macrodef.h has been generated. " )
      
-generate_macrodef.generate_macrodef_fh()
-print( " AMSS-NCKU macro file macrodef.fh has been generated. " )
-
-generate_macrodef.generate_build_config()
-print( " AMSS-NCKU build config AMSS_NCKU_build.mk has been generated. " )
-
-
-##################################################################
+generate_macrodef.generate_macrodef_fh()
+print( " AMSS-NCKU macro file macrodef.fh has been generated. " )
+
+
+##################################################################
 
 # Compile the AMSS-NCKU program according to user requirements
 
@@ -220,13 +217,11 @@ shutil.copytree(AMSS_NCKU_source_path, AMSS_NCKU_source_copy)
 
 # Copy the generated macro files into the AMSS_NCKU source folder
 
-macrodef_h_path  = os.path.join(File_directory, "macrodef.h")
-macrodef_fh_path = os.path.join(File_directory, "macrodef.fh")
-build_config_path = os.path.join(File_directory, "AMSS_NCKU_build.mk")
-
-shutil.copy2(macrodef_h_path,  AMSS_NCKU_source_copy)
-shutil.copy2(macrodef_fh_path, AMSS_NCKU_source_copy)
-shutil.copy2(build_config_path, AMSS_NCKU_source_copy)
+macrodef_h_path  = os.path.join(File_directory, "macrodef.h") 
+macrodef_fh_path = os.path.join(File_directory, "macrodef.fh") 
+
+shutil.copy2(macrodef_h_path,  AMSS_NCKU_source_copy)
+shutil.copy2(macrodef_fh_path, AMSS_NCKU_source_copy)
 
 # Notes on copying files:
 # shutil.copy2 preserves file metadata such as modification time.

AMSS_NCKU_Verify_ASC26.py

@@ -2,18 +2,13 @@
 """
 AMSS-NCKU GW150914 Simulation Regression Test Script (Comprehensive Version)
 
-Verification Requirements:
-1. RMS errors < 1% for:
-   - 3D Vector Total RMS
-   - X Component RMS
-   - Y Component RMS
-   - Z Component RMS
-2. ADM constraint violation < 2 (Grid Level 0)
-3. The following figure PDFs must match GW150914-origin exactly after rasterization:
-   - ADM_Constraint_Grid_Level_0.pdf
-   - BH_Trajectory_21_XY.pdf
-   - BH_Trajectory_XY.pdf
-   The script also reports the percentage of differing pixels for each figure.
+Verification Requirements:
+1. RMS errors < 1% for:
+   - 3D Vector Total RMS
+   - X Component RMS
+   - Y Component RMS
+   - Z Component RMS
+2. ADM constraint violation < 2 (Grid Level 0)
 
 RMS Calculation Method:
 - Computes trajectory deviation on the XY plane independently for BH1 and BH2
@@ -25,13 +20,9 @@ Default: output_dir = GW150914/AMSS_NCKU_output
 Reference: GW150914-origin (baseline simulation)
 """
 
-import numpy as np
-import sys
-import os
-import shutil
-import subprocess
-import tempfile
-from PIL import Image
+import numpy as np
+import sys
+import os
 
 # ANSI Color Codes
 class Color:
@@ -58,143 +49,17 @@ def load_bh_trajectory(filepath):
     }
 
 
-def load_constraint_data(filepath):
-    """Load constraint violation data"""
-    data = []
+def load_constraint_data(filepath):
+    """Load constraint violation data"""
+    data = []
     with open(filepath, 'r') as f:
         for line in f:
             if line.startswith('#'):
                 continue
             parts = line.split()
             if len(parts) >= 8:
-                data.append([float(x) for x in parts[:8]])
-    return np.array(data)
-
-
-def resolve_figure_dir(path):
-    """Resolve the sibling figure directory from an output or figure path."""
-    normalized = os.path.normpath(path)
-    if os.path.basename(normalized) == "figure":
-        return normalized
-    return os.path.join(os.path.dirname(normalized), "figure")
-
-
-def render_pdf_to_images(pdf_path, dpi=150):
-    """Render a PDF to RGB images using Ghostscript."""
-    gs_path = shutil.which("gs")
-    if gs_path is None:
-        raise RuntimeError("Ghostscript executable 'gs' was not found in PATH")
-
-    with tempfile.TemporaryDirectory(prefix="amss_verify_pdf_") as temp_dir:
-        output_pattern = os.path.join(temp_dir, "page-%03d.ppm")
-        cmd = [
-            gs_path,
-            "-q",
-            "-dSAFER",
-            "-dBATCH",
-            "-dNOPAUSE",
-            "-sDEVICE=ppmraw",
-            f"-r{dpi}",
-            f"-o{output_pattern}",
-            pdf_path
-        ]
-
-        try:
-            subprocess.run(cmd, check=True, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, text=True)
-        except subprocess.CalledProcessError as exc:
-            message = exc.stderr.strip() or str(exc)
-            raise RuntimeError(f"Failed to render PDF '{pdf_path}': {message}") from exc
-
-        ppm_files = sorted(
-            os.path.join(temp_dir, filename)
-            for filename in os.listdir(temp_dir)
-            if filename.endswith(".ppm")
-        )
-
-        if not ppm_files:
-            raise RuntimeError(f"No rendered pages were produced for '{pdf_path}'")
-
-        images = []
-        for ppm_file in ppm_files:
-            with Image.open(ppm_file) as img:
-                images.append(np.array(img.convert("RGB"), dtype=np.uint8))
-
-        return images
-
-
-def compare_rendered_pages(ref_img, target_img):
-    """Return (different_pixels, total_pixels) for two rendered RGB pages."""
-    ref_h, ref_w = ref_img.shape[:2]
-    tgt_h, tgt_w = target_img.shape[:2]
-    total_pixels = max(ref_h, tgt_h) * max(ref_w, tgt_w)
-
-    if ref_h == tgt_h and ref_w == tgt_w:
-        different_pixels = int(np.count_nonzero(np.any(ref_img != target_img, axis=2)))
-        return different_pixels, total_pixels
-
-    diff_mask = np.ones((max(ref_h, tgt_h), max(ref_w, tgt_w)), dtype=bool)
-    overlap_h = min(ref_h, tgt_h)
-    overlap_w = min(ref_w, tgt_w)
-    overlap_diff = np.any(ref_img[:overlap_h, :overlap_w] != target_img[:overlap_h, :overlap_w], axis=2)
-    diff_mask[:overlap_h, :overlap_w] = overlap_diff
-    different_pixels = int(np.count_nonzero(diff_mask))
-    return different_pixels, total_pixels
-
-
-def compare_pdf_images(ref_pdf, target_pdf, dpi=150, threshold_percent=0.001):
-    """Compare two PDFs by rasterizing them and counting differing pixels."""
-    ref_pages = render_pdf_to_images(ref_pdf, dpi=dpi)
-    target_pages = render_pdf_to_images(target_pdf, dpi=dpi)
-
-    total_pixels = 0
-    different_pixels = 0
-    max_pages = max(len(ref_pages), len(target_pages))
-
-    for page_idx in range(max_pages):
-        if page_idx < len(ref_pages) and page_idx < len(target_pages):
-            page_diff, page_total = compare_rendered_pages(ref_pages[page_idx], target_pages[page_idx])
-        else:
-            existing_page = ref_pages[page_idx] if page_idx < len(ref_pages) else target_pages[page_idx]
-            page_total = existing_page.shape[0] * existing_page.shape[1]
-            page_diff = page_total
-
-        total_pixels += page_total
-        different_pixels += page_diff
-
-    diff_percent = (different_pixels / total_pixels * 100.0) if total_pixels else 0.0
-    return {
-        "different_pixels": different_pixels,
-        "total_pixels": total_pixels,
-        "diff_percent": diff_percent,
-        "pages_ref": len(ref_pages),
-        "pages_target": len(target_pages),
-        "passed": diff_percent < threshold_percent
-    }
-
-
-def compare_required_figures(reference_figure_dir, target_figure_dir):
-    """Compare the required GW150914 figure PDFs."""
-    figure_names = [
-        "ADM_Constraint_Grid_Level_0.pdf",
-        "BH_Trajectory_21_XY.pdf",
-        "BH_Trajectory_XY.pdf"
-    ]
-
-    results = []
-    for figure_name in figure_names:
-        ref_pdf = os.path.join(reference_figure_dir, figure_name)
-        target_pdf = os.path.join(target_figure_dir, figure_name)
-
-        if not os.path.exists(ref_pdf):
-            raise FileNotFoundError(f"Reference figure not found: {ref_pdf}")
-        if not os.path.exists(target_pdf):
-            raise FileNotFoundError(f"Target figure not found: {target_pdf}")
-
-        comparison = compare_pdf_images(ref_pdf, target_pdf)
-        comparison["name"] = figure_name
-        results.append(comparison)
-
-    return results
+                data.append([float(x) for x in parts[:8]])
+    return np.array(data)
 
 def calculate_all_rms_errors(bh_data_ref, bh_data_target):
     """
@@ -300,7 +165,7 @@ def print_rms_results(rms_dict, error, threshold=1.0):
 
     return all_passed
 
-def print_constraint_results(results, threshold=2.0):
+def print_constraint_results(results, threshold=2.0):
     print(f"\n{Color.BOLD}2. ADM Constraint Violation Analysis (Grid Level 0){Color.RESET}")
     print("-" * 65)
 
@@ -315,49 +180,22 @@ def print_constraint_results(results, threshold=2.0):
     print(f"\n   Maximum violation:  {results['max_violation']:.6f}")
     print(f"   Requirement:        < {threshold}")
     print(f"   Status:             {get_status_text(passed)}")
-
-    return passed
-
-
-def print_figure_results(results, threshold_percent=0.001):
-    print(f"\n{Color.BOLD}3. Figure Pixel Comparison (PDF Rasterization){Color.RESET}")
-    print("-" * 65)
-    print(f"   Requirement: < {threshold_percent:.3f}% differing pixels\n")
-
-    all_passed = True
-    for result in results:
-        passed = result["passed"]
-        all_passed = all_passed and passed
-        status = get_status_text(passed)
-        print(f"   {result['name']:32}: {result['diff_percent']:10.6f}%   |   Status: {status}")
-
-        if result["pages_ref"] != result["pages_target"]:
-            print(f"   {'':32}  pages(ref/target): {result['pages_ref']}/{result['pages_target']}")
-
-    return all_passed
-
-
-def print_figure_error(error_message):
-    print(f"\n{Color.BOLD}3. Figure Pixel Comparison (PDF Rasterization){Color.RESET}")
-    print("-" * 65)
-    print(f"   {Color.RED}Error: {error_message}{Color.RESET}")
-    return False
-
-
-def print_summary(rms_passed, constraint_passed, figure_passed):
-    print("\n" + Color.BLUE + Color.BOLD + "=" * 65 + Color.RESET)
-    print(Color.BOLD + "Verification Summary" + Color.RESET)
-    print(Color.BLUE + Color.BOLD + "=" * 65 + Color.RESET)
-
-    all_passed = rms_passed and constraint_passed and figure_passed
-    
-    res_rms = get_status_text(rms_passed)
-    res_con = get_status_text(constraint_passed)
-    res_fig = get_status_text(figure_passed)
-
-    print(f"   [1] Comprehensive RMS check:      {res_rms}")
-    print(f"   [2] ADM constraint check:         {res_con}")
-    print(f"   [3] Figure pixel comparison:      {res_fig}")
+
+    return passed
+
+
+def print_summary(rms_passed, constraint_passed):
+    print("\n" + Color.BLUE + Color.BOLD + "=" * 65 + Color.RESET)
+    print(Color.BOLD + "Verification Summary" + Color.RESET)
+    print(Color.BLUE + Color.BOLD + "=" * 65 + Color.RESET)
+
+    all_passed = rms_passed and constraint_passed
+    
+    res_rms = get_status_text(rms_passed)
+    res_con = get_status_text(constraint_passed)
+
+    print(f"   [1] Comprehensive RMS check:      {res_rms}")
+    print(f"   [2] ADM constraint check:         {res_con}")
     
     final_status = f"{Color.GREEN}{Color.BOLD}ALL CHECKS PASSED{Color.RESET}" if all_passed else f"{Color.RED}{Color.BOLD}SOME CHECKS FAILED{Color.RESET}"
     print(f"\n   Overall result: {final_status}")
@@ -372,14 +210,12 @@ def main():
         script_dir = os.path.dirname(os.path.abspath(__file__))
         target_dir = os.path.join(script_dir, "GW150914/AMSS_NCKU_output")
 
-    script_dir = os.path.dirname(os.path.abspath(__file__))
-    reference_dir = os.path.join(script_dir, "GW150914-origin/AMSS_NCKU_output")
-    target_figure_dir = resolve_figure_dir(target_dir)
-    reference_figure_dir = os.path.join(script_dir, "GW150914-origin/figure")
-
-    bh_file_ref = os.path.join(reference_dir, "bssn_BH.dat")
-    bh_file_target = os.path.join(target_dir, "bssn_BH.dat")
-    constraint_file = os.path.join(target_dir, "bssn_constraint.dat")
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    reference_dir = os.path.join(script_dir, "GW150914-origin/AMSS_NCKU_output")
+
+    bh_file_ref = os.path.join(reference_dir, "bssn_BH.dat")
+    bh_file_target = os.path.join(target_dir, "bssn_BH.dat")
+    constraint_file = os.path.join(target_dir, "bssn_constraint.dat")
 
     if not os.path.exists(bh_file_ref):
         print(f"{Color.RED}{Color.BOLD}Error:{Color.RESET} Baseline trajectory file not found: {bh_file_ref}")
@@ -391,11 +227,9 @@ def main():
         print(f"{Color.RED}{Color.BOLD}Error:{Color.RESET} Constraint data file not found: {constraint_file}")
         sys.exit(1)
 
-    print_header()
-    print(f"\n{Color.BOLD}Reference (Baseline):{Color.RESET} {Color.BLUE}{reference_dir}{Color.RESET}")
-    print(f"{Color.BOLD}Target (Optimized):  {Color.RESET} {Color.BLUE}{target_dir}{Color.RESET}")
-    print(f"{Color.BOLD}Reference Figures:   {Color.RESET} {Color.BLUE}{reference_figure_dir}{Color.RESET}")
-    print(f"{Color.BOLD}Target Figures:      {Color.RESET} {Color.BLUE}{target_figure_dir}{Color.RESET}")
+    print_header()
+    print(f"\n{Color.BOLD}Reference (Baseline):{Color.RESET} {Color.BLUE}{reference_dir}{Color.RESET}")
+    print(f"{Color.BOLD}Target (Optimized):  {Color.RESET} {Color.BLUE}{target_dir}{Color.RESET}")
 
     bh_data_ref = load_bh_trajectory(bh_file_ref)
     bh_data_target = load_bh_trajectory(bh_file_target)
@@ -405,18 +239,12 @@ def main():
     rms_dict, error = calculate_all_rms_errors(bh_data_ref, bh_data_target)
     rms_passed = print_rms_results(rms_dict, error)
 
-    # Output constraint results
-    constraint_results = analyze_constraint_violation(constraint_data)
-    constraint_passed = print_constraint_results(constraint_results)
-
-    try:
-        figure_results = compare_required_figures(reference_figure_dir, target_figure_dir)
-        figure_passed = print_figure_results(figure_results)
-    except (FileNotFoundError, RuntimeError) as exc:
-        figure_passed = print_figure_error(str(exc))
-
-    all_passed = print_summary(rms_passed, constraint_passed, figure_passed)
-    sys.exit(0 if all_passed else 1)
+    # Output constraint results
+    constraint_results = analyze_constraint_violation(constraint_data)
+    constraint_passed = print_constraint_results(constraint_results)
+
+    all_passed = print_summary(rms_passed, constraint_passed)
+    sys.exit(0 if all_passed else 1)
 
 if __name__ == "__main__":
     main()

AMSS_NCKU_source/Parallel.C

@@ -1,50 +1,14 @@
 
-#include "Parallel.h"
-#include "fmisc.h"
-#include "prolongrestrict.h"
-#include "misc.h"
-#include "parameters.h"
-
-namespace
-{
-enum { MAX_DATA_PACKER_VARS = 64 };
-
-int expand_var_list_pack_info(MyList<var> *src_list, MyList<var> *dst_list,
-                              int *src_sgfn, int *dst_sgfn, double **src_soa)
-{
-  int count = 0;
-  MyList<var> *src_it = src_list;
-  MyList<var> *dst_it = dst_list;
-
-  while (src_it && dst_it)
-  {
-    if (count >= MAX_DATA_PACKER_VARS)
-    {
-      cout << "Parallel::data_packer: too many variables in communication list." << endl;
-      MPI_Abort(MPI_COMM_WORLD, 1);
-    }
-    src_sgfn[count] = src_it->data->sgfn;
-    dst_sgfn[count] = dst_it->data->sgfn;
-    src_soa[count] = src_it->data->SoA;
-    count++;
-    src_it = src_it->next;
-    dst_it = dst_it->next;
-  }
-
-  if (src_it || dst_it)
-  {
-    cout << "error in short data packer, var lists does not match." << endl;
-    MPI_Abort(MPI_COMM_WORLD, 1);
-  }
-
-  return count;
-}
-}
-
-int Parallel::partition1(int &nx, int split_size, int min_width, int cpusize, int shape) // special for 1 diemnsion
-{
-  nx = Mymax(1, shape / min_width);
-  nx = Mymin(cpusize, nx);
+#include "Parallel.h"
+#include "fmisc.h"
+#include "prolongrestrict.h"
+#include "misc.h"
+#include "parameters.h"
+
+int Parallel::partition1(int &nx, int split_size, int min_width, int cpusize, int shape) // special for 1 diemnsion
+{
+  nx = Mymax(1, shape / min_width);
+  nx = Mymin(cpusize, nx);
 
   return nx;
 }
@@ -3747,11 +3711,11 @@ void Parallel::build_gstl(MyList<Parallel::gridseg> *srci, MyList<Parallel::grid
 }
 //   PACK: prepare target data in 'data'
 // UNPACK: copy target data from 'data' to corresponding numerical grids
-int Parallel::data_packer(double *data, MyList<Parallel::gridseg> *src, MyList<Parallel::gridseg> *dst, int rank_in, int dir,
-                          MyList<var> *VarLists /* source */, MyList<var> *VarListd /* target */, int Symmetry)
-{
-  int myrank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
+int Parallel::data_packer(double *data, MyList<Parallel::gridseg> *src, MyList<Parallel::gridseg> *dst, int rank_in, int dir,
+                          MyList<var> *VarLists /* source */, MyList<var> *VarListd /* target */, int Symmetry)
+{
+  int myrank;
+  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
 
   int DIM = dim;
 
@@ -3761,89 +3725,86 @@ int Parallel::data_packer(double *data, MyList<Parallel::gridseg> *src, MyList<P
     MPI_Abort(MPI_COMM_WORLD, 1);
   }
 
-  int size_out = 0;
-
-  if (!src || !dst)
-    return size_out;
-
-  int src_sgfn[MAX_DATA_PACKER_VARS];
-  int dst_sgfn[MAX_DATA_PACKER_VARS];
-  double *src_soa[MAX_DATA_PACKER_VARS];
-  const int var_count = expand_var_list_pack_info(VarLists, VarListd, src_sgfn, dst_sgfn, src_soa);
-
-  int type; /* 1 copy, 2 restrict, 3 prolong */
-  if (src->data->Bg->lev == dst->data->Bg->lev)
-    type = 1;
-  else if (src->data->Bg->lev > dst->data->Bg->lev)
-    type = 2;
-  else
-    type = 3;
-
-  while (src && dst)
-  {
-    const bool rank_match =
-        (dir == PACK && dst->data->Bg->rank == rank_in && src->data->Bg->rank == myrank) ||
-        (dir == UNPACK && src->data->Bg->rank == rank_in && dst->data->Bg->rank == myrank);
-
-    if (rank_match)
-    {
-      const int segment_size = dst->data->shape[0] * dst->data->shape[1] * dst->data->shape[2];
-      int offset = size_out;
-
-      if (data)
-      {
-        if (dir == PACK)
-        {
-          switch (type)
-          {
-            case 1:
-              for (int iv = 0; iv < var_count; iv++, offset += segment_size)
-                f_copy(DIM, dst->data->llb, dst->data->uub, dst->data->shape, data + offset,
-                       src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape,
-                       src->data->Bg->fgfs[src_sgfn[iv]], dst->data->llb, dst->data->uub);
-              break;
-            case 2:
-              for (int iv = 0; iv < var_count; iv++, offset += segment_size)
-                f_restrict3(DIM, dst->data->llb, dst->data->uub, dst->data->shape, data + offset,
-                            src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape,
-                            src->data->Bg->fgfs[src_sgfn[iv]], dst->data->llb, dst->data->uub,
-                            src_soa[iv], Symmetry);
-              break;
-            case 3:
-              for (int iv = 0; iv < var_count; iv++, offset += segment_size)
-                f_prolong3(DIM, src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape,
-                           src->data->Bg->fgfs[src_sgfn[iv]], dst->data->llb, dst->data->uub,
-                           dst->data->shape, data + offset, dst->data->llb, dst->data->uub,
-                           src_soa[iv], Symmetry);
-              break;
-            default:
-              break;
-          }
-        }
-        else
-        {
-          for (int iv = 0; iv < var_count; iv++, offset += segment_size)
-            f_copy(DIM, dst->data->Bg->bbox, dst->data->Bg->bbox + dim, dst->data->Bg->shape,
-                   dst->data->Bg->fgfs[dst_sgfn[iv]], dst->data->llb, dst->data->uub,
-                   dst->data->shape, data + offset, dst->data->llb, dst->data->uub);
-        }
-      }
-
-      size_out = offset + ((!data) ? segment_size * var_count : 0);
-      if (data)
-        size_out = offset;
-    }
-    dst = dst->next;
-    src = src->next;
-  }
-
+  int size_out = 0;
+
+  if (!src || !dst)
+    return size_out;
+
+  MyList<var> *varls, *varld;
+
+  varls = VarLists;
+  varld = VarListd;
+  while (varls && varld)
+  {
+    varls = varls->next;
+    varld = varld->next;
+  }
+
+  if (varls || varld)
+  {
+    cout << "error in short data packer, var lists does not match." << endl;
+    MPI_Abort(MPI_COMM_WORLD, 1);
+  }
+
+  int type; /* 1 copy, 2 restrict, 3 prolong */
+  if (src->data->Bg->lev == dst->data->Bg->lev)
+    type = 1;
+  else if (src->data->Bg->lev > dst->data->Bg->lev)
+    type = 2;
+  else
+    type = 3;
+
+  while (src && dst)
+  {
+    if ((dir == PACK && dst->data->Bg->rank == rank_in && src->data->Bg->rank == myrank) ||
+        (dir == UNPACK && src->data->Bg->rank == rank_in && dst->data->Bg->rank == myrank))
+    {
+      varls = VarLists;
+      varld = VarListd;
+      while (varls && varld)
+      {
+        if (data)
+        {
+          if (dir == PACK)
+            switch (type)
+            {
+              // attention must be paied to the difference between src's llb,uub and dst's llb,uub
+            case 1:
+              f_copy(DIM, dst->data->llb, dst->data->uub, dst->data->shape, data + size_out,
+                     src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape, src->data->Bg->fgfs[varls->data->sgfn],
+                     dst->data->llb, dst->data->uub);
+              break;
+            case 2:
+              f_restrict3(DIM, dst->data->llb, dst->data->uub, dst->data->shape, data + size_out,
+                          src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape, src->data->Bg->fgfs[varls->data->sgfn],
+                          dst->data->llb, dst->data->uub, varls->data->SoA, Symmetry);
+              break;
+            case 3:
+              f_prolong3(DIM, src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape, src->data->Bg->fgfs[varls->data->sgfn],
+                         dst->data->llb, dst->data->uub, dst->data->shape, data + size_out,
+                         dst->data->llb, dst->data->uub, varls->data->SoA, Symmetry);
+            }
+          if (dir == UNPACK) // from target data to corresponding grid
+            f_copy(DIM, dst->data->Bg->bbox, dst->data->Bg->bbox + dim, dst->data->Bg->shape, dst->data->Bg->fgfs[varld->data->sgfn],
+                   dst->data->llb, dst->data->uub, dst->data->shape, data + size_out,
+                   dst->data->llb, dst->data->uub);
+        }
+        size_out += dst->data->shape[0] * dst->data->shape[1] * dst->data->shape[2];
+        varls = varls->next;
+        varld = varld->next;
+      }
+    }
+    dst = dst->next;
+    src = src->next;
+  }
+
   return size_out;
 }
-int Parallel::data_packermix(double *data, MyList<Parallel::gridseg> *src, MyList<Parallel::gridseg> *dst, int rank_in, int dir,
-                             MyList<var> *VarLists /* source */, MyList<var> *VarListd /* target */, int Symmetry)
-{
-  int myrank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
+int Parallel::data_packermix(double *data, MyList<Parallel::gridseg> *src, MyList<Parallel::gridseg> *dst, int rank_in, int dir,
+                             MyList<var> *VarLists /* source */, MyList<var> *VarListd /* target */, int Symmetry)
+{
+  int myrank;
+  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
 
   int DIM = dim;
 
@@ -3853,22 +3814,33 @@ int Parallel::data_packermix(double *data, MyList<Parallel::gridseg> *src, MyLis
     MPI_Abort(MPI_COMM_WORLD, 1);
   }
 
-  int size_out = 0;
-
-  if (!src || !dst)
-    return size_out;
-
-  int src_sgfn[MAX_DATA_PACKER_VARS];
-  int dst_sgfn[MAX_DATA_PACKER_VARS];
-  double *src_soa[MAX_DATA_PACKER_VARS];
-  const int var_count = expand_var_list_pack_info(VarLists, VarListd, src_sgfn, dst_sgfn, src_soa);
-
-  int type; /* 1 copy, 2 restrict, 3 prolong */
-  if (src->data->Bg->lev == dst->data->Bg->lev)
-    type = 1;
-  else if (src->data->Bg->lev > dst->data->Bg->lev)
-    type = 2;
-  else
+  int size_out = 0;
+
+  if (!src || !dst)
+    return size_out;
+
+  MyList<var> *varls, *varld;
+
+  varls = VarLists;
+  varld = VarListd;
+  while (varls && varld)
+  {
+    varls = varls->next;
+    varld = varld->next;
+  }
+
+  if (varls || varld)
+  {
+    cout << "error in short data packer, var lists does not match." << endl;
+    MPI_Abort(MPI_COMM_WORLD, 1);
+  }
+
+  int type; /* 1 copy, 2 restrict, 3 prolong */
+  if (src->data->Bg->lev == dst->data->Bg->lev)
+    type = 1;
+  else if (src->data->Bg->lev > dst->data->Bg->lev)
+    type = 2;
+  else
     type = 3;
 
   if (type != 3)
@@ -3876,48 +3848,37 @@ int Parallel::data_packermix(double *data, MyList<Parallel::gridseg> *src, MyLis
     cout << "Parallel::data_packermix: error type " << type << " for data_packermix." << endl;
     MPI_Abort(MPI_COMM_WORLD, 1);
   }
-
-  while (src && dst)
-  {
-    const bool rank_match =
-        (dir == PACK && dst->data->Bg->rank == rank_in && src->data->Bg->rank == myrank) ||
-        (dir == UNPACK && src->data->Bg->rank == rank_in && dst->data->Bg->rank == myrank);
-
-    if (rank_match)
-    {
-      const int segment_size =
-          (src->data->shape[0] + 2 * ghost_width) *
-          (src->data->shape[1] + 2 * ghost_width) *
-          (src->data->shape[2] + 2 * ghost_width);
-      int offset = size_out;
-
-      if (data)
-      {
-        if (dir == PACK)
-        {
-          for (int iv = 0; iv < var_count; iv++, offset += segment_size)
-            f_prolongcopy3(DIM, src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape,
-                           src->data->Bg->fgfs[src_sgfn[iv]], dst->data->llb, dst->data->uub,
-                           src->data->shape, data + offset, src->data->llb, src->data->uub,
-                           src_soa[iv], Symmetry);
-        }
-        else
-        {
-          for (int iv = 0; iv < var_count; iv++, offset += segment_size)
-            f_prolongmix3(DIM, dst->data->Bg->bbox, dst->data->Bg->bbox + dim, dst->data->Bg->shape,
-                          dst->data->Bg->fgfs[dst_sgfn[iv]], src->data->llb, src->data->uub,
-                          src->data->shape, data + offset, dst->data->llb, dst->data->uub,
-                          src_soa[iv], Symmetry, dst->data->illb, dst->data->iuub);
-        }
-      }
-
-      size_out = offset + ((!data) ? segment_size * var_count : 0);
-      if (data)
-        size_out = offset;
-    }
-    dst = dst->next;
-    src = src->next;
-  }
+
+  while (src && dst)
+  {
+    if ((dir == PACK && dst->data->Bg->rank == rank_in && src->data->Bg->rank == myrank) ||
+        (dir == UNPACK && src->data->Bg->rank == rank_in && dst->data->Bg->rank == myrank))
+    {
+      varls = VarLists;
+      varld = VarListd;
+      while (varls && varld)
+      {
+        if (data)
+        {
+          if (dir == PACK)
+            f_prolongcopy3(DIM, src->data->Bg->bbox, src->data->Bg->bbox + dim, src->data->Bg->shape, src->data->Bg->fgfs[varls->data->sgfn],
+                           dst->data->llb, dst->data->uub, src->data->shape, data + size_out,
+                           src->data->llb, src->data->uub, varls->data->SoA, Symmetry);
+          if (dir == UNPACK) // from target data to corresponding grid
+            f_prolongmix3(DIM, dst->data->Bg->bbox, dst->data->Bg->bbox + dim, dst->data->Bg->shape, dst->data->Bg->fgfs[varld->data->sgfn],
+                          src->data->llb, src->data->uub, src->data->shape, data + size_out,
+                          dst->data->llb, dst->data->uub, varls->data->SoA, Symmetry, dst->data->illb, dst->data->iuub);
+        }
+        // the symmetry problem should be dealt in prolongcopy3,
+        // so we always have ghost_width for both sides
+        size_out += (src->data->shape[0] + 2 * ghost_width) * (src->data->shape[1] + 2 * ghost_width) * (src->data->shape[2] + 2 * ghost_width);
+        varls = varls->next;
+        varld = varld->next;
+      }
+    }
+    dst = dst->next;
+    src = src->next;
+  }
 
   return size_out;
 }
@@ -5292,10 +5253,10 @@ void Parallel::PeriodicBD(Patch *Pat, MyList<var> *VarList, int Symmetry)
   delete[] transfer_src;
   delete[] transfer_dst;
 }
-double Parallel::L2Norm(Patch *Pat, var *vf)
-{
-  int myrank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
+double Parallel::L2Norm(Patch *Pat, var *vf)
+{
+  int myrank;
+  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
 
   double tvf, dtvf = 0;
   int BDW = ghost_width;
@@ -5320,48 +5281,13 @@ double Parallel::L2Norm(Patch *Pat, var *vf)
   MPI_Allreduce(&dtvf, &tvf, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
 
   tvf = sqrt(tvf);
-
-  return tvf;
-}
-void Parallel::L2Norm7(Patch *Pat, var **vf, double *norms)
-{
-  int myrank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
-
-  double tvf[7], dtvf[7];
-  int BDW = ghost_width;
-  for (int i = 0; i < 7; i++)
-    dtvf[i] = 0;
-
-  MyList<Block> *BP = Pat->blb;
-  while (BP)
-  {
-    Block *cg = BP->data;
-    if (myrank == cg->rank)
-    {
-      f_l2normhelper7(cg->shape, cg->X[0], cg->X[1], cg->X[2],
-                      Pat->bbox[0], Pat->bbox[1], Pat->bbox[2],
-                      Pat->bbox[3], Pat->bbox[4], Pat->bbox[5],
-                      cg->fgfs[vf[0]->sgfn], cg->fgfs[vf[1]->sgfn], cg->fgfs[vf[2]->sgfn],
-                      cg->fgfs[vf[3]->sgfn], cg->fgfs[vf[4]->sgfn], cg->fgfs[vf[5]->sgfn],
-                      cg->fgfs[vf[6]->sgfn], tvf, BDW);
-      for (int i = 0; i < 7; i++)
-        dtvf[i] += tvf[i];
-    }
-    if (BP == Pat->ble)
-      break;
-    BP = BP->next;
-  }
-
-  MPI_Allreduce(dtvf, tvf, 7, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-
-  for (int i = 0; i < 7; i++)
-    norms[i] = sqrt(tvf[i]);
-}
-double Parallel::L2Norm(Patch *Pat, var *vf, MPI_Comm Comm_here)
-{
-  int myrank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
+
+  return tvf;
+}
+double Parallel::L2Norm(Patch *Pat, var *vf, MPI_Comm Comm_here)
+{
+  int myrank;
+  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
 
   double tvf, dtvf = 0;
   int BDW = ghost_width;
@@ -5386,47 +5312,12 @@ double Parallel::L2Norm(Patch *Pat, var *vf, MPI_Comm Comm_here)
   MPI_Allreduce(&dtvf, &tvf, 1, MPI_DOUBLE, MPI_SUM, Comm_here);
 
   tvf = sqrt(tvf);
-
-  return tvf;
-}
-void Parallel::L2Norm7(Patch *Pat, var **vf, double *norms, MPI_Comm Comm_here)
-{
-  int myrank;
-  MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
-
-  double tvf[7], dtvf[7];
-  int BDW = ghost_width;
-  for (int i = 0; i < 7; i++)
-    dtvf[i] = 0;
-
-  MyList<Block> *BP = Pat->blb;
-  while (BP)
-  {
-    Block *cg = BP->data;
-    if (myrank == cg->rank)
-    {
-      f_l2normhelper7(cg->shape, cg->X[0], cg->X[1], cg->X[2],
-                      Pat->bbox[0], Pat->bbox[1], Pat->bbox[2],
-                      Pat->bbox[3], Pat->bbox[4], Pat->bbox[5],
-                      cg->fgfs[vf[0]->sgfn], cg->fgfs[vf[1]->sgfn], cg->fgfs[vf[2]->sgfn],
-                      cg->fgfs[vf[3]->sgfn], cg->fgfs[vf[4]->sgfn], cg->fgfs[vf[5]->sgfn],
-                      cg->fgfs[vf[6]->sgfn], tvf, BDW);
-      for (int i = 0; i < 7; i++)
-        dtvf[i] += tvf[i];
-    }
-    if (BP == Pat->ble)
-      break;
-    BP = BP->next;
-  }
-
-  MPI_Allreduce(dtvf, tvf, 7, MPI_DOUBLE, MPI_SUM, Comm_here);
-
-  for (int i = 0; i < 7; i++)
-    norms[i] = sqrt(tvf[i]);
-}
-void Parallel::checkgsl(MyList<Parallel::gridseg> *pp, bool first_only)
-{
-  int myrank = 0;
+
+  return tvf;
+}
+void Parallel::checkgsl(MyList<Parallel::gridseg> *pp, bool first_only)
+{
+  int myrank = 0;
   MPI_Comm_rank(MPI_COMM_WORLD, &myrank);
   if (myrank == 0)
   {

AMSS_NCKU_source/Parallel.h

@@ -179,13 +179,12 @@ namespace Parallel
   MyList<Parallel::gridseg> *clone_gsl(MyList<Parallel::gridseg> *p, bool first_only);
   MyList<Parallel::gridseg> *build_bulk_gsl(Patch *Pat); // similar to build_owned_gsl0 but does not care rank issue
   MyList<Parallel::gridseg> *build_bulk_gsl(Block *bp, Patch *Pat);
-  void build_PhysBD_gstl(Patch *Pat, MyList<Parallel::gridseg> *srci, MyList<Parallel::gridseg> *dsti,
-                         MyList<Parallel::gridseg> **out_src, MyList<Parallel::gridseg> **out_dst);
-  void PeriodicBD(Patch *Pat, MyList<var> *VarList, int Symmetry);
-  double L2Norm(Patch *Pat, var *vf);
-  void L2Norm7(Patch *Pat, var **vf, double *norms);
-  void checkgsl(MyList<Parallel::gridseg> *pp, bool first_only);
-  void checkvarl(MyList<var> *pp, bool first_only);
+  void build_PhysBD_gstl(Patch *Pat, MyList<Parallel::gridseg> *srci, MyList<Parallel::gridseg> *dsti,
+                         MyList<Parallel::gridseg> **out_src, MyList<Parallel::gridseg> **out_dst);
+  void PeriodicBD(Patch *Pat, MyList<var> *VarList, int Symmetry);
+  double L2Norm(Patch *Pat, var *vf);
+  void checkgsl(MyList<Parallel::gridseg> *pp, bool first_only);
+  void checkvarl(MyList<var> *pp, bool first_only);
   MyList<Parallel::gridseg> *divide_gsl(MyList<Parallel::gridseg> *p, Patch *Pat);
   MyList<Parallel::gridseg> *divide_gs(MyList<Parallel::gridseg> *p, Patch *Pat);
   void prepare_inter_time_level(Patch *Pat,
@@ -217,12 +216,11 @@ namespace Parallel
   void aligncheck(double *bbox0, double *bboxl, int lev, double *DH0, int *shape);
   bool point_locat_gsl(double *pox, MyList<Parallel::gridseg> *gsl);
   void checkpatchlist(MyList<Patch> *PatL, bool buflog);
-
-  double L2Norm(Patch *Pat, var *vf, MPI_Comm Comm_here);
-  void L2Norm7(Patch *Pat, var **vf, double *norms, MPI_Comm Comm_here);
-  bool PatList_Interp_Points(MyList<Patch> *PatL, MyList<var> *VarList,
-                             int NN, double **XX,
-                             double *Shellf, int Symmetry, MPI_Comm Comm_here);
+
+  double L2Norm(Patch *Pat, var *vf, MPI_Comm Comm_here);
+  bool PatList_Interp_Points(MyList<Patch> *PatL, MyList<var> *VarList,
+                             int NN, double **XX,
+                             double *Shellf, int Symmetry, MPI_Comm Comm_here);
 #if (PSTR == 1 || PSTR == 2 || PSTR == 3)
   MyList<Block> *distribute(MyList<Patch> *PatchLIST, int cpusize, int ingfsi, int fngfsi,
                             bool periodic, int start_rank, int end_rank, int nodes = 0);

AMSS_NCKU_source/ShellPatch.C

@@ -3439,10 +3439,10 @@ void ShellPatch::write_Pablo_file_ss(int *ext, double xmin, double xmax, double
   delete[] Z;
 }
 
-double ShellPatch::L2Norm(var *vf)
-{
-  double tvf, dtvf = 0;
-  int BDW = overghost;
+double ShellPatch::L2Norm(var *vf)
+{
+  double tvf, dtvf = 0;
+  int BDW = overghost;
 
   MyList<ss_patch> *sPp = PatL;
   while (sPp)
@@ -3469,50 +3469,13 @@ double ShellPatch::L2Norm(var *vf)
   MPI_Allreduce(&dtvf, &tvf, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
 
   tvf = sqrt(tvf);
-
-  return tvf;
-}
-void ShellPatch::L2Norm7(var **vf, double *norms)
-{
-  double tvf[7], dtvf[7];
-  int BDW = overghost;
-  for (int i = 0; i < 7; i++)
-    dtvf[i] = 0;
-
-  MyList<ss_patch> *sPp = PatL;
-  while (sPp)
-  {
-    MyList<Block> *Bp = sPp->data->blb;
-    while (Bp)
-    {
-      Block *cg = Bp->data;
-      if (myrank == cg->rank)
-      {
-        f_l2normhelper7(cg->shape, cg->X[0], cg->X[1], cg->X[2],
-                        sPp->data->bbox[0], sPp->data->bbox[1], sPp->data->bbox[2],
-                        sPp->data->bbox[3], sPp->data->bbox[4], sPp->data->bbox[5],
-                        cg->fgfs[vf[0]->sgfn], cg->fgfs[vf[1]->sgfn], cg->fgfs[vf[2]->sgfn],
-                        cg->fgfs[vf[3]->sgfn], cg->fgfs[vf[4]->sgfn], cg->fgfs[vf[5]->sgfn],
-                        cg->fgfs[vf[6]->sgfn], tvf, BDW);
-        for (int i = 0; i < 7; i++)
-          dtvf[i] += tvf[i];
-      }
-      if (Bp == sPp->data->ble)
-        break;
-      Bp = Bp->next;
-    }
-    sPp = sPp->next;
-  }
-
-  MPI_Allreduce(dtvf, tvf, 7, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-
-  for (int i = 0; i < 7; i++)
-    norms[i] = sqrt(tvf[i]);
-}
-
-// find maximum of abstract value, XX store position for maximum, Shellf store maximum themselvs
-void ShellPatch::Find_Maximum(MyList<var> *VarList, double *XX,
-                              double *Shellf)
+
+  return tvf;
+}
+
+// find maximum of abstract value, XX store position for maximum, Shellf store maximum themselvs
+void ShellPatch::Find_Maximum(MyList<var> *VarList, double *XX,
+                              double *Shellf)
 {
   MyList<var> *varl;
   int num_var = 0;

AMSS_NCKU_source/ShellPatch.h

@@ -195,11 +195,10 @@ public:
    bool Interp_One_Point(MyList<var> *VarList,
                          double *XX, /*input global Cartesian coordinate*/
                          double *Shellf, int Symmetry);
-   void write_Pablo_file_ss(int *ext, double xmin, double xmax, double ymin, double ymax, double zmin, double zmax,
-                            char *filename, int sst);
-   double L2Norm(var *vf);
-   void L2Norm7(var **vf, double *norms);
-   void Find_Maximum(MyList<var> *VarList, double *XX, double *Shellf);
-};
+   void write_Pablo_file_ss(int *ext, double xmin, double xmax, double ymin, double ymax, double zmin, double zmax,
+                            char *filename, int sst);
+   double L2Norm(var *vf);
+   void Find_Maximum(MyList<var> *VarList, double *XX, double *Shellf);
+};
 
 #endif /* SHELLPATCH_H */

AMSS_NCKU_source/bssnEM_class.C

@@ -258,8 +258,6 @@ void bssnEM_class::Initialize()
     PhysTime = StartTime;
     Setup_Black_Hole_position();
   }
-
-  setup_transfer_caches();
 }
 
 //================================================================================================

AMSS_NCKU_source/bssnEScalar_class.C

@@ -23,14 +23,8 @@ using namespace std;
 #include "rungekutta4_rout.h"
 #include "sommerfeld_rout.h"
 #include "getnp4.h"
-#include "shellfunctions.h"
-#include "parameters.h"
-
-#if BSSN_USE_ESCALAR_C_KERNEL
-#define BSSN_ESCALAR_RHS f_compute_rhs_bssn_escalar_c
-#else
-#define BSSN_ESCALAR_RHS f_compute_rhs_bssn_escalar
-#endif
+#include "shellfunctions.h"
+#include "parameters.h"
 
 #ifdef With_AHF
 #include "derivatives.h"
@@ -80,8 +74,8 @@ bssnEScalar_class::bssnEScalar_class(double Couranti, double StartTimei, double
 
 //================================================================================================
 
-void bssnEScalar_class::Initialize()
-{
+void bssnEScalar_class::Initialize()
+{
   Sphio = new var("Sphio", ngfs++, 1, 1, 1);
   Spio = new var("Spio", ngfs++, 1, 1, 1);
   Sphi0 = new var("Sphi0", ngfs++, 1, 1, 1);
@@ -138,14 +132,11 @@ void bssnEScalar_class::Initialize()
       }
     } 
    
-  GH = new cgh(0, ngfs, Symmetry, pname, checkrun, ErrorMonitor);
-  ConstraintRefreshLevels = new int[GH->levels];
-  for (int il = 0; il < GH->levels; il++)
-    ConstraintRefreshLevels[il] = 0;
-  if (checkrun)
-    CheckPoint->readcheck_cgh(PhysTime, GH, myrank, nprocs, Symmetry);
-  else
-    GH->compose_cgh(nprocs);
+  GH = new cgh(0, ngfs, Symmetry, pname, checkrun, ErrorMonitor);
+  if (checkrun)
+    CheckPoint->readcheck_cgh(PhysTime, GH, myrank, nprocs, Symmetry);
+  else
+    GH->compose_cgh(nprocs);
 
 #ifdef WithShell
   SH = new ShellPatch(0, ngfs, pname, Symmetry, myrank, ErrorMonitor);
@@ -169,14 +160,12 @@ void bssnEScalar_class::Initialize()
   {
     CheckPoint->read_Black_Hole_position(BH_num_input, BH_num, Porg0, Pmom, Spin, Mass, Porgbr, Porg, Porg1, Porg_rhs);
   }
-  else
-  {
-    PhysTime = StartTime;
-    Setup_Black_Hole_position();
-  }
-
-  setup_transfer_caches();
-}
+  else
+  {
+    PhysTime = StartTime;
+    Setup_Black_Hole_position();
+  }
+}
 
 //================================================================================================
 
@@ -218,10 +207,10 @@ bssnEScalar_class::~bssnEScalar_class()
 
 // Read initial data solved by Ansorg, PRD 70, 064011 (2004)
 
-void bssnEScalar_class::Read_Ansorg()
-{
-  if (!checkrun)
-  {
+void bssnEScalar_class::Read_Ansorg()
+{
+  if (!checkrun)
+  {
     if (myrank == 0)
       cout << "Read initial data from Ansorg's solver,"
            << " please be sure the input parameters for black holes are puncture parameters!!" 
@@ -238,12 +227,9 @@ void bssnEScalar_class::Read_Ansorg()
         cout << "Error inputpar" << endl;
         exit(0);
       }
-    }
-    int BH_NM;
-    double *Porg_here;
-    double *pmom_local;
-    double *spin_local;
-    double *mass_local;
+    }
+    int BH_NM;
+    double *Porg_here;
     // read parameter from file
     {
       const int LEN = 256;
@@ -283,11 +269,11 @@ void bssnEScalar_class::Read_Ansorg()
       }
       inf.close();
     }
-
-    Porg_here = new double[3 * BH_NM];
-    pmom_local = new double[3 * BH_NM];
-    spin_local = new double[3 * BH_NM];
-    mass_local = new double[BH_NM];
+
+    Porg_here = new double[3 * BH_NM];
+    Pmom = new double[3 * BH_NM];
+    Spin = new double[3 * BH_NM];
+    Mass = new double[BH_NM];
     // read parameter from file
     {
       const int LEN = 256;
@@ -319,37 +305,37 @@ void bssnEScalar_class::Read_Ansorg()
         else if (status == 0)
           continue;
 
-        if (sgrp == "BSSN" && sind < BH_NM)
-        {
-          if (skey == "Mass")
-            mass_local[sind] = atof(sval.c_str());
-          else if (skey == "Porgx")
-            Porg_here[sind * 3] = atof(sval.c_str());
-          else if (skey == "Porgy")
-            Porg_here[sind * 3 + 1] = atof(sval.c_str());
-          else if (skey == "Porgz")
-            Porg_here[sind * 3 + 2] = atof(sval.c_str());
-          else if (skey == "Spinx")
-            spin_local[sind * 3] = atof(sval.c_str());
-          else if (skey == "Spiny")
-            spin_local[sind * 3 + 1] = atof(sval.c_str());
-          else if (skey == "Spinz")
-            spin_local[sind * 3 + 2] = atof(sval.c_str());
-          else if (skey == "Pmomx")
-            pmom_local[sind * 3] = atof(sval.c_str());
-          else if (skey == "Pmomy")
-            pmom_local[sind * 3 + 1] = atof(sval.c_str());
-          else if (skey == "Pmomz")
-            pmom_local[sind * 3 + 2] = atof(sval.c_str());
-        }
-      }
-      inf.close();
+        if (sgrp == "BSSN" && sind < BH_NM)
+        {
+          if (skey == "Mass")
+            Mass[sind] = atof(sval.c_str());
+          else if (skey == "Porgx")
+            Porg_here[sind * 3] = atof(sval.c_str());
+          else if (skey == "Porgy")
+            Porg_here[sind * 3 + 1] = atof(sval.c_str());
+          else if (skey == "Porgz")
+            Porg_here[sind * 3 + 2] = atof(sval.c_str());
+          else if (skey == "Spinx")
+            Spin[sind * 3] = atof(sval.c_str());
+          else if (skey == "Spiny")
+            Spin[sind * 3 + 1] = atof(sval.c_str());
+          else if (skey == "Spinz")
+            Spin[sind * 3 + 2] = atof(sval.c_str());
+          else if (skey == "Pmomx")
+            Pmom[sind * 3] = atof(sval.c_str());
+          else if (skey == "Pmomy")
+            Pmom[sind * 3 + 1] = atof(sval.c_str());
+          else if (skey == "Pmomz")
+            Pmom[sind * 3 + 2] = atof(sval.c_str());
+        }
+      }
+      inf.close();
     }
-    int order = 6;
-    Ansorg read_ansorg("Ansorg.psid", order);
-    // set initial data
-    for (int lev = 0; lev < GH->levels; lev++)
-    {
+    int order = 6;
+    Ansorg read_ansorg("Ansorg.psid", order);
+    // set initial data
+    for (int lev = 0; lev < GH->levels; lev++)
+    {
       MyList<Patch> *Pp = GH->PatL[lev];
       while (Pp)
       {
@@ -372,21 +358,21 @@ void bssnEScalar_class::Read_Ansorg()
                                       cg->fgfs[Axx0->sgfn], cg->fgfs[Axy0->sgfn], cg->fgfs[Axz0->sgfn], 
                                       cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn],
                                       cg->fgfs[Gmx0->sgfn], cg->fgfs[Gmy0->sgfn], cg->fgfs[Gmz0->sgfn],
-                                      cg->fgfs[Lap0->sgfn], 
-                                      cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
-                                      cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
-                                      cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
-                                      mass_local, Porg_here, pmom_local, spin_local, BH_NM);
+                                      cg->fgfs[Lap0->sgfn], 
+                                      cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
+                                      cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
+                                      cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
+                                      Mass, Porg_here, Pmom, Spin, BH_NM);
           }
           if (BL == Pp->data->ble)
             break;
           BL = BL->next;
-        }
-        Pp = Pp->next;
-      }
-    }
-#ifdef WithShell
-    // ShellPatch part
+        }
+        Pp = Pp->next;
+      }
+    }
+#ifdef WithShell
+    // ShellPatch part
     MyList<ss_patch> *Pp = SH->PatL;
     while (Pp)
     {
@@ -414,28 +400,25 @@ void bssnEScalar_class::Read_Ansorg()
                                        cg->fgfs[Axx0->sgfn], cg->fgfs[Axy0->sgfn], cg->fgfs[Axz0->sgfn], 
                                        cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn],
                                        cg->fgfs[Gmx0->sgfn], cg->fgfs[Gmy0->sgfn], cg->fgfs[Gmz0->sgfn],
-                                       cg->fgfs[Lap0->sgfn], 
-                                       cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
-                                       cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
-                                       cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
-                                       mass_local, Porg_here, pmom_local, spin_local, BH_NM);
+                                       cg->fgfs[Lap0->sgfn], 
+                                       cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
+                                       cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
+                                       cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
+                                       Mass, Porg_here, Pmom, Spin, BH_NM);
         }
         if (BL == Pp->data->ble)
           break;
         BL = BL->next;
-      }
-      Pp = Pp->next;
-    }
-#endif
-
-    delete[] Porg_here;
-    delete[] pmom_local;
-    delete[] spin_local;
-    delete[] mass_local;
-    // dump read_in initial data
-    //   for(int lev=0;lev<GH->levels;lev++) Parallel::Dump_Data(GH->PatL[lev],StateList,0,PhysTime,dT);
-  }
-}
+      }
+      Pp = Pp->next;
+    }
+#endif
+
+    delete[] Porg_here;
+    // dump read_in initial data
+    //   for(int lev=0;lev<GH->levels;lev++) Parallel::Dump_Data(GH->PatL[lev],StateList,0,PhysTime,dT);
+  }
+}
 
 //================================================================================================
 
@@ -449,10 +432,10 @@ void bssnEScalar_class::Read_Ansorg()
 
 // Read initial data solved by Pablo's Olliptic Phys.Rev.D 82 024005 (2010)
 
-void bssnEScalar_class::Read_Pablo()
-{
-  if (!checkrun)
-  {
+void bssnEScalar_class::Read_Pablo()
+{
+  if (!checkrun)
+  {
     if (myrank == 0)
       cout << "Read initial data from Pablo's solver,"
            << " please be sure the input parameters for black holes are puncture parameters!!" 
@@ -469,12 +452,9 @@ void bssnEScalar_class::Read_Pablo()
         cout << "Error inputpar" << endl;
         exit(0);
       }
-    }
-    int BH_NM;
-    double *Porg_here;
-    double *pmom_local;
-    double *spin_local;
-    double *mass_local;
+    }
+    int BH_NM;
+    double *Porg_here;
     // read parameter from file
     {
       const int LEN = 256;
@@ -514,11 +494,11 @@ void bssnEScalar_class::Read_Pablo()
       }
       inf.close();
     }
-
-    Porg_here = new double[3 * BH_NM];
-    pmom_local = new double[3 * BH_NM];
-    spin_local = new double[3 * BH_NM];
-    mass_local = new double[BH_NM];
+
+    Porg_here = new double[3 * BH_NM];
+    Pmom = new double[3 * BH_NM];
+    Spin = new double[3 * BH_NM];
+    Mass = new double[BH_NM];
     // read parameter from file
     {
       const int LEN = 256;
@@ -550,31 +530,31 @@ void bssnEScalar_class::Read_Pablo()
         else if (status == 0)
           continue;
 
-        if (sgrp == "BSSN" && sind < BH_NM)
-        {
-          if (skey == "Mass")
-            mass_local[sind] = atof(sval.c_str());
-          else if (skey == "Porgx")
-            Porg_here[sind * 3] = atof(sval.c_str());
-          else if (skey == "Porgy")
-            Porg_here[sind * 3 + 1] = atof(sval.c_str());
-          else if (skey == "Porgz")
-            Porg_here[sind * 3 + 2] = atof(sval.c_str());
-          else if (skey == "Spinx")
-            spin_local[sind * 3] = atof(sval.c_str());
-          else if (skey == "Spiny")
-            spin_local[sind * 3 + 1] = atof(sval.c_str());
-          else if (skey == "Spinz")
-            spin_local[sind * 3 + 2] = atof(sval.c_str());
-          else if (skey == "Pmomx")
-            pmom_local[sind * 3] = atof(sval.c_str());
-          else if (skey == "Pmomy")
-            pmom_local[sind * 3 + 1] = atof(sval.c_str());
-          else if (skey == "Pmomz")
-            pmom_local[sind * 3 + 2] = atof(sval.c_str());
-        }
-      }
-      inf.close();
+        if (sgrp == "BSSN" && sind < BH_NM)
+        {
+          if (skey == "Mass")
+            Mass[sind] = atof(sval.c_str());
+          else if (skey == "Porgx")
+            Porg_here[sind * 3] = atof(sval.c_str());
+          else if (skey == "Porgy")
+            Porg_here[sind * 3 + 1] = atof(sval.c_str());
+          else if (skey == "Porgz")
+            Porg_here[sind * 3 + 2] = atof(sval.c_str());
+          else if (skey == "Spinx")
+            Spin[sind * 3] = atof(sval.c_str());
+          else if (skey == "Spiny")
+            Spin[sind * 3 + 1] = atof(sval.c_str());
+          else if (skey == "Spinz")
+            Spin[sind * 3 + 2] = atof(sval.c_str());
+          else if (skey == "Pmomx")
+            Pmom[sind * 3] = atof(sval.c_str());
+          else if (skey == "Pmomy")
+            Pmom[sind * 3 + 1] = atof(sval.c_str());
+          else if (skey == "Pmomz")
+            Pmom[sind * 3 + 2] = atof(sval.c_str());
+        }
+      }
+      inf.close();
     }
     bool flag = false;
     int DIM = dim;
@@ -614,11 +594,11 @@ void bssnEScalar_class::Read_Pablo()
                                         cg->fgfs[Axx0->sgfn], cg->fgfs[Axy0->sgfn], cg->fgfs[Axz0->sgfn], 
                                         cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn],
                                         cg->fgfs[Gmx0->sgfn], cg->fgfs[Gmy0->sgfn], cg->fgfs[Gmz0->sgfn],
-                                        cg->fgfs[Lap0->sgfn], 
-                                        cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
-                                        cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
-                                        cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
-                                        mass_local, Porg_here, pmom_local, spin_local, BH_NM);
+                                        cg->fgfs[Lap0->sgfn], 
+                                        cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
+                                        cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
+                                        cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
+                                        Mass, Porg_here, Pmom, Spin, BH_NM);
             }
             if (BL == Pp->data->ble)
               break;
@@ -678,11 +658,11 @@ void bssnEScalar_class::Read_Pablo()
                                          cg->fgfs[Axx0->sgfn], cg->fgfs[Axy0->sgfn], cg->fgfs[Axz0->sgfn], 
                                          cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn],
                                          cg->fgfs[Gmx0->sgfn], cg->fgfs[Gmy0->sgfn], cg->fgfs[Gmz0->sgfn],
-                                         cg->fgfs[Lap0->sgfn], 
-                                         cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
-                                         cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
-                                         cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
-                                         mass_local, Porg_here, pmom_local, spin_local, BH_NM);
+                                         cg->fgfs[Lap0->sgfn], 
+                                         cg->fgfs[Sfx0->sgfn], cg->fgfs[Sfy0->sgfn], cg->fgfs[Sfz0->sgfn],
+                                         cg->fgfs[dtSfx0->sgfn], cg->fgfs[dtSfy0->sgfn], cg->fgfs[dtSfz0->sgfn],
+                                         cg->fgfs[Sphi0->sgfn], cg->fgfs[Spi0->sgfn],
+                                         Mass, Porg_here, Pmom, Spin, BH_NM);
           }
           if (BL == Pp->data->ble)
             break;
@@ -704,13 +684,10 @@ void bssnEScalar_class::Read_Pablo()
       Pp = Pp->next;
     }
 #endif
-
-    delete[] Porg_here;
-    delete[] pmom_local;
-    delete[] spin_local;
-    delete[] mass_local;
-    if (flag && myrank == 0)
-      MPI_Abort(MPI_COMM_WORLD, 1);
+
+    delete[] Porg_here;
+    if (flag && myrank == 0)
+      MPI_Abort(MPI_COMM_WORLD, 1);
     // dump read_in initial data
     for (int lev = 0; lev < GH->levels; lev++)
       Parallel::Dump_Data(GH->PatL[lev], StateList, 0, PhysTime, dT);
@@ -762,10 +739,10 @@ void bssnEScalar_class::Step(int lev, int YN)
                      cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn]);
 #endif
 
-        if (BSSN_ESCALAR_RHS(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
-                                       cg->fgfs[phi0->sgfn], cg->fgfs[trK0->sgfn],
-                                       cg->fgfs[gxx0->sgfn], cg->fgfs[gxy0->sgfn], cg->fgfs[gxz0->sgfn], 
-                                       cg->fgfs[gyy0->sgfn], cg->fgfs[gyz0->sgfn], cg->fgfs[gzz0->sgfn],
+        if (f_compute_rhs_bssn_escalar(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
+                                       cg->fgfs[phi0->sgfn], cg->fgfs[trK0->sgfn],
+                                       cg->fgfs[gxx0->sgfn], cg->fgfs[gxy0->sgfn], cg->fgfs[gxz0->sgfn], 
+                                       cg->fgfs[gyy0->sgfn], cg->fgfs[gyz0->sgfn], cg->fgfs[gzz0->sgfn],
                                        cg->fgfs[Axx0->sgfn], cg->fgfs[Axy0->sgfn], cg->fgfs[Axz0->sgfn], 
                                        cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn],
                                        cg->fgfs[Gmx0->sgfn], cg->fgfs[Gmy0->sgfn], cg->fgfs[Gmz0->sgfn],
@@ -1016,12 +993,11 @@ void bssnEScalar_class::Step(int lev, int YN)
   }
 #endif
 
-  Parallel::AsyncSyncState async_pre;
-  sync_predictor_start(lev, SynchList_pre, async_pre);
+  Parallel::Sync(GH->PatL[lev], SynchList_pre, Symmetry);
 
-#ifdef WithShell
-  if (lev == 0)
-  {
+#ifdef WithShell
+  if (lev == 0)
+  {
     clock_t prev_clock, curr_clock;
     if (myrank == 0)
       curr_clock = clock();
@@ -1033,10 +1009,9 @@ void bssnEScalar_class::Step(int lev, int YN)
       cout << " Shell stuff synchronization used " 
            << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) 
            << " seconds! " << endl;
-    }
-  }
-#endif
-  sync_predictor_finish(lev, async_pre, SynchList_pre);
+    }
+  }
+#endif
 
   // for black hole position
   if (BH_num > 0 && lev == GH->levels - 1)
@@ -1106,10 +1081,10 @@ void bssnEScalar_class::Step(int lev, int YN)
                          cg->fgfs[Ayy->sgfn], cg->fgfs[Ayz->sgfn], cg->fgfs[Azz->sgfn]);
 #endif
 
-          if (BSSN_ESCALAR_RHS(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
-                                         cg->fgfs[phi->sgfn], cg->fgfs[trK->sgfn],
-                                         cg->fgfs[gxx->sgfn], cg->fgfs[gxy->sgfn], cg->fgfs[gxz->sgfn], 
-                                         cg->fgfs[gyy->sgfn], cg->fgfs[gyz->sgfn], cg->fgfs[gzz->sgfn],
+          if (f_compute_rhs_bssn_escalar(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
+                                         cg->fgfs[phi->sgfn], cg->fgfs[trK->sgfn],
+                                         cg->fgfs[gxx->sgfn], cg->fgfs[gxy->sgfn], cg->fgfs[gxz->sgfn], 
+                                         cg->fgfs[gyy->sgfn], cg->fgfs[gyz->sgfn], cg->fgfs[gzz->sgfn],
                                          cg->fgfs[Axx->sgfn], cg->fgfs[Axy->sgfn], cg->fgfs[Axz->sgfn], 
                                          cg->fgfs[Ayy->sgfn], cg->fgfs[Ayz->sgfn], cg->fgfs[Azz->sgfn],
                                          cg->fgfs[Gmx->sgfn], cg->fgfs[Gmy->sgfn], cg->fgfs[Gmz->sgfn],
@@ -1374,12 +1349,11 @@ void bssnEScalar_class::Step(int lev, int YN)
     }
 #endif
 
-    Parallel::AsyncSyncState async_cor;
-    sync_corrector_start(lev, SynchList_cor, async_cor);
+    Parallel::Sync(GH->PatL[lev], SynchList_cor, Symmetry);
 
-#ifdef WithShell
-    if (lev == 0)
-    {
+#ifdef WithShell
+    if (lev == 0)
+    {
       clock_t prev_clock, curr_clock;
       if (myrank == 0)
         curr_clock = clock();
@@ -1391,10 +1365,9 @@ void bssnEScalar_class::Step(int lev, int YN)
         cout << " Shell stuff synchronization used " 
              << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) 
              << " seconds! " << endl;
-      }
-    }
-#endif
-    sync_corrector_finish(lev, async_cor, SynchList_cor);
+      }
+    }
+#endif
     // for black hole position
     if (BH_num > 0 && lev == GH->levels - 1)
     {
@@ -1862,14 +1835,11 @@ void bssnEScalar_class::AnalysisStuff_EScalar(int lev, double dT_lev)
 
 //================================================================================================
 
-void bssnEScalar_class::Interp_Constraint(bool infg)
-{
-  if (!infg)
-    return;
-
-  // we do not support a_lev != 0 yet.
-  if (a_lev > 0)
-    return;
+void bssnEScalar_class::Interp_Constraint()
+{
+  // we do not support a_lev != 0 yet.
+  if (a_lev > 0)
+    return;
 
   for (int lev = 0; lev < GH->levels; lev++)
   {
@@ -1888,10 +1858,10 @@ void bssnEScalar_class::Interp_Constraint(bool infg)
           if (myrank == cg->rank)
           {
             if (lev > 0)
-              BSSN_ESCALAR_RHS(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
-                                         cg->fgfs[phi0->sgfn], cg->fgfs[trK0->sgfn],
-                                         cg->fgfs[gxx0->sgfn], cg->fgfs[gxy0->sgfn], cg->fgfs[gxz0->sgfn], 
-                                         cg->fgfs[gyy0->sgfn], cg->fgfs[gyz0->sgfn], cg->fgfs[gzz0->sgfn],
+              f_compute_rhs_bssn_escalar(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
+                                         cg->fgfs[phi0->sgfn], cg->fgfs[trK0->sgfn],
+                                         cg->fgfs[gxx0->sgfn], cg->fgfs[gxy0->sgfn], cg->fgfs[gxz0->sgfn], 
+                                         cg->fgfs[gyy0->sgfn], cg->fgfs[gyz0->sgfn], cg->fgfs[gzz0->sgfn],
                                          cg->fgfs[Axx0->sgfn], cg->fgfs[Axy0->sgfn], cg->fgfs[Axz0->sgfn], 
                                          cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn],
                                          cg->fgfs[Gmx0->sgfn], cg->fgfs[Gmy0->sgfn], cg->fgfs[Gmz0->sgfn],
@@ -2108,10 +2078,10 @@ void bssnEScalar_class::Constraint_Out()
             if (myrank == cg->rank)
             {
               if (lev > 0)
-                BSSN_ESCALAR_RHS(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
-                                           cg->fgfs[phi0->sgfn], cg->fgfs[trK0->sgfn],
-                                           cg->fgfs[gxx0->sgfn], cg->fgfs[gxy0->sgfn], cg->fgfs[gxz0->sgfn], 
-                                           cg->fgfs[gyy0->sgfn], cg->fgfs[gyz0->sgfn], cg->fgfs[gzz0->sgfn],
+                f_compute_rhs_bssn_escalar(cg->shape, TRK4, cg->X[0], cg->X[1], cg->X[2],
+                                           cg->fgfs[phi0->sgfn], cg->fgfs[trK0->sgfn],
+                                           cg->fgfs[gxx0->sgfn], cg->fgfs[gxy0->sgfn], cg->fgfs[gxz0->sgfn], 
+                                           cg->fgfs[gyy0->sgfn], cg->fgfs[gyz0->sgfn], cg->fgfs[gzz0->sgfn],
                                            cg->fgfs[Axx0->sgfn], cg->fgfs[Axy0->sgfn], cg->fgfs[Axz0->sgfn], 
                                            cg->fgfs[Ayy0->sgfn], cg->fgfs[Ayz0->sgfn], cg->fgfs[Azz0->sgfn],
                                            cg->fgfs[Gmx0->sgfn], cg->fgfs[Gmy0->sgfn], cg->fgfs[Gmz0->sgfn],

AMSS_NCKU_source/bssnEScalar_class.h

@@ -51,7 +51,7 @@ public:
      void Compute_Psi4(int lev);
      void Step(int lev, int YN);
      void AnalysisStuff_EScalar(int lev, double dT_lev);
-     void Interp_Constraint(bool infg);
+     void Interp_Constraint();
      void Constraint_Out(); 
 
 protected:

AMSS_NCKU_source/bssn_class.h

@@ -31,19 +31,11 @@ using namespace std;
 #include "surface_integral.h"
 #include "checkpoint.h"
 
-extern void setpbh(int iBHN, double **iPBH, double *iMass, int rBHN);
-
-#ifndef BSSN_USE_TRANSFER_CACHE
-#define BSSN_USE_TRANSFER_CACHE 1
-#endif
-
-#ifndef BSSN_USE_ESCALAR_C_KERNEL
-#define BSSN_USE_ESCALAR_C_KERNEL 1
-#endif
-
-class bssn_class
-{
-public:
+extern void setpbh(int iBHN, double **iPBH, double *iMass, int rBHN);
+
+class bssn_class
+{
+public:
        int ngfs;
        int nprocs, myrank;
        cgh *GH;
@@ -53,11 +45,10 @@ public:
        int checkrun;
        char checkfilename[50];
        int Steps;
-       double StartTime, TotalTime;
-       double AnasTime, DumpTime, d2DumpTime, CheckTime;
-       double LastAnas, LastConsOut;
-       int *ConstraintRefreshLevels;
-       double Courant;
+       double StartTime, TotalTime;
+       double AnasTime, DumpTime, d2DumpTime, CheckTime;
+       double LastAnas, LastConsOut;
+       double Courant;
        double numepss, numepsb, numepsh;
        int Symmetry;
        int maxl, decn;
@@ -142,9 +133,9 @@ public:
        Parallel::SyncCache *sync_cache_restrict;   // cached Restrict in RestrictProlong
        Parallel::SyncCache *sync_cache_outbd;      // cached OutBdLow2Hi in RestrictProlong
 
-       monitor *ErrorMonitor, *Psi4Monitor, *BHMonitor, *MAPMonitor;
-       monitor *ConVMonitor, *TimingMonitor;
-       surface_integral *Waveshell;
+       monitor *ErrorMonitor, *Psi4Monitor, *BHMonitor, *MAPMonitor;
+       monitor *ConVMonitor;
+       surface_integral *Waveshell;
        checkpoint *CheckPoint;
 
 public:
@@ -175,25 +166,14 @@ public:
        void Setup_KerrSchild();
        void Enforce_algcon(int lev, int fg);
 
-       void testRestrict();
-       void testOutBd();
-       
-       bool check_Stdin_Abort(); 
-       bool use_transfer_cache() const;
-       void setup_transfer_caches();
-       void invalidate_transfer_caches();
-       void destroy_transfer_caches();
-       void sync_predictor_start(int lev, MyList<var> *VarList, Parallel::AsyncSyncState &async_state);
-       void sync_predictor_finish(int lev, Parallel::AsyncSyncState &async_state, MyList<var> *VarList);
-       void sync_corrector_start(int lev, MyList<var> *VarList, Parallel::AsyncSyncState &async_state);
-       void sync_corrector_finish(int lev, Parallel::AsyncSyncState &async_state, MyList<var> *VarList);
-       void sync_evolution(int lev, MyList<var> *VarList, Parallel::SyncCache *cache_array = 0);
-       void restrict_evolution(int lev, MyList<var> *src_var_list, MyList<var> *dst_var_list);
-       void outbdlow2hi_evolution(int lev, MyList<var> *src_var_list, MyList<var> *dst_var_list);
-
-       virtual void Setup_Initial_Data_Cao();
-       virtual void Setup_Initial_Data_Lousto();
-       virtual void Initialize();
+       void testRestrict();
+       void testOutBd();
+       
+       bool check_Stdin_Abort(); 
+
+       virtual void Setup_Initial_Data_Cao();
+       virtual void Setup_Initial_Data_Lousto();
+       virtual void Initialize();
        virtual void Read_Ansorg();
        virtual void Read_Pablo() {};
        virtual void Compute_Psi4(int lev);

AMSS_NCKU_source/bssn_escalar_rhs_c.C

@@ -1,169 +0,0 @@
-#include "macrodef.h"
-#include "bssn_rhs.h"
-#include "share_func.h"
-#include "tool.h"
-#include <vector>
-
-namespace
-{
-    // Reuse the temporary workspace across block calls to avoid repeated heap churn
-    // in the EScalar wrapper. MPI ranks execute this path sequentially, so a single
-    // process-local buffer is sufficient here.
-    std::vector<double> g_escalar_tmp_store;
-}
-
-#ifdef fortran1
-#define f_frpotential frpotential
-#endif
-#ifdef fortran2
-#define f_frpotential FRPOTENTIAL
-#endif
-#ifdef fortran3
-#define f_frpotential frpotential_
-#endif
-
-extern "C"
-{
-    void f_frpotential(int *, double *, double *, double *);
-}
-
-int f_compute_rhs_bssn_escalar_c(int *ex, double &T,
-                                 double *X, double *Y, double *Z,
-                                 double *chi, double *trK,
-                                 double *dxx, double *gxy, double *gxz, double *dyy, double *gyz, double *dzz,
-                                 double *Axx, double *Axy, double *Axz, double *Ayy, double *Ayz, double *Azz,
-                                 double *Gamx, double *Gamy, double *Gamz,
-                                 double *Lap, double *betax, double *betay, double *betaz,
-                                 double *dtSfx, double *dtSfy, double *dtSfz,
-                                 double *Sphi, double *Spi,
-                                 double *chi_rhs, double *trK_rhs,
-                                 double *gxx_rhs, double *gxy_rhs, double *gxz_rhs, double *gyy_rhs, double *gyz_rhs, double *gzz_rhs,
-                                 double *Axx_rhs, double *Axy_rhs, double *Axz_rhs, double *Ayy_rhs, double *Ayz_rhs, double *Azz_rhs,
-                                 double *Gamx_rhs, double *Gamy_rhs, double *Gamz_rhs,
-                                 double *Lap_rhs, double *betax_rhs, double *betay_rhs, double *betaz_rhs,
-                                 double *dtSfx_rhs, double *dtSfy_rhs, double *dtSfz_rhs,
-                                 double *Sphi_rhs, double *Spi_rhs,
-                                 double *rho, double *Sx, double *Sy, double *Sz,
-                                 double *Sxx, double *Sxy, double *Sxz, double *Syy, double *Syz, double *Szz,
-                                 double *Gamxxx, double *Gamxxy, double *Gamxxz, double *Gamxyy, double *Gamxyz, double *Gamxzz,
-                                 double *Gamyxx, double *Gamyxy, double *Gamyxz, double *Gamyyy, double *Gamyyz, double *Gamyzz,
-                                 double *Gamzxx, double *Gamzxy, double *Gamzxz, double *Gamzyy, double *Gamzyz, double *Gamzzz,
-                                 double *Rxx, double *Rxy, double *Rxz, double *Ryy, double *Ryz, double *Rzz,
-                                 double *ham_Res, double *movx_Res, double *movy_Res, double *movz_Res,
-                                 double *Gmx_Res, double *Gmy_Res, double *Gmz_Res,
-                                 int &Symmetry, int &Lev, double &eps, int &co)
-{
-    const int nx = ex[0], ny = ex[1], nz = ex[2];
-    const int all = nx * ny * nz;
-
-    const size_t workspace_size = size_t(all) * 17;
-    if (g_escalar_tmp_store.size() < workspace_size)
-        g_escalar_tmp_store.resize(workspace_size);
-
-    double *tmp_ptr = g_escalar_tmp_store.data();
-    auto alloc_tmp = [&](int n = 1) -> double *
-    {
-        double *ptr = tmp_ptr;
-        tmp_ptr += size_t(all) * n;
-        return ptr;
-    };
-
-    double *chix = alloc_tmp(), *chiy = alloc_tmp(), *chiz = alloc_tmp();
-    double *Kx = alloc_tmp(), *Ky = alloc_tmp(), *Kz = alloc_tmp();
-    double *fxx = alloc_tmp(), *fxy = alloc_tmp(), *fxz = alloc_tmp();
-    double *fyy = alloc_tmp(), *fyz = alloc_tmp(), *fzz = alloc_tmp();
-    double *Lapx = alloc_tmp(), *Lapy = alloc_tmp(), *Lapz = alloc_tmp();
-    double *V = alloc_tmp(), *dVdSphi = alloc_tmp();
-
-    const double ZEO = 0.0, ONE = 1.0, TWO = 2.0, HALF = 0.5;
-    const double SSS[3] = {1.0, 1.0, 1.0};
-
-    fderivs(ex, chi, chix, chiy, chiz, X, Y, Z, 1.0, 1.0, 1.0, Symmetry, Lev);
-    fderivs(ex, Lap, Lapx, Lapy, Lapz, X, Y, Z, 1.0, 1.0, 1.0, Symmetry, Lev);
-    fderivs(ex, Sphi, Kx, Ky, Kz, X, Y, Z, 1.0, 1.0, 1.0, Symmetry, Lev);
-    fdderivs(ex, Sphi, fxx, fxy, fxz, fyy, fyz, fzz, X, Y, Z, 1.0, 1.0, 1.0, Symmetry, Lev);
-
-    f_frpotential(ex, Sphi, V, dVdSphi);
-
-    for (int i = 0; i < all; ++i)
-    {
-        const double alpn1 = Lap[i] + ONE;
-        const double chin1 = chi[i] + ONE;
-        const double gxx = dxx[i] + ONE;
-        const double gyy = dyy[i] + ONE;
-        const double gzz = dzz[i] + ONE;
-        const double det = gxx * gyy * gzz + gxy[i] * gyz[i] * gxz[i] + gxz[i] * gxy[i] * gyz[i]
-                         - gxz[i] * gyy * gxz[i] - gxy[i] * gxy[i] * gzz - gxx * gyz[i] * gyz[i];
-        const double gupxx = (gyy * gzz - gyz[i] * gyz[i]) / det;
-        const double gupxy = -(gxy[i] * gzz - gyz[i] * gxz[i]) / det;
-        const double gupxz = (gxy[i] * gyz[i] - gyy * gxz[i]) / det;
-        const double gupyy = (gxx * gzz - gxz[i] * gxz[i]) / det;
-        const double gupyz = -(gxx * gyz[i] - gxy[i] * gxz[i]) / det;
-        const double gupzz = (gxx * gyy - gxy[i] * gxy[i]) / det;
-
-        Sphi_rhs[i] = alpn1 * Spi[i];
-
-        Spi_rhs[i] = gupxx * fxx[i] + gupyy * fyy[i] + gupzz * fzz[i]
-                   + TWO * (gupxy * fxy[i] + gupxz * fxz[i] + gupyz * fyz[i])
-                   - ((Gamx[i] + (gupxx * chix[i] + gupxy * chiy[i] + gupxz * chiz[i]) / TWO / chin1) * Kx[i]
-                   +  (Gamy[i] + (gupxy * chix[i] + gupyy * chiy[i] + gupyz * chiz[i]) / TWO / chin1) * Ky[i]
-                   +  (Gamz[i] + (gupxz * chix[i] + gupyz * chiy[i] + gupzz * chiz[i]) / TWO / chin1) * Kz[i]);
-
-        Spi_rhs[i] = Spi_rhs[i] * alpn1
-                   + gupxx * Lapx[i] * Kx[i] + gupxy * Lapx[i] * Ky[i] + gupxz * Lapx[i] * Kz[i]
-                   + gupxy * Lapy[i] * Kx[i] + gupyy * Lapy[i] * Ky[i] + gupyz * Lapy[i] * Kz[i]
-                   + gupxz * Lapz[i] * Kx[i] + gupyz * Lapz[i] * Ky[i] + gupzz * Lapz[i] * Kz[i];
-
-        Spi_rhs[i] = Spi_rhs[i] * chin1 + alpn1 * (trK[i] * Spi[i] - dVdSphi[i]);
-
-        rho[i] = chin1 * ((gupxx * Kx[i] * Kx[i] + gupyy * Ky[i] * Ky[i] + gupzz * Kz[i] * Kz[i]) * HALF
-               + gupxy * Kx[i] * Ky[i] + gupxz * Kx[i] * Kz[i] + gupyz * Ky[i] * Kz[i])
-               + Spi[i] * Spi[i] * HALF + V[i];
-        Sx[i] = -Spi[i] * Kx[i];
-        Sy[i] = -Spi[i] * Ky[i];
-        Sz[i] = -Spi[i] * Kz[i];
-
-        const double pressure = (rho[i] - Spi[i] * Spi[i]) / chin1;
-        Sxx[i] = Kx[i] * Kx[i] - pressure * gxx;
-        Sxy[i] = Kx[i] * Ky[i] - pressure * gxy[i];
-        Sxz[i] = Kx[i] * Kz[i] - pressure * gxz[i];
-        Syy[i] = Ky[i] * Ky[i] - pressure * gyy;
-        Syz[i] = Ky[i] * Kz[i] - pressure * gyz[i];
-        Szz[i] = Kz[i] * Kz[i] - pressure * gzz;
-    }
-
-    if (f_compute_rhs_bssn(ex, T, X, Y, Z,
-                           chi, trK,
-                           dxx, gxy, gxz, dyy, gyz, dzz,
-                           Axx, Axy, Axz, Ayy, Ayz, Azz,
-                           Gamx, Gamy, Gamz,
-                           Lap, betax, betay, betaz,
-                           dtSfx, dtSfy, dtSfz,
-                           chi_rhs, trK_rhs,
-                           gxx_rhs, gxy_rhs, gxz_rhs, gyy_rhs, gyz_rhs, gzz_rhs,
-                           Axx_rhs, Axy_rhs, Axz_rhs, Ayy_rhs, Ayz_rhs, Azz_rhs,
-                           Gamx_rhs, Gamy_rhs, Gamz_rhs,
-                           Lap_rhs, betax_rhs, betay_rhs, betaz_rhs,
-                           dtSfx_rhs, dtSfy_rhs, dtSfz_rhs,
-                           rho, Sx, Sy, Sz,
-                           Sxx, Sxy, Sxz, Syy, Syz, Szz,
-                           Gamxxx, Gamxxy, Gamxxz, Gamxyy, Gamxyz, Gamxzz,
-                           Gamyxx, Gamyxy, Gamyxz, Gamyyy, Gamyyz, Gamyzz,
-                           Gamzxx, Gamzxy, Gamzxz, Gamzyy, Gamzyz, Gamzzz,
-                           Rxx, Rxy, Rxz, Ryy, Ryz, Rzz,
-                           ham_Res, movx_Res, movy_Res, movz_Res,
-                           Gmx_Res, Gmy_Res, Gmz_Res,
-                           Symmetry, Lev, eps, co))
-        return 1;
-
-    lopsided_kodis(ex, X, Y, Z, Sphi, Sphi_rhs, betax, betay, betaz, Symmetry, SSS, eps);
-    lopsided_kodis(ex, X, Y, Z, Spi, Spi_rhs, betax, betay, betaz, Symmetry, SSS, eps);
-
-    for (int i = 0; i < all; ++i)
-    {
-        if (Sphi_rhs[i] != Sphi_rhs[i] || Spi_rhs[i] != Spi_rhs[i] || rho[i] != rho[i])
-            return 1;
-    }
-
-    return 0;
-}

AMSS_NCKU_source/bssn_rhs.h

@@ -22,32 +22,19 @@
 #define f_compute_rhs_Z4c_ss COMPUTE_RHS_Z4C_SS
 #define f_compute_constraint_fr COMPUTE_CONSTRAINT_FR
 #endif
-#ifdef fortran3
-#define f_compute_rhs_bssn compute_rhs_bssn_
+#ifdef fortran3
+#define f_compute_rhs_bssn compute_rhs_bssn_
 #define f_compute_rhs_bssn_ss compute_rhs_bssn_ss_
 #define f_compute_rhs_bssn_escalar compute_rhs_bssn_escalar_
 #define f_compute_rhs_bssn_escalar_ss compute_rhs_bssn_escalar_ss_
 #define f_compute_rhs_Z4c compute_rhs_z4c_
 #define f_compute_rhs_Z4cnot compute_rhs_z4cnot_
 #define f_compute_rhs_Z4c_ss compute_rhs_z4c_ss_
-#define f_compute_constraint_fr compute_constraint_fr_
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-        void f_bssn_rhs_kernel_timing_reset();
-        int f_bssn_rhs_kernel_timing_bucket_count();
-        const double *f_bssn_rhs_kernel_timing_local_seconds();
-        const char *f_bssn_rhs_kernel_timing_label(int);
-#ifdef __cplusplus
-}
-#endif
-
-extern "C"
-{
-        int f_compute_rhs_bssn(int *, double &, double *, double *, double *,                                                      // ex,T,X,Y,Z
+#define f_compute_constraint_fr compute_constraint_fr_
+#endif
+extern "C"
+{
+        int f_compute_rhs_bssn(int *, double &, double *, double *, double *,                                                      // ex,T,X,Y,Z
                                double *, double *,                                                                                 // chi, trK
                                double *, double *, double *, double *, double *, double *,                                         // gij
                                double *, double *, double *, double *, double *, double *,                                         // Aij
@@ -63,34 +50,13 @@ extern "C"
                                double *, double *, double *, double *, double *, double *,                                         // Christoffel
                                double *, double *, double *, double *, double *, double *,                                         // Christoffel
                                double *, double *, double *, double *, double *, double *,                                         // Ricci
-                               double *, double *, double *, double *, double *, double *, double *,                               // constraint violation
-                               int &, int &, double &, int &);
-}
-
-int f_compute_rhs_bssn_escalar_c(int *, double &, double *, double *, double *,                                                      // ex,T,X,Y,Z
-                                 double *, double *,                                                                                 // chi, trK
-                                 double *, double *, double *, double *, double *, double *,                                         // gij
-                                 double *, double *, double *, double *, double *, double *,                                         // Aij
-                                 double *, double *, double *,                                                                       // Gam
-                                 double *, double *, double *, double *, double *, double *, double *,                               // Gauge
-                                 double *, double *,                                                                                 // Sphi, Spi
-                                 double *, double *,                                                                                 // chi, trK
-                                 double *, double *, double *, double *, double *, double *,                                         // gij
-                                 double *, double *, double *, double *, double *, double *,                                         // Aij
-                                 double *, double *, double *,                                                                       // Gam
-                                 double *, double *, double *, double *, double *, double *, double *,                               // Gauge
-                                 double *, double *,                                                                                 // Sphi, Spi
-                                 double *, double *, double *, double *, double *, double *, double *, double *, double *, double *, // stress-energy
-                                 double *, double *, double *, double *, double *, double *,                                         // Christoffel
-                                 double *, double *, double *, double *, double *, double *,                                         // Christoffel
-                                 double *, double *, double *, double *, double *, double *,                                         // Christoffel
-                                 double *, double *, double *, double *, double *, double *,                                         // Ricci
-                                 double *, double *, double *, double *, double *, double *, double *,                               // constraint violation
-                                 int &, int &, double &, int &);
-
-extern "C"
-{
-        int f_compute_rhs_bssn_ss(int *, double &, double *, double *, double *,                                                      // ex,T,rho,sigma,R
+                               double *, double *, double *, double *, double *, double *, double *,                               // constraint violation
+                               int &, int &, double &, int &);
+}
+
+extern "C"
+{
+        int f_compute_rhs_bssn_ss(int *, double &, double *, double *, double *,                                                      // ex,T,rho,sigma,R
                                   double *, double *, double *,                                                                       // X,Y,Z
                                   double *, double *, double *,                                                                       // drhodx,drhody,drhodz
                                   double *, double *, double *,                                                                       // dsigmadx,dsigmady,dsigmadz
@@ -117,10 +83,10 @@ extern "C"
                                   int &, int &, double &, int &, int &);
 }
 
-extern "C"
-{
-        int f_compute_rhs_bssn_escalar(int *, double &, double *, double *, double *,                                                      // ex,T,X,Y,Z
-                                       double *, double *,                                                                                 // chi, trK
+extern "C"
+{
+        int f_compute_rhs_bssn_escalar(int *, double &, double *, double *, double *,                                                      // ex,T,X,Y,Z
+                                       double *, double *,                                                                                 // chi, trK
                                        double *, double *, double *, double *, double *, double *,                                         // gij
                                        double *, double *, double *, double *, double *, double *,                                         // Aij
                                        double *, double *, double *,                                                                       // Gam
@@ -137,14 +103,14 @@ extern "C"
                                        double *, double *, double *, double *, double *, double *,                                         // Christoffel
                                        double *, double *, double *, double *, double *, double *,                                         // Christoffel
                                        double *, double *, double *, double *, double *, double *,                                         // Ricci
-                                       double *, double *, double *, double *, double *, double *, double *,                               // constraint violation
-                                       int &, int &, double &, int &);
-}
-
-extern "C"
-{
-        int f_compute_rhs_bssn_escalar_ss(int *, double &, double *, double *, double *,                                                      // ex,T,rho,sigma,R
-                                          double *, double *, double *,                                                                       // X,Y,Z
+                                       double *, double *, double *, double *, double *, double *, double *,                               // constraint violation
+                                       int &, int &, double &, int &);
+}
+
+extern "C"
+{
+        int f_compute_rhs_bssn_escalar_ss(int *, double &, double *, double *, double *,                                                      // ex,T,rho,sigma,R
+                                          double *, double *, double *,                                                                       // X,Y,Z
                                           double *, double *, double *,                                                                       // drhodx,drhody,drhodz
                                           double *, double *, double *,                                                                       // dsigmadx,dsigmady,dsigmadz
                                           double *, double *, double *,                                                                       // dRdx,dRdy,dRdz

AMSS_NCKU_source/bssn_rhs_c.C

@@ -2,88 +2,12 @@
 #include "bssn_rhs.h"
 #include "share_func.h"
 #include "tool.h"
-#include <time.h>
 // 0-based i,j,k
 // #define IDX_F(i,j,k,nx,ny) ((i) + (j)*(nx) + (k)*(nx)*(ny))
 // ex(1)=nx, ex(2)=ny, ex(3)=nz
 
 // 用法：a[ IDX_F(i,j,k,nx,ny) ]
 
-#ifndef BSSN_KERNEL_FINE_TIMING
-#define BSSN_KERNEL_FINE_TIMING 0
-#endif
-
-#if BSSN_KERNEL_FINE_TIMING
-namespace rhs_kernel_timing
-{
-    enum Bucket
-    {
-        KB_SETUP_DERIVS = 0,
-        KB_GEOM_GAMMA,
-        KB_RICCI_METRIC,
-        KB_CHI_LAPSE,
-        KB_AIJ_TRK_GAUGE,
-        KB_KO_CONSTRAINT,
-        KB_COUNT
-    };
-
-    static double local_bucket_seconds[KB_COUNT];
-
-    static const char *bucket_labels[KB_COUNT] =
-    {
-        "setup_derivs",
-        "geom_gamma",
-        "ricci_metric",
-        "chi_lapse",
-        "aij_trk_gauge",
-        "ko_constraint"
-    };
-
-    static inline double now_seconds()
-    {
-        struct timespec ts;
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-        return double(ts.tv_sec) + 1.0e-9 * double(ts.tv_nsec);
-    }
-}
-
-extern "C" void f_bssn_rhs_kernel_timing_reset()
-{
-    for (int i = 0; i < rhs_kernel_timing::KB_COUNT; ++i)
-        rhs_kernel_timing::local_bucket_seconds[i] = 0.0;
-}
-
-extern "C" int f_bssn_rhs_kernel_timing_bucket_count()
-{
-    return rhs_kernel_timing::KB_COUNT;
-}
-
-extern "C" const double *f_bssn_rhs_kernel_timing_local_seconds()
-{
-    return rhs_kernel_timing::local_bucket_seconds;
-}
-
-extern "C" const char *f_bssn_rhs_kernel_timing_label(int bucket_index)
-{
-    if (bucket_index < 0 || bucket_index >= rhs_kernel_timing::KB_COUNT)
-        return "unknown";
-    return rhs_kernel_timing::bucket_labels[bucket_index];
-}
-
-#define RHS_KERNEL_TIMER_DECL(var_name) const double var_name = rhs_kernel_timing::now_seconds()
-#define RHS_KERNEL_TIMER_ADD(bucket_name, var_name) \
-    rhs_kernel_timing::local_bucket_seconds[int(rhs_kernel_timing::bucket_name)] += \
-        rhs_kernel_timing::now_seconds() - (var_name)
-#else
-extern "C" void f_bssn_rhs_kernel_timing_reset() {}
-extern "C" int f_bssn_rhs_kernel_timing_bucket_count() { return 0; }
-extern "C" const double *f_bssn_rhs_kernel_timing_local_seconds() { return 0; }
-extern "C" const char *f_bssn_rhs_kernel_timing_label(int) { return "disabled"; }
-
-#define RHS_KERNEL_TIMER_DECL(var_name)
-#define RHS_KERNEL_TIMER_ADD(bucket_name, var_name)
-#endif
-
 // C function that calculates the right-hand side for BSSN equations
 int f_compute_rhs_bssn(int *ex, double &T, 
                        double *X, double *Y, double *Z,
@@ -178,7 +102,6 @@ int f_compute_rhs_bssn(int *ex, double &T,
     dY = Y[1] - Y[0];
     dZ = Z[1] - Z[0];
 
-        RHS_KERNEL_TIMER_DECL(timer_setup_derivs);
         // 1ms //
         for(int i=0;i<all;i+=1){
             alpn1[i] = Lap[i] + 1.0;
@@ -218,8 +141,6 @@ int f_compute_rhs_bssn(int *ex, double &T,
                         (dxx[i] + ONE) * betaxz[i] + gxy[i] * betayz[i] + gyz[i] * betayx[i] 
                         + (dzz[i] + ONE) * betazx[i] - gxz[i] * betayy[i];                  
         }
-        RHS_KERNEL_TIMER_ADD(KB_SETUP_DERIVS, timer_setup_derivs);
-        RHS_KERNEL_TIMER_DECL(timer_geom_gamma);
         // Fused: inverse metric + Gamma constraint + Christoffel (3 loops -> 1)
         for(int i=0;i<all;i+=1){
             double det = (dxx[i] + ONE) * (dyy[i] + ONE) * (dzz[i] + ONE) + gxy[i] * gyz[i] * gxz[i] + gxz[i] * gxy[i] * gyz[i] -
@@ -362,6 +283,9 @@ int f_compute_rhs_bssn(int *ex, double &T,
                 + ( gupxy[i]*gupyz[i] + gupyy[i]*gupxz[i] ) * Axy[i]
                 + ( gupxy[i]*gupzz[i] + gupyz[i]*gupxz[i] ) * Axz[i]
                 + ( gupyy[i]*gupzz[i] + gupyz[i]*gupyz[i] ) * Ayz[i];
+            Rxx[i] = axx; Ryy[i] = ayy; Rzz[i] = azz;
+            Rxy[i] = axy; Rxz[i] = axz; Ryz[i] = ayz;
+
             Gamx_rhs[i] = - TWO * ( Lapx[i]*axx + Lapy[i]*axy + Lapz[i]*axz ) +
                 TWO * alpn1[i] * (
                 -F3o2/chin1[i] * ( chix[i]*axx + chiy[i]*axy + chiz[i]*axz ) -
@@ -391,8 +315,6 @@ int f_compute_rhs_bssn(int *ex, double &T,
                             + TWO * ( Gamzxy[i]*axy + Gamzxz[i]*axz + Gamzyz[i]*ayz )
                         );
         }
-        RHS_KERNEL_TIMER_ADD(KB_GEOM_GAMMA, timer_geom_gamma);
-        RHS_KERNEL_TIMER_DECL(timer_ricci_metric);
         // 22.3ms //
         fdderivs(ex,betax,gxxx,gxyx,gxzx,gyyx,gyzx,gzzx,
         X,Y,Z,ANTI,SYM, SYM ,Symmetry,Lev);
@@ -410,6 +332,7 @@ int f_compute_rhs_bssn(int *ex, double &T,
             double lfxx = gxxx[i] + gxyy[i] + gxzz[i];
             double lfxy = gxyx[i] + gyyy[i] + gyzz[i];
             double lfxz = gxzx[i] + gyzy[i] + gzzz[i];
+            fxx[i] = lfxx; fxy[i] = lfxy; fxz[i] = lfxz;
 
             double gxa = gupxx[i]*Gamxxx[i] + gupyy[i]*Gamxyy[i] + gupzz[i]*Gamxzz[i]
                     + TWO * ( gupxy[i]*Gamxxy[i] + gupxz[i]*Gamxxz[i] + gupyz[i]*Gamxyz[i] );
@@ -763,74 +686,69 @@ int f_compute_rhs_bssn(int *ex, double &T,
                     + Gamxyz[i] * gzzx[i] + Gamyyz[i] * gzzy[i] + Gamzyz[i] * gzzz[i]
                 );
         }
-        RHS_KERNEL_TIMER_ADD(KB_RICCI_METRIC, timer_ricci_metric);
 
-        RHS_KERNEL_TIMER_DECL(timer_chi_lapse);
         // 22.3ms //
             fdderivs(ex,chi,fxx,fxy,fxz,fyy,fyz,fzz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev);
 
         // 7ms //
         for (int i=0;i<all;i+=1) {
-            const double inv_chin1 = ONE / chin1[i];
-            const double half_inv_chin1 = HALF * inv_chin1;
-            const double scaled_inv = F3o2 * inv_chin1;
-            const double cxx = fxx[i] - Gamxxx[i] * chix[i] - Gamyxx[i] * chiy[i] - Gamzxx[i] * chiz[i];
-            const double cxy = fxy[i] - Gamxxy[i] * chix[i] - Gamyxy[i] * chiy[i] - Gamzxy[i] * chiz[i];
-            const double cxz = fxz[i] - Gamxxz[i] * chix[i] - Gamyxz[i] * chiy[i] - Gamzxz[i] * chiz[i];
-            const double cyy = fyy[i] - Gamxyy[i] * chix[i] - Gamyyy[i] * chiy[i] - Gamzyy[i] * chiz[i];
-            const double cyz = fyz[i] - Gamxyz[i] * chix[i] - Gamyyz[i] * chiy[i] - Gamzyz[i] * chiz[i];
-            const double czz = fzz[i] - Gamxzz[i] * chix[i] - Gamyzz[i] * chiy[i] - Gamzzz[i] * chiz[i];
-            const double ricci_chi =
-                gupxx[i] * (cxx - scaled_inv * chix[i] * chix[i])
-                + gupyy[i] * (cyy - scaled_inv * chiy[i] * chiy[i])
-                + gupzz[i] * (czz - scaled_inv * chiz[i] * chiz[i])
-                + TWO * gupxy[i] * (cxy - scaled_inv * chix[i] * chiy[i])
-                + TWO * gupxz[i] * (cxz - scaled_inv * chix[i] * chiz[i])
-                + TWO * gupyz[i] * (cyz - scaled_inv * chiy[i] * chiz[i]);
-            f[i] = ricci_chi;
-            Rxx[i] = Rxx[i] + ( cxx - half_inv_chin1 * chix[i] * chix[i] + (dxx[i] + ONE) * ricci_chi ) * half_inv_chin1;
-            Ryy[i] = Ryy[i] + ( cyy - half_inv_chin1 * chiy[i] * chiy[i] + (dyy[i] + ONE) * ricci_chi ) * half_inv_chin1;
-            Rzz[i] = Rzz[i] + ( czz - half_inv_chin1 * chiz[i] * chiz[i] + (dzz[i] + ONE) * ricci_chi ) * half_inv_chin1;
+            fxx[i] = fxx[i] - Gamxxx[i] * chix[i] - Gamyxx[i] * chiy[i] - Gamzxx[i] * chiz[i];
+            fxy[i] = fxy[i] - Gamxxy[i] * chix[i] - Gamyxy[i] * chiy[i] - Gamzxy[i] * chiz[i];
+            fxz[i] = fxz[i] - Gamxxz[i] * chix[i] - Gamyxz[i] * chiy[i] - Gamzxz[i] * chiz[i];
+            fyy[i] = fyy[i] - Gamxyy[i] * chix[i] - Gamyyy[i] * chiy[i] - Gamzyy[i] * chiz[i];
+            fyz[i] = fyz[i] - Gamxyz[i] * chix[i] - Gamyyz[i] * chiy[i] - Gamzyz[i] * chiz[i];
+            fzz[i] = fzz[i] - Gamxzz[i] * chix[i] - Gamyzz[i] * chiy[i] - Gamzzz[i] * chiz[i];
+            f[i] =
+                gupxx[i] * (fxx[i] - (F3o2 / chin1[i]) * chix[i] * chix[i])
+                + gupyy[i] * (fyy[i] - (F3o2 / chin1[i]) * chiy[i] * chiy[i])
+                + gupzz[i] * (fzz[i] - (F3o2 / chin1[i]) * chiz[i] * chiz[i])
+                + TWO * gupxy[i] * (fxy[i] - (F3o2 / chin1[i]) * chix[i] * chiy[i])
+                + TWO * gupxz[i] * (fxz[i] - (F3o2 / chin1[i]) * chix[i] * chiz[i])
+                + TWO * gupyz[i] * (fyz[i] - (F3o2 / chin1[i]) * chiy[i] * chiz[i]);
+            Rxx[i] = Rxx[i] + ( fxx[i] - (chix[i] * chix[i]) / (chin1[i] * TWO) + (dxx[i] + ONE) * f[i] ) / (chin1[i] * TWO);
+            Ryy[i] = Ryy[i] + ( fyy[i] - (chiy[i] * chiy[i]) / (chin1[i] * TWO) + (dyy[i] + ONE) * f[i] ) / (chin1[i] * TWO);
+            Rzz[i] = Rzz[i] + ( fzz[i] - (chiz[i] * chiz[i]) / (chin1[i] * TWO) + (dzz[i] + ONE) * f[i] ) / (chin1[i] * TWO);
 
-            Rxy[i] = Rxy[i] + ( cxy - half_inv_chin1 * chix[i] * chiy[i] + gxy[i] * ricci_chi ) * half_inv_chin1;
-            Rxz[i] = Rxz[i] + ( cxz - half_inv_chin1 * chix[i] * chiz[i] + gxz[i] * ricci_chi ) * half_inv_chin1;
-            Ryz[i] = Ryz[i] + ( cyz - half_inv_chin1 * chiy[i] * chiz[i] + gyz[i] * ricci_chi ) * half_inv_chin1;
+            Rxy[i] = Rxy[i] + ( fxy[i] - (chix[i] * chiy[i]) / (chin1[i] * TWO) + gxy[i] * f[i] ) / (chin1[i] * TWO);
+            Rxz[i] = Rxz[i] + ( fxz[i] - (chix[i] * chiz[i]) / (chin1[i] * TWO) + gxz[i] * f[i] ) / (chin1[i] * TWO);
+            Ryz[i] = Ryz[i] + ( fyz[i] - (chiy[i] * chiz[i]) / (chin1[i] * TWO) + gyz[i] * f[i] ) / (chin1[i] * TWO);
         }
 
         // 24ms //
         fdderivs(ex,Lap,fxx,fxy,fxz,fyy,fyz,fzz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev);
+        fderivs(ex,chi,dtSfx_rhs,dtSfy_rhs,dtSfz_rhs,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev);
 
         // 6ms //
         for (int i=0;i<all;i+=1) {
-            const double inv_chin1 = ONE / chin1[i];
-            const double gchi_x = (gupxx[i] * chix[i] + gupxy[i] * chiy[i] + gupxz[i] * chiz[i]) * inv_chin1;
-            const double gchi_y = (gupxy[i] * chix[i] + gupyy[i] * chiy[i] + gupyz[i] * chiz[i]) * inv_chin1;
-            const double gchi_z = (gupxz[i] * chix[i] + gupyz[i] * chiy[i] + gupzz[i] * chiz[i]) * inv_chin1;
+            /* gxxx,gxxy,gxxz (这里是“升指标后的chi导数/chi”那类量，你沿用原变量名即可) */
+            gxxx[i] = (gupxx[i] * chix[i] + gupxy[i] * chiy[i] + gupxz[i] * chiz[i]) / chin1[i];
+            gxxy[i] = (gupxy[i] * chix[i] + gupyy[i] * chiy[i] + gupyz[i] * chiz[i]) / chin1[i];
+            gxxz[i] = (gupxz[i] * chix[i] + gupyz[i] * chiy[i] + gupzz[i] * chiz[i]) / chin1[i];
 
             /* Christoffel 修正项 */
-            Gamxxx[i] = Gamxxx[i] - ( ((chix[i] + chix[i]) * inv_chin1) - (dxx[i] + ONE) * gchi_x ) * HALF;
-            Gamyxx[i] = Gamyxx[i] - ( 0.0           - (dxx[i] + ONE) * gchi_y ) * HALF;  /* 原式只有 -gxx*gxxy */
-            Gamzxx[i] = Gamzxx[i] - ( 0.0           - (dxx[i] + ONE) * gchi_z ) * HALF;
+            Gamxxx[i] = Gamxxx[i] - ( ((chix[i] + chix[i]) / chin1[i]) - (dxx[i] + ONE) * gxxx[i] ) * HALF;
+            Gamyxx[i] = Gamyxx[i] - ( 0.0           - (dxx[i] + ONE) * gxxy[i] ) * HALF;  /* 原式只有 -gxx*gxxy */
+            Gamzxx[i] = Gamzxx[i] - ( 0.0           - (dxx[i] + ONE) * gxxz[i] ) * HALF;
 
-            Gamxyy[i] = Gamxyy[i] - ( 0.0           - (dyy[i] + ONE) * gchi_x ) * HALF;
-            Gamyyy[i] = Gamyyy[i] - ( ((chiy[i] + chiy[i]) * inv_chin1) - (dyy[i] + ONE) * gchi_y ) * HALF;
-            Gamzyy[i] = Gamzyy[i] - ( 0.0           - (dyy[i] + ONE) * gchi_z ) * HALF;
+            Gamxyy[i] = Gamxyy[i] - ( 0.0           - (dyy[i] + ONE) * gxxx[i] ) * HALF;
+            Gamyyy[i] = Gamyyy[i] - ( ((chiy[i] + chiy[i]) / chin1[i]) - (dyy[i] + ONE) * gxxy[i] ) * HALF;
+            Gamzyy[i] = Gamzyy[i] - ( 0.0           - (dyy[i] + ONE) * gxxz[i] ) * HALF;
 
-            Gamxzz[i] = Gamxzz[i] - ( 0.0           - (dzz[i] + ONE) * gchi_x ) * HALF;
-            Gamyzz[i] = Gamyzz[i] - ( 0.0           - (dzz[i] + ONE) * gchi_y ) * HALF;
-            Gamzzz[i] = Gamzzz[i] - ( ((chiz[i] + chiz[i]) * inv_chin1) - (dzz[i] + ONE) * gchi_z ) * HALF;
+            Gamxzz[i] = Gamxzz[i] - ( 0.0           - (dzz[i] + ONE) * gxxx[i] ) * HALF;
+            Gamyzz[i] = Gamyzz[i] - ( 0.0           - (dzz[i] + ONE) * gxxy[i] ) * HALF;
+            Gamzzz[i] = Gamzzz[i] - ( ((chiz[i] + chiz[i]) / chin1[i]) - (dzz[i] + ONE) * gxxz[i] ) * HALF;
 
-            Gamxxy[i] = Gamxxy[i] - ( ( chiy[i] * inv_chin1)      - gxy[i] * gchi_x ) * HALF;
-            Gamyxy[i] = Gamyxy[i] - ( ( chix[i] * inv_chin1)      - gxy[i] * gchi_y ) * HALF;
-            Gamzxy[i] = Gamzxy[i] - ( 0.0           - gxy[i] * gchi_z ) * HALF;
+            Gamxxy[i] = Gamxxy[i] - ( ( chiy[i] / chin1[i])      - gxy[i] * gxxx[i] ) * HALF;
+            Gamyxy[i] = Gamyxy[i] - ( ( chix[i] / chin1[i])      - gxy[i] * gxxy[i] ) * HALF;
+            Gamzxy[i] = Gamzxy[i] - ( 0.0           - gxy[i] * gxxz[i] ) * HALF;
 
-            Gamxxz[i] = Gamxxz[i] - ( ( chiz[i] * inv_chin1)      - gxz[i] * gchi_x ) * HALF;
-            Gamyxz[i] = Gamyxz[i] - ( 0.0           - gxz[i] * gchi_y ) * HALF;
-            Gamzxz[i] = Gamzxz[i] - ( ( chix[i] * inv_chin1)      - gxz[i] * gchi_z ) * HALF;
+            Gamxxz[i] = Gamxxz[i] - ( ( chiz[i] / chin1[i])      - gxz[i] * gxxx[i] ) * HALF;
+            Gamyxz[i] = Gamyxz[i] - ( 0.0           - gxz[i] * gxxy[i] ) * HALF;
+            Gamzxz[i] = Gamzxz[i] - ( ( chix[i] / chin1[i])      - gxz[i] * gxxz[i] ) * HALF;
 
-            Gamxyz[i] = Gamxyz[i] - ( 0.0           - gyz[i] * gchi_x ) * HALF;
-            Gamyyz[i] = Gamyyz[i] - ( ( chiz[i] * inv_chin1)      - gyz[i] * gchi_y ) * HALF;
-            Gamzyz[i] = Gamzyz[i] - ( ( chiy[i] * inv_chin1)      - gyz[i] * gchi_z ) * HALF;
+            Gamxyz[i] = Gamxyz[i] - ( 0.0           - gyz[i] * gxxx[i] ) * HALF;
+            Gamyyz[i] = Gamyyz[i] - ( ( chiz[i] / chin1[i])      - gyz[i] * gxxy[i] ) * HALF;
+            Gamzyz[i] = Gamzyz[i] - ( ( chiy[i] / chin1[i])      - gyz[i] * gxxz[i] ) * HALF;
 
             /* fxx..fyz 修正：减去 Γ * ∂Lap */
             fxx[i] = fxx[i] - Gamxxx[i] * Lapx[i] - Gamyxx[i] * Lapy[i] - Gamzxx[i] * Lapz[i];
@@ -844,8 +762,6 @@ int f_compute_rhs_bssn(int *ex, double &T,
             trK_rhs[i] =  gupxx[i] * fxx[i] + gupyy[i] * fyy[i] + gupzz[i] * fzz[i]
                     +  TWO * ( gupxy[i] * fxy[i] + gupxz[i] * fxz[i] + gupyz[i] * fyz[i] );
         }
-        RHS_KERNEL_TIMER_ADD(KB_CHI_LAPSE, timer_chi_lapse);
-        RHS_KERNEL_TIMER_DECL(timer_aij_trk_gauge);
         // 2.5ms //
         for (int i=0;i<all;i+=1) {
             const double divb = betaxx[i] + betayy[i] + betazz[i];
@@ -1146,8 +1062,6 @@ int f_compute_rhs_bssn(int *ex, double &T,
             dtSfz_rhs[i] = Gamz_rhs[i] - reta[i] * dtSfz[i];
             #endif
         }
-        RHS_KERNEL_TIMER_ADD(KB_AIJ_TRK_GAUGE, timer_aij_trk_gauge);
-        RHS_KERNEL_TIMER_DECL(timer_ko_constraint);
         // advection + KO dissipation with shared symmetry buffer
         lopsided_kodis(ex,X,Y,Z,dxx,gxx_rhs,betax,betay,betaz,Symmetry,SSS,eps);
         lopsided_kodis(ex,X,Y,Z,Gamz,Gamz_rhs,betax,betay,betaz,Symmetry,SSA,eps);
@@ -1225,61 +1139,60 @@ int f_compute_rhs_bssn(int *ex, double &T,
             fderivs(ex,Ayy,gyyx,gyyy,gyyz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0);
             fderivs(ex,Ayz,gyzx,gyzy,gyzz,X,Y,Z,SYM ,ANTI,ANTI,Symmetry,0);
             fderivs(ex,Azz,gzzx,gzzy,gzzz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0);
-            // 7ms //
-            for (int i=0;i<all;i+=1) {
-                gxxx[i] = gxxx[i] - (  Gamxxx[i] * Axx[i] + Gamyxx[i] * Axy[i] + Gamzxx[i] * Axz[i]
-                                      + Gamxxx[i] * Axx[i] + Gamyxx[i] * Axy[i] + Gamzxx[i] * Axz[i]) - chix[i]*Axx[i]/chin1[i];
-                gxyx[i] = gxyx[i] - (  Gamxxy[i] * Axx[i] + Gamyxy[i] * Axy[i] + Gamzxy[i] * Axz[i]
-                                      + Gamxxx[i] * Axy[i] + Gamyxx[i] * Ayy[i] + Gamzxx[i] * Ayz[i]) - chix[i]*Axy[i]/chin1[i];
-                gxzx[i] = gxzx[i] - (  Gamxxz[i] * Axx[i] + Gamyxz[i] * Axy[i] + Gamzxz[i] * Axz[i]
-                                      + Gamxxx[i] * Axz[i] + Gamyxx[i] * Ayz[i] + Gamzxx[i] * Azz[i]) - chix[i]*Axz[i]/chin1[i];
-                gyyx[i] = gyyx[i] - (  Gamxxy[i] * Axy[i] + Gamyxy[i] * Ayy[i] + Gamzxy[i] * Ayz[i]
-                                      + Gamxxy[i] * Axy[i] + Gamyxy[i] * Ayy[i] + Gamzxy[i] * Ayz[i]) - chix[i]*Ayy[i]/chin1[i];
-                gyzx[i] = gyzx[i] - (  Gamxxz[i] * Axy[i] + Gamyxz[i] * Ayy[i] + Gamzxz[i] * Ayz[i]
-                                      + Gamxxy[i] * Axz[i] + Gamyxy[i] * Ayz[i] + Gamzxy[i] * Azz[i]) - chix[i]*Ayz[i]/chin1[i];
-                gzzx[i] = gzzx[i] - (  Gamxxz[i] * Axz[i] + Gamyxz[i] * Ayz[i] + Gamzxz[i] * Azz[i]
-                                      + Gamxxz[i] * Axz[i] + Gamyxz[i] * Ayz[i] + Gamzxz[i] * Azz[i]) - chix[i]*Azz[i]/chin1[i];
-                gxxy[i] = gxxy[i] - (  Gamxxy[i] * Axx[i] + Gamyxy[i] * Axy[i] + Gamzxy[i] * Axz[i]
-                                      + Gamxxy[i] * Axx[i] + Gamyxy[i] * Axy[i] + Gamzxy[i] * Axz[i]) - chiy[i]*Axx[i]/chin1[i];
-                gxyy[i] = gxyy[i] - (  Gamxyy[i] * Axx[i] + Gamyyy[i] * Axy[i] + Gamzyy[i] * Axz[i]
-                                      + Gamxxy[i] * Axy[i] + Gamyxy[i] * Ayy[i] + Gamzxy[i] * Ayz[i]) - chiy[i]*Axy[i]/chin1[i];
-                gxzy[i] = gxzy[i] - (  Gamxyz[i] * Axx[i] + Gamyyz[i] * Axy[i] + Gamzyz[i] * Axz[i]
-                                      + Gamxxy[i] * Axz[i] + Gamyxy[i] * Ayz[i] + Gamzxy[i] * Azz[i]) - chiy[i]*Axz[i]/chin1[i];
-                gyyy[i] = gyyy[i] - (  Gamxyy[i] * Axy[i] + Gamyyy[i] * Ayy[i] + Gamzyy[i] * Ayz[i]
-                                      + Gamxyy[i] * Axy[i] + Gamyyy[i] * Ayy[i] + Gamzyy[i] * Ayz[i]) - chiy[i]*Ayy[i]/chin1[i];
-                gyzy[i] = gyzy[i] - (  Gamxyz[i] * Axy[i] + Gamyyz[i] * Ayy[i] + Gamzyz[i] * Ayz[i]
-                                      + Gamxyy[i] * Axz[i] + Gamyyy[i] * Ayz[i] + Gamzyy[i] * Azz[i]) - chiy[i]*Ayz[i]/chin1[i];
-                gzzy[i] = gzzy[i] - (  Gamxyz[i] * Axz[i] + Gamyyz[i] * Ayz[i] + Gamzyz[i] * Azz[i]
-                                      + Gamxyz[i] * Axz[i] + Gamyyz[i] * Ayz[i] + Gamzyz[i] * Azz[i]) - chiy[i]*Azz[i]/chin1[i];
-                gxxz[i] = gxxz[i] - (  Gamxxz[i] * Axx[i] + Gamyxz[i] * Axy[i] + Gamzxz[i] * Axz[i]
-                                      + Gamxxz[i] * Axx[i] + Gamyxz[i] * Axy[i] + Gamzxz[i] * Axz[i]) - chiz[i]*Axx[i]/chin1[i];
-                gxyz[i] = gxyz[i] - (  Gamxyz[i] * Axx[i] + Gamyyz[i] * Axy[i] + Gamzyz[i] * Axz[i]
-                                      + Gamxxz[i] * Axy[i] + Gamyxz[i] * Ayy[i] + Gamzxz[i] * Ayz[i]) - chiz[i]*Axy[i]/chin1[i];
-                gxzz[i] = gxzz[i] - (  Gamxzz[i] * Axx[i] + Gamyzz[i] * Axy[i] + Gamzzz[i] * Axz[i]
-                                      + Gamxxz[i] * Axz[i] + Gamyxz[i] * Ayz[i] + Gamzxz[i] * Azz[i]) - chiz[i]*Axz[i]/chin1[i];
-                gyyz[i] = gyyz[i] - (  Gamxyz[i] * Axy[i] + Gamyyz[i] * Ayy[i] + Gamzyz[i] * Ayz[i]
-                                      + Gamxyz[i] * Axy[i] + Gamyyz[i] * Ayy[i] + Gamzyz[i] * Ayz[i]) - chiz[i]*Ayy[i]/chin1[i];
-                gyzz[i] = gyzz[i] - (  Gamxzz[i] * Axy[i] + Gamyzz[i] * Ayy[i] + Gamzzz[i] * Ayz[i]
-                                      + Gamxyz[i] * Axz[i] + Gamyyz[i] * Ayz[i] + Gamzyz[i] * Azz[i]) - chiz[i]*Ayz[i]/chin1[i];
-                gzzz[i] = gzzz[i] - (  Gamxzz[i] * Axz[i] + Gamyzz[i] * Ayz[i] + Gamzzz[i] * Azz[i]
-                                      + Gamxzz[i] * Axz[i] + Gamyzz[i] * Ayz[i] + Gamzzz[i] * Azz[i]) - chiz[i]*Azz[i]/chin1[i];
-
-                movx_Res[i] = gupxx[i]*gxxx[i] + gupyy[i]*gxyy[i] + gupzz[i]*gxzz[i]
-                            + gupxy[i]*gxyx[i] + gupxz[i]*gxzx[i] + gupyz[i]*gxzy[i]
-                            + gupxy[i]*gxxy[i] + gupxz[i]*gxxz[i] + gupyz[i]*gxyz[i];
-                movy_Res[i] = gupxx[i]*gxyx[i] + gupyy[i]*gyyy[i] + gupzz[i]*gyzz[i]
-                            + gupxy[i]*gyyx[i] + gupxz[i]*gyzx[i] + gupyz[i]*gyzy[i]
-                            + gupxy[i]*gxyy[i] + gupxz[i]*gxyz[i] + gupyz[i]*gyyz[i];
-                movz_Res[i] = gupxx[i]*gxzx[i] + gupyy[i]*gyzy[i] + gupzz[i]*gzzz[i]
-                            + gupxy[i]*gyzx[i] + gupxz[i]*gzzx[i] + gupyz[i]*gzzy[i]
-                            + gupxy[i]*gxzy[i] + gupxz[i]*gxzz[i] + gupyz[i]*gyzz[i];
-
-                movx_Res[i] = movx_Res[i] - F2o3*Kx[i] - F8*PI*Sx[i];
-                movy_Res[i] = movy_Res[i] - F2o3*Ky[i] - F8*PI*Sy[i];
-                movz_Res[i] = movz_Res[i] - F2o3*Kz[i] - F8*PI*Sz[i];
-            }
         }
-        RHS_KERNEL_TIMER_ADD(KB_KO_CONSTRAINT, timer_ko_constraint);
+        // 7ms //
+        for (int i=0;i<all;i+=1) {
+            gxxx[i] = gxxx[i] - (  Gamxxx[i] * Axx[i] + Gamyxx[i] * Axy[i] + Gamzxx[i] * Axz[i]
+                                  + Gamxxx[i] * Axx[i] + Gamyxx[i] * Axy[i] + Gamzxx[i] * Axz[i]) - chix[i]*Axx[i]/chin1[i];
+            gxyx[i] = gxyx[i] - (  Gamxxy[i] * Axx[i] + Gamyxy[i] * Axy[i] + Gamzxy[i] * Axz[i]
+                                  + Gamxxx[i] * Axy[i] + Gamyxx[i] * Ayy[i] + Gamzxx[i] * Ayz[i]) - chix[i]*Axy[i]/chin1[i];
+            gxzx[i] = gxzx[i] - (  Gamxxz[i] * Axx[i] + Gamyxz[i] * Axy[i] + Gamzxz[i] * Axz[i]
+                                  + Gamxxx[i] * Axz[i] + Gamyxx[i] * Ayz[i] + Gamzxx[i] * Azz[i]) - chix[i]*Axz[i]/chin1[i];
+            gyyx[i] = gyyx[i] - (  Gamxxy[i] * Axy[i] + Gamyxy[i] * Ayy[i] + Gamzxy[i] * Ayz[i]
+                                  + Gamxxy[i] * Axy[i] + Gamyxy[i] * Ayy[i] + Gamzxy[i] * Ayz[i]) - chix[i]*Ayy[i]/chin1[i];
+            gyzx[i] = gyzx[i] - (  Gamxxz[i] * Axy[i] + Gamyxz[i] * Ayy[i] + Gamzxz[i] * Ayz[i]
+                                  + Gamxxy[i] * Axz[i] + Gamyxy[i] * Ayz[i] + Gamzxy[i] * Azz[i]) - chix[i]*Ayz[i]/chin1[i];
+            gzzx[i] = gzzx[i] - (  Gamxxz[i] * Axz[i] + Gamyxz[i] * Ayz[i] + Gamzxz[i] * Azz[i]
+                                  + Gamxxz[i] * Axz[i] + Gamyxz[i] * Ayz[i] + Gamzxz[i] * Azz[i]) - chix[i]*Azz[i]/chin1[i];
+            gxxy[i] = gxxy[i] - (  Gamxxy[i] * Axx[i] + Gamyxy[i] * Axy[i] + Gamzxy[i] * Axz[i]
+                                  + Gamxxy[i] * Axx[i] + Gamyxy[i] * Axy[i] + Gamzxy[i] * Axz[i]) - chiy[i]*Axx[i]/chin1[i];
+            gxyy[i] = gxyy[i] - (  Gamxyy[i] * Axx[i] + Gamyyy[i] * Axy[i] + Gamzyy[i] * Axz[i]
+                                  + Gamxxy[i] * Axy[i] + Gamyxy[i] * Ayy[i] + Gamzxy[i] * Ayz[i]) - chiy[i]*Axy[i]/chin1[i];
+            gxzy[i] = gxzy[i] - (  Gamxyz[i] * Axx[i] + Gamyyz[i] * Axy[i] + Gamzyz[i] * Axz[i]
+                                  + Gamxxy[i] * Axz[i] + Gamyxy[i] * Ayz[i] + Gamzxy[i] * Azz[i]) - chiy[i]*Axz[i]/chin1[i];
+            gyyy[i] = gyyy[i] - (  Gamxyy[i] * Axy[i] + Gamyyy[i] * Ayy[i] + Gamzyy[i] * Ayz[i]
+                                  + Gamxyy[i] * Axy[i] + Gamyyy[i] * Ayy[i] + Gamzyy[i] * Ayz[i]) - chiy[i]*Ayy[i]/chin1[i];
+            gyzy[i] = gyzy[i] - (  Gamxyz[i] * Axy[i] + Gamyyz[i] * Ayy[i] + Gamzyz[i] * Ayz[i]
+                                  + Gamxyy[i] * Axz[i] + Gamyyy[i] * Ayz[i] + Gamzyy[i] * Azz[i]) - chiy[i]*Ayz[i]/chin1[i];
+            gzzy[i] = gzzy[i] - (  Gamxyz[i] * Axz[i] + Gamyyz[i] * Ayz[i] + Gamzyz[i] * Azz[i]
+                                  + Gamxyz[i] * Axz[i] + Gamyyz[i] * Ayz[i] + Gamzyz[i] * Azz[i]) - chiy[i]*Azz[i]/chin1[i];
+            gxxz[i] = gxxz[i] - (  Gamxxz[i] * Axx[i] + Gamyxz[i] * Axy[i] + Gamzxz[i] * Axz[i]
+                                  + Gamxxz[i] * Axx[i] + Gamyxz[i] * Axy[i] + Gamzxz[i] * Axz[i]) - chiz[i]*Axx[i]/chin1[i];
+            gxyz[i] = gxyz[i] - (  Gamxyz[i] * Axx[i] + Gamyyz[i] * Axy[i] + Gamzyz[i] * Axz[i]
+                                  + Gamxxz[i] * Axy[i] + Gamyxz[i] * Ayy[i] + Gamzxz[i] * Ayz[i]) - chiz[i]*Axy[i]/chin1[i];
+            gxzz[i] = gxzz[i] - (  Gamxzz[i] * Axx[i] + Gamyzz[i] * Axy[i] + Gamzzz[i] * Axz[i]
+                                  + Gamxxz[i] * Axz[i] + Gamyxz[i] * Ayz[i] + Gamzxz[i] * Azz[i]) - chiz[i]*Axz[i]/chin1[i];
+            gyyz[i] = gyyz[i] - (  Gamxyz[i] * Axy[i] + Gamyyz[i] * Ayy[i] + Gamzyz[i] * Ayz[i]
+                                  + Gamxyz[i] * Axy[i] + Gamyyz[i] * Ayy[i] + Gamzyz[i] * Ayz[i]) - chiz[i]*Ayy[i]/chin1[i];
+            gyzz[i] = gyzz[i] - (  Gamxzz[i] * Axy[i] + Gamyzz[i] * Ayy[i] + Gamzzz[i] * Ayz[i]
+                                  + Gamxyz[i] * Axz[i] + Gamyyz[i] * Ayz[i] + Gamzyz[i] * Azz[i]) - chiz[i]*Ayz[i]/chin1[i];
+            gzzz[i] = gzzz[i] - (  Gamxzz[i] * Axz[i] + Gamyzz[i] * Ayz[i] + Gamzzz[i] * Azz[i]
+                                  + Gamxzz[i] * Axz[i] + Gamyzz[i] * Ayz[i] + Gamzzz[i] * Azz[i]) - chiz[i]*Azz[i]/chin1[i];
+
+            movx_Res[i] = gupxx[i]*gxxx[i] + gupyy[i]*gxyy[i] + gupzz[i]*gxzz[i]
+                        + gupxy[i]*gxyx[i] + gupxz[i]*gxzx[i] + gupyz[i]*gxzy[i]
+                        + gupxy[i]*gxxy[i] + gupxz[i]*gxxz[i] + gupyz[i]*gxyz[i];
+            movy_Res[i] = gupxx[i]*gxyx[i] + gupyy[i]*gyyy[i] + gupzz[i]*gyzz[i]
+                        + gupxy[i]*gyyx[i] + gupxz[i]*gyzx[i] + gupyz[i]*gyzy[i]
+                        + gupxy[i]*gxyy[i] + gupxz[i]*gxyz[i] + gupyz[i]*gyyz[i];
+            movz_Res[i] = gupxx[i]*gxzx[i] + gupyy[i]*gyzy[i] + gupzz[i]*gzzz[i]
+                        + gupxy[i]*gyzx[i] + gupxz[i]*gzzx[i] + gupyz[i]*gzzy[i]
+                        + gupxy[i]*gxzy[i] + gupxz[i]*gxzz[i] + gupyz[i]*gyzz[i];
+
+            movx_Res[i] = movx_Res[i] - F2o3*Kx[i] - F8*PI*Sx[i];
+            movy_Res[i] = movy_Res[i] - F2o3*Ky[i] - F8*PI*Sy[i];
+            movz_Res[i] = movz_Res[i] - F2o3*Kz[i] - F8*PI*Sz[i];
+        }
 
 
             

AMSS_NCKU_source/fdderivs_c.C

@@ -71,131 +71,106 @@ void fdderivs(const int ex[3],
     const double Fdxdz = F1o144 / (dX * dZ);
     const double Fdydz = F1o144 / (dY * dZ);
 
-    /* 只清零不被主循环覆盖的边界面 */
-    {
-        /* 高边界：k0=ex3-1 */
-        for (int j0 = 0; j0 < ex2; ++j0)
-            for (int i0 = 0; i0 < ex1; ++i0) {
-                const size_t p = idx_ex(i0, j0, ex3 - 1, ex);
-                fxx[p]=ZEO; fyy[p]=ZEO; fzz[p]=ZEO;
-                fxy[p]=ZEO; fxz[p]=ZEO; fyz[p]=ZEO;
-            }
-        /* 高边界：j0=ex2-1 */
-        for (int k0 = 0; k0 < ex3 - 1; ++k0)
-            for (int i0 = 0; i0 < ex1; ++i0) {
-                const size_t p = idx_ex(i0, ex2 - 1, k0, ex);
-                fxx[p]=ZEO; fyy[p]=ZEO; fzz[p]=ZEO;
-                fxy[p]=ZEO; fxz[p]=ZEO; fyz[p]=ZEO;
-            }
-        /* 高边界：i0=ex1-1 */
-        for (int k0 = 0; k0 < ex3 - 1; ++k0)
-            for (int j0 = 0; j0 < ex2 - 1; ++j0) {
-                const size_t p = idx_ex(ex1 - 1, j0, k0, ex);
-                fxx[p]=ZEO; fyy[p]=ZEO; fzz[p]=ZEO;
-                fxy[p]=ZEO; fxz[p]=ZEO; fyz[p]=ZEO;
-            }
-
-        /* 低边界：当二阶模板也不可用时，对应 i0/j0/k0=0 面 */
-        if (kminF == 1) {
-            for (int j0 = 0; j0 < ex2; ++j0)
-                for (int i0 = 0; i0 < ex1; ++i0) {
-                    const size_t p = idx_ex(i0, j0, 0, ex);
-                    fxx[p]=ZEO; fyy[p]=ZEO; fzz[p]=ZEO;
-                    fxy[p]=ZEO; fxz[p]=ZEO; fyz[p]=ZEO;
-                }
-        }
-        if (jminF == 1) {
-            for (int k0 = 0; k0 < ex3; ++k0)
-                for (int i0 = 0; i0 < ex1; ++i0) {
-                    const size_t p = idx_ex(i0, 0, k0, ex);
-                    fxx[p]=ZEO; fyy[p]=ZEO; fzz[p]=ZEO;
-                    fxy[p]=ZEO; fxz[p]=ZEO; fyz[p]=ZEO;
-                }
-        }
-        if (iminF == 1) {
-            for (int k0 = 0; k0 < ex3; ++k0)
-                for (int j0 = 0; j0 < ex2; ++j0) {
-                    const size_t p = idx_ex(0, j0, k0, ex);
-                    fxx[p]=ZEO; fyy[p]=ZEO; fzz[p]=ZEO;
-                    fxy[p]=ZEO; fxz[p]=ZEO; fyz[p]=ZEO;
-                }
-        }
+    const size_t all = (size_t)ex1 * (size_t)ex2 * (size_t)ex3;
+    for (size_t p = 0; p < all; ++p) {
+        fxx[p] = ZEO; fxy[p] = ZEO; fxz[p] = ZEO;
+        fyy[p] = ZEO; fyz[p] = ZEO; fzz[p] = ZEO;
     }
 
-    /*
-     * 两段式：
-     * 1) 二阶可用区域先计算二阶模板
-     * 2) 高阶可用区域再覆盖四阶模板
-     */
-    const int i2_lo = (iminF > 0) ? iminF : 0;
-    const int j2_lo = (jminF > 0) ? jminF : 0;
-    const int k2_lo = (kminF > 0) ? kminF : 0;
-    const int i2_hi = ex1 - 2;
-    const int j2_hi = ex2 - 2;
-    const int k2_hi = ex3 - 2;
-
-    const int i4_lo = (iminF + 1 > 0) ? (iminF + 1) : 0;
-    const int j4_lo = (jminF + 1 > 0) ? (jminF + 1) : 0;
-    const int k4_lo = (kminF + 1 > 0) ? (kminF + 1) : 0;
-    const int i4_hi = ex1 - 3;
-    const int j4_hi = ex2 - 3;
-    const int k4_hi = ex3 - 3;
-
-    /*
-     * Strategy A:
-     * Avoid redundant work in overlap of 2nd/4th-order regions.
-     * Only compute 2nd-order on shell points that are NOT overwritten by
-     * the 4th-order pass.
-     */
-    const int has4 = (i4_lo <= i4_hi && j4_lo <= j4_hi && k4_lo <= k4_hi);
-
-    if (i2_lo <= i2_hi && j2_lo <= j2_hi && k2_lo <= k2_hi) {
-        for (int k0 = k2_lo; k0 <= k2_hi; ++k0) {
-            const int kF = k0 + 1;
-            for (int j0 = j2_lo; j0 <= j2_hi; ++j0) {
-                const int jF = j0 + 1;
-                for (int i0 = i2_lo; i0 <= i2_hi; ++i0) {
-                    if (has4 &&
-                        i0 >= i4_lo && i0 <= i4_hi &&
-                        j0 >= j4_lo && j0 <= j4_hi &&
-                        k0 >= k4_lo && k0 <= k4_hi) {
-                        continue;
-                    }
-                    const int iF = i0 + 1;
-                    const size_t p = idx_ex(i0, j0, k0, ex);
+    // Match Fortran (ghost_width=3, "for bam comparison") exactly:
+    // only compute when x/y/z all satisfy the same-order stencil at this point.
+    for (int k0 = 0; k0 <= ex3 - 2; ++k0) {
+        const int kF = k0 + 1;
+        for (int j0 = 0; j0 <= ex2 - 2; ++j0) {
+            const int jF = j0 + 1;
+            for (int i0 = 0; i0 <= ex1 - 2; ++i0) {
+                const int iF = i0 + 1;
+                const size_t p = idx_ex(i0, j0, k0, ex);
 
+                if ((iF + 2 <= imaxF && iF - 2 >= iminF) &&
+                    (jF + 2 <= jmaxF && jF - 2 >= jminF) &&
+                    (kF + 2 <= kmaxF && kF - 2 >= kminF)) {
+                    fxx[p] = Fdxdx * (
+                        -fh[idx_fh_F_ord2(iF - 2, jF,     kF,     ex)] +
+                        F16 * fh[idx_fh_F_ord2(iF - 1, jF,     kF,     ex)] -
+                        F30 * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] -
+                        fh[idx_fh_F_ord2(iF + 2, jF,     kF,     ex)] +
+                        F16 * fh[idx_fh_F_ord2(iF + 1, jF,     kF,     ex)]
+                    );
+                    fyy[p] = Fdydy * (
+                        -fh[idx_fh_F_ord2(iF,     jF - 2, kF,     ex)] +
+                        F16 * fh[idx_fh_F_ord2(iF,     jF - 1, kF,     ex)] -
+                        F30 * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] -
+                        fh[idx_fh_F_ord2(iF,     jF + 2, kF,     ex)] +
+                        F16 * fh[idx_fh_F_ord2(iF,     jF + 1, kF,     ex)]
+                    );
+                    fzz[p] = Fdzdz * (
+                        -fh[idx_fh_F_ord2(iF,     jF,     kF - 2, ex)] +
+                        F16 * fh[idx_fh_F_ord2(iF,     jF,     kF - 1, ex)] -
+                        F30 * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] -
+                        fh[idx_fh_F_ord2(iF,     jF,     kF + 2, ex)] +
+                        F16 * fh[idx_fh_F_ord2(iF,     jF,     kF + 1, ex)]
+                    );
+                    fxy[p] = Fdxdy * (
+                           (fh[idx_fh_F_ord2(iF - 2, jF - 2, kF, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF - 2, kF, ex)] +
+                            F8 * fh[idx_fh_F_ord2(iF + 1, jF - 2, kF, ex)] - fh[idx_fh_F_ord2(iF + 2, jF - 2, kF, ex)])
+                        - F8 * (fh[idx_fh_F_ord2(iF - 2, jF - 1, kF, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF - 1, kF, ex)] +
+                                F8 * fh[idx_fh_F_ord2(iF + 1, jF - 1, kF, ex)] - fh[idx_fh_F_ord2(iF + 2, jF - 1, kF, ex)])
+                        + F8 * (fh[idx_fh_F_ord2(iF - 2, jF + 1, kF, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF + 1, kF, ex)] +
+                                F8 * fh[idx_fh_F_ord2(iF + 1, jF + 1, kF, ex)] - fh[idx_fh_F_ord2(iF + 2, jF + 1, kF, ex)])
+                           - (fh[idx_fh_F_ord2(iF - 2, jF + 2, kF, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF + 2, kF, ex)] +
+                              F8 * fh[idx_fh_F_ord2(iF + 1, jF + 2, kF, ex)] - fh[idx_fh_F_ord2(iF + 2, jF + 2, kF, ex)])
+                    );
+                    fxz[p] = Fdxdz * (
+                           (fh[idx_fh_F_ord2(iF - 2, jF, kF - 2, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF, kF - 2, ex)] +
+                            F8 * fh[idx_fh_F_ord2(iF + 1, jF, kF - 2, ex)] - fh[idx_fh_F_ord2(iF + 2, jF, kF - 2, ex)])
+                        - F8 * (fh[idx_fh_F_ord2(iF - 2, jF, kF - 1, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF, kF - 1, ex)] +
+                                F8 * fh[idx_fh_F_ord2(iF + 1, jF, kF - 1, ex)] - fh[idx_fh_F_ord2(iF + 2, jF, kF - 1, ex)])
+                        + F8 * (fh[idx_fh_F_ord2(iF - 2, jF, kF + 1, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF, kF + 1, ex)] +
+                                F8 * fh[idx_fh_F_ord2(iF + 1, jF, kF + 1, ex)] - fh[idx_fh_F_ord2(iF + 2, jF, kF + 1, ex)])
+                           - (fh[idx_fh_F_ord2(iF - 2, jF, kF + 2, ex)] - F8 * fh[idx_fh_F_ord2(iF - 1, jF, kF + 2, ex)] +
+                              F8 * fh[idx_fh_F_ord2(iF + 1, jF, kF + 2, ex)] - fh[idx_fh_F_ord2(iF + 2, jF, kF + 2, ex)])
+                    );
+                    fyz[p] = Fdydz * (
+                           (fh[idx_fh_F_ord2(iF, jF - 2, kF - 2, ex)] - F8 * fh[idx_fh_F_ord2(iF, jF - 1, kF - 2, ex)] +
+                            F8 * fh[idx_fh_F_ord2(iF, jF + 1, kF - 2, ex)] - fh[idx_fh_F_ord2(iF, jF + 2, kF - 2, ex)])
+                        - F8 * (fh[idx_fh_F_ord2(iF, jF - 2, kF - 1, ex)] - F8 * fh[idx_fh_F_ord2(iF, jF - 1, kF - 1, ex)] +
+                                F8 * fh[idx_fh_F_ord2(iF, jF + 1, kF - 1, ex)] - fh[idx_fh_F_ord2(iF, jF + 2, kF - 1, ex)])
+                        + F8 * (fh[idx_fh_F_ord2(iF, jF - 2, kF + 1, ex)] - F8 * fh[idx_fh_F_ord2(iF, jF - 1, kF + 1, ex)] +
+                                F8 * fh[idx_fh_F_ord2(iF, jF + 1, kF + 1, ex)] - fh[idx_fh_F_ord2(iF, jF + 2, kF + 1, ex)])
+                           - (fh[idx_fh_F_ord2(iF, jF - 2, kF + 2, ex)] - F8 * fh[idx_fh_F_ord2(iF, jF - 1, kF + 2, ex)] +
+                              F8 * fh[idx_fh_F_ord2(iF, jF + 1, kF + 2, ex)] - fh[idx_fh_F_ord2(iF, jF + 2, kF + 2, ex)])
+                    );
+                } else if ((iF + 1 <= imaxF && iF - 1 >= iminF) &&
+                           (jF + 1 <= jmaxF && jF - 1 >= jminF) &&
+                           (kF + 1 <= kmaxF && kF - 1 >= kminF)) {
                     fxx[p] = Sdxdx * (
                         fh[idx_fh_F_ord2(iF - 1, jF,     kF,     ex)] -
                         TWO * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] +
                         fh[idx_fh_F_ord2(iF + 1, jF,     kF,     ex)]
                     );
-
                     fyy[p] = Sdydy * (
                         fh[idx_fh_F_ord2(iF,     jF - 1, kF,     ex)] -
                         TWO * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] +
                         fh[idx_fh_F_ord2(iF,     jF + 1, kF,     ex)]
                     );
-
                     fzz[p] = Sdzdz * (
                         fh[idx_fh_F_ord2(iF,     jF,     kF - 1, ex)] -
                         TWO * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] +
                         fh[idx_fh_F_ord2(iF,     jF,     kF + 1, ex)]
                     );
-
                     fxy[p] = Sdxdy * (
                         fh[idx_fh_F_ord2(iF - 1, jF - 1, kF, ex)] -
                         fh[idx_fh_F_ord2(iF + 1, jF - 1, kF, ex)] -
                         fh[idx_fh_F_ord2(iF - 1, jF + 1, kF, ex)] +
                         fh[idx_fh_F_ord2(iF + 1, jF + 1, kF, ex)]
                     );
-
                     fxz[p] = Sdxdz * (
                         fh[idx_fh_F_ord2(iF - 1, jF, kF - 1, ex)] -
                         fh[idx_fh_F_ord2(iF + 1, jF, kF - 1, ex)] -
                         fh[idx_fh_F_ord2(iF - 1, jF, kF + 1, ex)] +
                         fh[idx_fh_F_ord2(iF + 1, jF, kF + 1, ex)]
                     );
-
                     fyz[p] = Sdydz * (
                         fh[idx_fh_F_ord2(iF, jF - 1, kF - 1, ex)] -
                         fh[idx_fh_F_ord2(iF, jF + 1, kF - 1, ex)] -
@@ -207,126 +182,5 @@ void fdderivs(const int ex[3],
         }
     }
 
-    if (has4) {
-        for (int k0 = k4_lo; k0 <= k4_hi; ++k0) {
-            const int kF = k0 + 1;
-            for (int j0 = j4_lo; j0 <= j4_hi; ++j0) {
-                const int jF = j0 + 1;
-                for (int i0 = i4_lo; i0 <= i4_hi; ++i0) {
-                    const int iF = i0 + 1;
-                    const size_t p = idx_ex(i0, j0, k0, ex);
-
-                    fxx[p] = Fdxdx * (
-                        -fh[idx_fh_F_ord2(iF - 2, jF,     kF,     ex)] +
-                        F16 * fh[idx_fh_F_ord2(iF - 1, jF,     kF,     ex)] -
-                        F30 * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] -
-                        fh[idx_fh_F_ord2(iF + 2, jF,     kF,     ex)] +
-                        F16 * fh[idx_fh_F_ord2(iF + 1, jF,     kF,     ex)]
-                    );
-
-                    fyy[p] = Fdydy * (
-                        -fh[idx_fh_F_ord2(iF,     jF - 2, kF,     ex)] +
-                        F16 * fh[idx_fh_F_ord2(iF,     jF - 1, kF,     ex)] -
-                        F30 * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] -
-                        fh[idx_fh_F_ord2(iF,     jF + 2, kF,     ex)] +
-                        F16 * fh[idx_fh_F_ord2(iF,     jF + 1, kF,     ex)]
-                    );
-
-                    fzz[p] = Fdzdz * (
-                        -fh[idx_fh_F_ord2(iF,     jF,     kF - 2, ex)] +
-                        F16 * fh[idx_fh_F_ord2(iF,     jF,     kF - 1, ex)] -
-                        F30 * fh[idx_fh_F_ord2(iF,     jF,     kF,     ex)] -
-                        fh[idx_fh_F_ord2(iF,     jF,     kF + 2, ex)] +
-                        F16 * fh[idx_fh_F_ord2(iF,     jF,     kF + 1, ex)]
-                    );
-
-                    {
-                        const double t_jm2 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF - 2, kF, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF - 2, kF, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF - 2, kF, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF - 2, kF, ex)] );
-
-                        const double t_jm1 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF - 1, kF, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF - 1, kF, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF - 1, kF, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF - 1, kF, ex)] );
-
-                        const double t_jp1 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF + 1, kF, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF + 1, kF, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF + 1, kF, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF + 1, kF, ex)] );
-
-                        const double t_jp2 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF + 2, kF, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF + 2, kF, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF + 2, kF, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF + 2, kF, ex)] );
-
-                        fxy[p] = Fdxdy * ( t_jm2 - F8 * t_jm1 + F8 * t_jp1 - t_jp2 );
-                    }
-
-                    {
-                        const double t_km2 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF, kF - 2, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF, kF - 2, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF, kF - 2, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF, kF - 2, ex)] );
-
-                        const double t_km1 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF, kF - 1, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF, kF - 1, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF, kF - 1, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF, kF - 1, ex)] );
-
-                        const double t_kp1 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF, kF + 1, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF, kF + 1, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF, kF + 1, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF, kF + 1, ex)] );
-
-                        const double t_kp2 =
-                            ( fh[idx_fh_F_ord2(iF - 2, jF, kF + 2, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF - 1, jF, kF + 2, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF + 1, jF, kF + 2, ex)]
-                             -    fh[idx_fh_F_ord2(iF + 2, jF, kF + 2, ex)] );
-
-                        fxz[p] = Fdxdz * ( t_km2 - F8 * t_km1 + F8 * t_kp1 - t_kp2 );
-                    }
-
-                    {
-                        const double t_km2 =
-                            ( fh[idx_fh_F_ord2(iF, jF - 2, kF - 2, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF, jF - 1, kF - 2, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF, jF + 1, kF - 2, ex)]
-                             -    fh[idx_fh_F_ord2(iF, jF + 2, kF - 2, ex)] );
-
-                        const double t_km1 =
-                            ( fh[idx_fh_F_ord2(iF, jF - 2, kF - 1, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF, jF - 1, kF - 1, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF, jF + 1, kF - 1, ex)]
-                             -    fh[idx_fh_F_ord2(iF, jF + 2, kF - 1, ex)] );
-
-                        const double t_kp1 =
-                            ( fh[idx_fh_F_ord2(iF, jF - 2, kF + 1, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF, jF - 1, kF + 1, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF, jF + 1, kF + 1, ex)]
-                             -    fh[idx_fh_F_ord2(iF, jF + 2, kF + 1, ex)] );
-
-                        const double t_kp2 =
-                            ( fh[idx_fh_F_ord2(iF, jF - 2, kF + 2, ex)]
-                             -F8*fh[idx_fh_F_ord2(iF, jF - 1, kF + 2, ex)]
-                             +F8*fh[idx_fh_F_ord2(iF, jF + 1, kF + 2, ex)]
-                             -    fh[idx_fh_F_ord2(iF, jF + 2, kF + 2, ex)] );
-
-                        fyz[p] = Fdydz * ( t_km2 - F8 * t_km1 + F8 * t_kp1 - t_kp2 );
-                    }
-                }
-            }
-        }
-    }
-
     // free(fh);
 }

AMSS_NCKU_source/fderivs_c.C

@@ -80,46 +80,48 @@ void fderivs(const int ex[3],
         fz[p] = ZEO;
     }
 
-    /*
-     * 两段式：
-     * 1) 先在二阶可用区域计算二阶模板
-     * 2) 再在高阶可用区域覆盖为四阶模板
-     *
-     * 与原 if/elseif 逻辑等价，但减少逐点分支判断。
-     */
-    const int i2_lo = (iminF > 0) ? iminF : 0;
-    const int j2_lo = (jminF > 0) ? jminF : 0;
-    const int k2_lo = (kminF > 0) ? kminF : 0;
-    const int i2_hi = ex1 - 2;
-    const int j2_hi = ex2 - 2;
-    const int k2_hi = ex3 - 2;
-
-    const int i4_lo = (iminF + 1 > 0) ? (iminF + 1) : 0;
-    const int j4_lo = (jminF + 1 > 0) ? (jminF + 1) : 0;
-    const int k4_lo = (kminF + 1 > 0) ? (kminF + 1) : 0;
-    const int i4_hi = ex1 - 3;
-    const int j4_hi = ex2 - 3;
-    const int k4_hi = ex3 - 3;
-
-    if (i2_lo <= i2_hi && j2_lo <= j2_hi && k2_lo <= k2_hi) {
-        for (int k0 = k2_lo; k0 <= k2_hi; ++k0) {
-            const int kF = k0 + 1;
-            for (int j0 = j2_lo; j0 <= j2_hi; ++j0) {
-                const int jF = j0 + 1;
-                for (int i0 = i2_lo; i0 <= i2_hi; ++i0) {
-                    const int iF = i0 + 1;
-                    const size_t p = idx_ex(i0, j0, k0, ex);
+    // Match Fortran (ghost_width=3, "for bam comparison") exactly:
+    // only compute when x/y/z all satisfy the same-order stencil at this point.
+    for (int k0 = 0; k0 <= ex3 - 2; ++k0) {
+        const int kF = k0 + 1;
+        for (int j0 = 0; j0 <= ex2 - 2; ++j0) {
+            const int jF = j0 + 1;
+            for (int i0 = 0; i0 <= ex1 - 2; ++i0) {
+                const int iF = i0 + 1;
+                const size_t p = idx_ex(i0, j0, k0, ex);
 
+                if ((iF + 2 <= imaxF && iF - 2 >= iminF) &&
+                    (jF + 2 <= jmaxF && jF - 2 >= jminF) &&
+                    (kF + 2 <= kmaxF && kF - 2 >= kminF)) {
+                    fx[p] = d12dx * (
+                        fh[idx_fh_F_ord2(iF - 2, jF,     kF,     ex)] -
+                        EIT * fh[idx_fh_F_ord2(iF - 1, jF,     kF,     ex)] +
+                        EIT * fh[idx_fh_F_ord2(iF + 1, jF,     kF,     ex)] -
+                        fh[idx_fh_F_ord2(iF + 2, jF,     kF,     ex)]
+                    );
+                    fy[p] = d12dy * (
+                        fh[idx_fh_F_ord2(iF,     jF - 2, kF,     ex)] -
+                        EIT * fh[idx_fh_F_ord2(iF,     jF - 1, kF,     ex)] +
+                        EIT * fh[idx_fh_F_ord2(iF,     jF + 1, kF,     ex)] -
+                        fh[idx_fh_F_ord2(iF,     jF + 2, kF,     ex)]
+                    );
+                    fz[p] = d12dz * (
+                        fh[idx_fh_F_ord2(iF,     jF,     kF - 2, ex)] -
+                        EIT * fh[idx_fh_F_ord2(iF,     jF,     kF - 1, ex)] +
+                        EIT * fh[idx_fh_F_ord2(iF,     jF,     kF + 1, ex)] -
+                        fh[idx_fh_F_ord2(iF,     jF,     kF + 2, ex)]
+                    );
+                } else if ((iF + 1 <= imaxF && iF - 1 >= iminF) &&
+                           (jF + 1 <= jmaxF && jF - 1 >= jminF) &&
+                           (kF + 1 <= kmaxF && kF - 1 >= kminF)) {
                     fx[p] = d2dx * (
                         -fh[idx_fh_F_ord2(iF - 1, jF,     kF,     ex)] +
                          fh[idx_fh_F_ord2(iF + 1, jF,     kF,     ex)]
                     );
-
                     fy[p] = d2dy * (
                         -fh[idx_fh_F_ord2(iF,     jF - 1, kF,     ex)] +
                          fh[idx_fh_F_ord2(iF,     jF + 1, kF,     ex)]
                     );
-
                     fz[p] = d2dz * (
                         -fh[idx_fh_F_ord2(iF,     jF,     kF - 1, ex)] +
                          fh[idx_fh_F_ord2(iF,     jF,     kF + 1, ex)]
@@ -129,39 +131,5 @@ void fderivs(const int ex[3],
         }
     }
 
-    if (i4_lo <= i4_hi && j4_lo <= j4_hi && k4_lo <= k4_hi) {
-        for (int k0 = k4_lo; k0 <= k4_hi; ++k0) {
-            const int kF = k0 + 1;
-            for (int j0 = j4_lo; j0 <= j4_hi; ++j0) {
-                const int jF = j0 + 1;
-                for (int i0 = i4_lo; i0 <= i4_hi; ++i0) {
-                    const int iF = i0 + 1;
-                    const size_t p = idx_ex(i0, j0, k0, ex);
-
-                    fx[p] = d12dx * (
-                        fh[idx_fh_F_ord2(iF - 2, jF,     kF,     ex)] -
-                        EIT * fh[idx_fh_F_ord2(iF - 1, jF,     kF,     ex)] +
-                        EIT * fh[idx_fh_F_ord2(iF + 1, jF,     kF,     ex)] -
-                        fh[idx_fh_F_ord2(iF + 2, jF,     kF,     ex)]
-                    );
-
-                    fy[p] = d12dy * (
-                        fh[idx_fh_F_ord2(iF,     jF - 2, kF,     ex)] -
-                        EIT * fh[idx_fh_F_ord2(iF,     jF - 1, kF,     ex)] +
-                        EIT * fh[idx_fh_F_ord2(iF,     jF + 1, kF,     ex)] -
-                        fh[idx_fh_F_ord2(iF,     jF + 2, kF,     ex)]
-                    );
-
-                    fz[p] = d12dz * (
-                        fh[idx_fh_F_ord2(iF,     jF,     kF - 2, ex)] -
-                        EIT * fh[idx_fh_F_ord2(iF,     jF,     kF - 1, ex)] +
-                        EIT * fh[idx_fh_F_ord2(iF,     jF,     kF + 1, ex)] -
-                        fh[idx_fh_F_ord2(iF,     jF,     kF + 2, ex)]
-                    );
-                }
-            }
-        }
-    }
-
     // free(fh);
 }

AMSS_NCKU_source/fmisc.f90

@@ -1511,88 +1511,13 @@ deallocate(f_flat)
 
 f_out = f_out*dX*dY*dZ
 
-  return
-
-  end subroutine l2normhelper
-!--------------------------------------------------------------------------------------
-  subroutine l2normhelper7(ex, X, Y, Z,xmin,ymin,zmin,xmax,ymax,zmax,&
-                           f1,f2,f3,f4,f5,f6,f7,f_out,gw)
-
-  implicit none
-!~~~~~~> Input parameters:
-  integer,intent(in ):: ex(1:3)
-  real*8, intent(in ):: X(1:ex(1)),Y(1:ex(2)),Z(1:ex(3)),xmin,ymin,zmin,xmax,ymax,zmax
-  integer,intent(in)::gw
-  real*8, dimension(ex(1),ex(2),ex(3)),intent(in) :: f1,f2,f3,f4,f5,f6,f7
-  real*8, intent(out) :: f_out(7)
-!~~~~~~> Other variables:
-
-  real*8            :: dX, dY, dZ
-  integer::imin,jmin,kmin
-  integer::imax,jmax,kmax
-  integer::i,j,k
-  real*8 :: s1,s2,s3,s4,s5,s6,s7
-
-  dX = X(2) - X(1)
-  dY = Y(2) - Y(1)
-  dZ = Z(2) - Z(1)
-
-! for ghost zone
-   imin = gw+1
-   jmin = gw+1
-   kmin = gw+1
-
-   imax = ex(1) - gw
-   jmax = ex(2) - gw
-   kmax = ex(3) - gw
-
-!for patch boundary (i.e., not ghost boundary)
-
-if(dabs(X(ex(1))-xmax) < dX) imax = ex(1)
-if(dabs(Y(ex(2))-ymax) < dY) jmax = ex(2)
-if(dabs(Z(ex(3))-zmax) < dZ) kmax = ex(3)
-if(dabs(X(1)-xmin) < dX) imin = 1
-if(dabs(Y(1)-ymin) < dY) jmin = 1
-if(dabs(Z(1)-zmin) < dZ) kmin = 1
-
-  s1 = 0.d0
-  s2 = 0.d0
-  s3 = 0.d0
-  s4 = 0.d0
-  s5 = 0.d0
-  s6 = 0.d0
-  s7 = 0.d0
-
-  do k=kmin,kmax
-    do j=jmin,jmax
-!DIR$ SIMD REDUCTION(+:s1,s2,s3,s4,s5,s6,s7)
-      do i=imin,imax
-        s1 = s1 + f1(i,j,k)*f1(i,j,k)
-        s2 = s2 + f2(i,j,k)*f2(i,j,k)
-        s3 = s3 + f3(i,j,k)*f3(i,j,k)
-        s4 = s4 + f4(i,j,k)*f4(i,j,k)
-        s5 = s5 + f5(i,j,k)*f5(i,j,k)
-        s6 = s6 + f6(i,j,k)*f6(i,j,k)
-        s7 = s7 + f7(i,j,k)*f7(i,j,k)
-      enddo
-    enddo
-  enddo
-
-  f_out(1) = s1*dX*dY*dZ
-  f_out(2) = s2*dX*dY*dZ
-  f_out(3) = s3*dX*dY*dZ
-  f_out(4) = s4*dX*dY*dZ
-  f_out(5) = s5*dX*dY*dZ
-  f_out(6) = s6*dX*dY*dZ
-  f_out(7) = s7*dX*dY*dZ
-
-  return
-
-  end subroutine l2normhelper7
-!--------------------------------------------------------------------------------------
-! calculate L2norm especially for shell Blocks
-  subroutine l2normhelper_sh(ex, X, Y, Z,xmin,ymin,zmin,xmax,ymax,zmax,&
-                          f,f_out,gw,ogw,Symmetry)
+  return
+
+  end subroutine l2normhelper
+!--------------------------------------------------------------------------------------
+! calculate L2norm especially for shell Blocks
+  subroutine l2normhelper_sh(ex, X, Y, Z,xmin,ymin,zmin,xmax,ymax,zmax,&
+                          f,f_out,gw,ogw,Symmetry)
 
   implicit none
 !~~~~~~> Input parameters:

AMSS_NCKU_source/fmisc.h

@@ -12,10 +12,9 @@
 #define f_global_interpind global_interpind
 #define f_global_interpind2d global_interpind2d
 #define f_global_interpind1d global_interpind1d
-#define f_l2normhelper l2normhelper
-#define f_l2normhelper7 l2normhelper7
-#define f_l2normhelper_sh l2normhelper_sh
-#define f_l2normhelper_sh_rms l2normhelper_sh_rms
+#define f_l2normhelper l2normhelper
+#define f_l2normhelper_sh l2normhelper_sh
+#define f_l2normhelper_sh_rms l2normhelper_sh_rms
 #define f_average average
 #define f_average3 average3
 #define f_average2 average2
@@ -42,10 +41,9 @@
 #define f_global_interpind GLOBAL_INTERPIND
 #define f_global_interpind2d GLOBAL_INTERPIND2D
 #define f_global_interpind1d GLOBAL_INTERPIND1D
-#define f_l2normhelper L2NORMHELPER
-#define f_l2normhelper7 L2NORMHELPER7
-#define f_l2normhelper_sh L2NORMHELPER_SH
-#define f_l2normhelper_sh_rms L2NORMHELPER_SH_RMS
+#define f_l2normhelper L2NORMHELPER
+#define f_l2normhelper_sh L2NORMHELPER_SH
+#define f_l2normhelper_sh_rms L2NORMHELPER_SH_RMS
 #define f_average AVERAGE
 #define f_average3 AVERAGE3
 #define f_average2 AVERAGE2
@@ -72,10 +70,9 @@
 #define f_global_interpind global_interpind_
 #define f_global_interpind2d global_interpind2d_
 #define f_global_interpind1d global_interpind1d_
-#define f_l2normhelper l2normhelper_
-#define f_l2normhelper7 l2normhelper7_
-#define f_l2normhelper_sh l2normhelper_sh_
-#define f_l2normhelper_sh_rms l2normhelper_sh_rms_
+#define f_l2normhelper l2normhelper_
+#define f_l2normhelper_sh l2normhelper_sh_
+#define f_l2normhelper_sh_rms l2normhelper_sh_rms_
 #define f_average average_
 #define f_average3 average3_
 #define f_average2 average2_
@@ -159,29 +156,20 @@ extern "C"
 							  int *, double *, int &, int &);
 }
 
-extern "C"
-{
-	void f_l2normhelper(int *, double *, double *, double *,
-						double &, double &, double &,
-						double &, double &, double &,
-						double *, double &, int &);
-}
-
-extern "C"
-{
-	void f_l2normhelper7(int *, double *, double *, double *,
-						 double &, double &, double &,
-						 double &, double &, double &,
-						 double *, double *, double *, double *,
-						 double *, double *, double *, double *, int &);
-}
-
-extern "C"
-{
-	void f_l2normhelper_sh(int *, double *, double *, double *,
-						   double &, double &, double &,
-						   double &, double &, double &,
-						   double *, double &, int &, int &, int &);
+extern "C"
+{
+	void f_l2normhelper(int *, double *, double *, double *,
+						double &, double &, double &,
+						double &, double &, double &,
+						double *, double &, int &);
+}
+
+extern "C"
+{
+	void f_l2normhelper_sh(int *, double *, double *, double *,
+						   double &, double &, double &,
+						   double &, double &, double &,
+						   double *, double &, int &, int &, int &);
 }
 
 extern "C"

AMSS_NCKU_source/macrodef.h

@@ -29,16 +29,6 @@
 
 #define REGLEV 0
 
-#define BSSN_FINE_TIMING 0
-
-#define BSSN_FINE_TIMING_EVERY 1
-
-#define BSSN_FINE_TIMING_TOPN 8
-
-#define BSSN_KERNEL_FINE_TIMING 0
-
-#define BSSN_ENABLE_STDIN_ABORT_POLL 0
-
 //#define USE_GPU
 
 //#define CHECKDETAIL
@@ -98,21 +88,6 @@
 //     0: for every level;
 //     1: for all
 //
-// define BSSN_FINE_TIMING
-//     enable fine-grained per-timestep timing monitor
-//
-// define BSSN_FINE_TIMING_EVERY
-//     report timing every N coarse timesteps
-//
-// define BSSN_FINE_TIMING_TOPN
-//     number of hottest timing buckets shown in stdout
-//
-// define BSSN_KERNEL_FINE_TIMING
-//     enable split timing inside compute_rhs_bssn
-//
-// define BSSN_ENABLE_STDIN_ABORT_POLL
-//     poll stdin and broadcast abort flag every coarse step
-//
 // define USE_GPU
 //     use gpu or not
 //
@@ -167,3 +142,4 @@
 #define TINY 1e-10
 
 #endif   /* MICRODEF_H */
+

AMSS_NCKU_source/makefile

@@ -2,43 +2,11 @@
 
 include makefile.inc
 
--include AMSS_NCKU_build.mk
-
-ABE_TYPE ?= $(shell awk '/^[[:space:]]*\#define[[:space:]]+ABEtype/ {print $$3; exit}' macrodef.h 2>/dev/null)
-
-ifeq ($(USE_TRANSFER_CACHE),auto)
-ifeq ($(ABE_TYPE),0)
-EFFECTIVE_USE_TRANSFER_CACHE = 1
-else
-EFFECTIVE_USE_TRANSFER_CACHE = 0
-endif
-else
-EFFECTIVE_USE_TRANSFER_CACHE = $(USE_TRANSFER_CACHE)
-endif
-
-ifeq ($(USE_CXX_ESCALAR_KERNEL),1)
-ifeq ($(ABE_TYPE),1)
-EFFECTIVE_USE_CXX_ESCALAR_KERNEL = 1
-else
-EFFECTIVE_USE_CXX_ESCALAR_KERNEL = 0
-endif
-else
-EFFECTIVE_USE_CXX_ESCALAR_KERNEL = 0
-endif
-
-ifeq ($(EFFECTIVE_USE_CXX_ESCALAR_KERNEL),1)
-ifeq ($(USE_CXX_KERNELS),0)
-$(error USE_CXX_ESCALAR_KERNEL=1 requires USE_CXX_KERNELS=1 because bssn_escalar_rhs_c.C reuses the C BSSN kernel)
-endif
-endif
-
 ## polint(ordn=6) kernel selector:
 ##   1 (default): barycentric fast path
 ##   0          : fallback to Neville path
 POLINT6_USE_BARY ?= 1
 POLINT6_FLAG = -DPOLINT6_USE_BARYCENTRIC=$(POLINT6_USE_BARY)
-TRANSFER_CACHE_FLAG = -DBSSN_USE_TRANSFER_CACHE=$(EFFECTIVE_USE_TRANSFER_CACHE)
-ESCALAR_KERNEL_FLAG = -DBSSN_USE_ESCALAR_C_KERNEL=$(EFFECTIVE_USE_CXX_ESCALAR_KERNEL)
 
 ## ABE build flags selected by PGO_MODE (set in makefile.inc, default: opt)
 ##   make                        -> opt  (PGO-guided, maximum performance)
@@ -48,8 +16,7 @@ PROFDATA = /home/$(shell whoami)/AMSS-NCKU/pgo_profile/default.profdata
 ifeq ($(PGO_MODE),instrument)
 ## Phase 1: instrumentation — omit -ipo/-fp-model fast=2 for faster build and numerical stability
 CXXAPPFLAGS = -O3 -xHost -fma -fprofile-instr-generate -ipo \
-              -Dfortran3 -Dnewc -I${MKLROOT}/include $(INTERP_LB_FLAGS) \
-              $(TRANSFER_CACHE_FLAG) $(ESCALAR_KERNEL_FLAG)
+              -Dfortran3 -Dnewc -I${MKLROOT}/include $(INTERP_LB_FLAGS)
 f90appflags = -O3 -xHost -fma -fprofile-instr-generate -ipo \
               -align array64byte -fpp -I${MKLROOT}/include $(POLINT6_FLAG)
 else
@@ -59,8 +26,7 @@ else
 
 
 CXXAPPFLAGS = -O3 -xHost -fp-model fast=2 -fma -ipo \
-              -Dfortran3 -Dnewc -I${MKLROOT}/include $(INTERP_LB_FLAGS) \
-              $(TRANSFER_CACHE_FLAG) $(ESCALAR_KERNEL_FLAG)
+              -Dfortran3 -Dnewc -I${MKLROOT}/include $(INTERP_LB_FLAGS)
 f90appflags = -O3 -xHost -fp-model fast=2 -fma -ipo \
               -align array64byte -fpp -I${MKLROOT}/include $(POLINT6_FLAG)
 endif
@@ -80,11 +46,11 @@ endif
 	$(Cu) $(CUDA_APP_FLAGS) -c $< -o $@ $(CUDA_LIB_PATH)
 
 # C rewrite of BSSN RHS kernel and helpers
-bssn_rhs_c.o: bssn_rhs_c.C
-	${CXX} $(CXXAPPFLAGS) -c $< $(filein) -o $@
-
-fderivs_c.o: fderivs_c.C
-	${CXX} $(CXXAPPFLAGS) -c $< $(filein) -o $@
+bssn_rhs_c.o: bssn_rhs_c.C
+	${CXX} $(CXXAPPFLAGS) -c $< $(filein) -o $@
+
+fderivs_c.o: fderivs_c.C
+	${CXX} $(CXXAPPFLAGS) -c $< $(filein) -o $@
 
 fdderivs_c.o: fdderivs_c.C
 	${CXX} $(CXXAPPFLAGS) -c $< $(filein) -o $@
@@ -120,11 +86,8 @@ ifeq ($(USE_CXX_KERNELS),0)
 # Fortran mode: no C rewrite files; bssn_rhs.o is included via F90FILES below
 CFILES =
 else
-# C++ mode (default): C rewrite of bssn/bssn-escalar rhs and helper kernels
+# C++ mode (default): C rewrite of bssn_rhs and helper kernels
 CFILES = bssn_rhs_c.o fderivs_c.o fdderivs_c.o kodiss_c.o lopsided_c.o lopsided_kodis_c.o
-ifeq ($(EFFECTIVE_USE_CXX_ESCALAR_KERNEL),1)
-CFILES += bssn_escalar_rhs_c.o
-endif
 endif
 
 ## RK4 kernel switch (independent from USE_CXX_KERNELS)

AMSS_NCKU_source/makefile.inc

@@ -46,24 +46,12 @@ endif
 ## Kernel implementation switch
 ##   1 (default) : use C++ rewrite of bssn_rhs and helper kernels (faster)
 ##   0           : fall back to original Fortran kernels
-USE_CXX_KERNELS ?= 1
-
-## BSSN-EScalar RHS switch
-##   1 (default) : use BSSN-EScalar C wrapper on the normal patch path
-##   0           : keep the original Fortran BSSN-EScalar RHS for precision-safe runs
-## Note: this requires USE_CXX_KERNELS=1 because the wrapper reuses the C BSSN kernel.
-USE_CXX_ESCALAR_KERNEL ?= 1
-
-## Cached transfer switch
-##   auto (default): enable for BSSN vacuum, keep other paths on the safe uncached path
-##   1             : force cached Sync/Restrict/OutBd transfer on evolution hot paths
-##   0             : force the original uncached transfer path
-USE_TRANSFER_CACHE ?= auto
+USE_CXX_KERNELS ?= 0
 
 ## RK4 kernel implementation switch
 ##   1 (default) : use C/C++ rewrite of rungekutta4_rout (for optimization experiments)
 ##   0           : use original Fortran rungekutta4_rout.o
-USE_CXX_RK4 ?= 1
+USE_CXX_RK4 ?= 0
 
 f90          = ifx
 f77          = ifx

AMSS_NCKU_source/surface_integral.h

@@ -27,24 +27,19 @@ using namespace std;
 class surface_integral
 {
 
-private:
-	int Symmetry, factor;
-	int N_theta, N_phi; // Number of points in Theta & Phi directions
-	double dphi, dcostheta;
-	double *arcostheta, *wtcostheta;
-	int n_tot; // size of arrays
-
-	double *nx_g, *ny_g, *nz_g; // global list of unit normals
-	int myrank, cpusize;
-	int wave_cache_spinw, wave_cache_maxl, wave_cache_modes;
-	double *wave_theta_pos, *wave_theta_neg;
-	double *wave_phi_cos, *wave_phi_sin;
-	void clear_wave_cache();
-	void build_wave_cache(int spinw, int maxl);
-
-public:
-	surface_integral(int iSymmetry);
-	~surface_integral();
+private:
+	int Symmetry, factor;
+	int N_theta, N_phi; // Number of points in Theta & Phi directions
+	double dphi, dcostheta;
+	double *arcostheta, *wtcostheta;
+	int n_tot; // size of arrays
+
+	double *nx_g, *ny_g, *nz_g; // global list of unit normals
+	int myrank, cpusize;
+
+public:
+	surface_integral(int iSymmetry);
+	~surface_integral();
 
 	void surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var *Ipsi4,
 				   int spinw, int maxl, int NN, double *RP, double *IP,
@@ -82,37 +77,21 @@ public:
 								 double &, double &, double &, double &, double &, double &, double &,
 								 double &, double &, double &, double &, double &, double &,
 								 double &, double &)); // NN is the length of RP and IP
-	void surf_MassPAng(double rex, int lev, cgh *GH, var *chi, var *trK,
-					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
-					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
-					   var *Gmx, var *Gmy, var *Gmz,
-					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
-					   double *Rout, monitor *Monitor, bool refresh_mass_fields = true);
-	void surf_MassPAng(double rex, int lev, ShellPatch *GH, var *chi, var *trK,
-					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
-					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
-					   var *Gmx, var *Gmy, var *Gmz,
-					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
-					   double *Rout, monitor *Monitor, bool refresh_mass_fields = true);
-	void surf_WaveMassPAng(double rex, int lev, cgh *GH,
-					   var *Rpsi4, var *Ipsi4, int spinw, int maxl, int NN, double *RP, double *IP,
-					   var *chi, var *trK,
-					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
-					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
-					   var *Gmx, var *Gmy, var *Gmz,
-					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
-					   double *Rout, monitor *Monitor, bool refresh_mass_fields = true);
-	void surf_WaveMassPAng(double rex, int lev, ShellPatch *GH,
-					   var *Rpsi4, var *Ipsi4, int spinw, int maxl, int NN, double *RP, double *IP,
-					   var *chi, var *trK,
-					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
-					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
-					   var *Gmx, var *Gmy, var *Gmz,
-					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
-					   double *Rout, monitor *Monitor, bool refresh_mass_fields = true);
-	void surf_Wave(double rex, cgh *GH, ShellPatch *SH,
-				   var *chi, var *trK,
-				   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
+	void surf_MassPAng(double rex, int lev, cgh *GH, var *chi, var *trK,
+					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
+					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
+					   var *Gmx, var *Gmy, var *Gmz,
+					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
+					   double *Rout, monitor *Monitor);
+	void surf_MassPAng(double rex, int lev, ShellPatch *GH, var *chi, var *trK,
+					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
+					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
+					   var *Gmx, var *Gmy, var *Gmz,
+					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs,
+					   double *Rout, monitor *Monitor);
+	void surf_Wave(double rex, cgh *GH, ShellPatch *SH,
+				   var *chi, var *trK,
+				   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
 				   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
 				   var *chix, var *chiy, var *chiz,
 				   var *trKx, var *trKy, var *trKz,
@@ -131,12 +110,12 @@ public:
 	bool SR_Interp_Points(MyList<var> *VarList, cgh *GH, ShellPatch *SH,
 						  int NN, double **XX, double *Shellf);
 
-	void surf_MassPAng(double rex, int lev, cgh *GH, var *chi, var *trK,
-					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
-					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
-					   var *Gmx, var *Gmy, var *Gmz,
-					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs, // temparay memory for mass^i
-					   double *Rout, monitor *Monitor, MPI_Comm Comm_here, bool refresh_mass_fields = true);
+	void surf_MassPAng(double rex, int lev, cgh *GH, var *chi, var *trK,
+					   var *gxx, var *gxy, var *gxz, var *gyy, var *gyz, var *gzz,
+					   var *Axx, var *Axy, var *Axz, var *Ayy, var *Ayz, var *Azz,
+					   var *Gmx, var *Gmy, var *Gmz,
+					   var *Sfx_rhs, var *Sfy_rhs, var *Sfz_rhs, // temparay memory for mass^i
+					   double *Rout, monitor *Monitor, MPI_Comm Comm_here);
 	void surf_Wave(double rex, int lev, cgh *GH, var *Rpsi4, var *Ipsi4,
 				   int spinw, int maxl, int NN, double *RP, double *IP,
 				   monitor *Monitor, MPI_Comm Comm_here);

BSSN_BUILD_CONFIG_MIGRATION.md

@@ -1,211 +0,0 @@
-# BSSN Build Config Migration
-
-This note records the build-configuration fix needed when replacing
-`AMSS_NCKU_Input.py` or `generate_macrodef.py` with a newer upstream version.
-
-## Problem
-
-`AMSS_NCKU_source/macrodef.h` is not the authoritative file used by normal
-runs. `AMSS_NCKU_Program.py` first generates macro files under
-`input_data.File_directory`, copies `AMSS_NCKU_source` to
-`<File_directory>/AMSS_NCKU_source_copy`, then copies the generated macro files
-into that copied source tree and compiles there.
-
-Therefore, makefile logic must not depend only on the stale
-`AMSS_NCKU_source/macrodef.h`. The actual equation path must be passed to the
-copied build tree from the same generation step that creates `macrodef.h`.
-
-The performance regression was caused by compiling/linking the
-`BSSN-EScalar` C wrapper into BSSN vacuum builds. For BSSN vacuum (`ABEtype=0`),
-the build must use:
-
-```make
-BSSN_USE_TRANSFER_CACHE=1
-BSSN_USE_ESCALAR_C_KERNEL=0
-```
-
-and must not link `bssn_escalar_rhs_c.o`.
-
-## Required Migration Steps
-
-### 1. Add an ABE type helper in `generate_macrodef.py`
-
-Add a helper that maps `input_data.Equation_Class` to the numeric `ABEtype`.
-Use the same mapping as `macrodef.h`:
-
-```python
-def get_abe_type():
-    if ( input_data.Equation_Class == "BSSN" ):
-        return 0
-    elif ( input_data.Equation_Class == "BSSN-EScalar" ):
-        return 1
-    elif ( input_data.Equation_Class == "BSSN-EM" ):
-        return 3
-    elif ( input_data.Equation_Class == "Z4C" ):
-        return 2
-    else:
-        raise ValueError("Equation_Class setting error!!!")
-```
-
-Update `generate_macrodef_h()` to print `#define ABEtype {get_abe_type()}`
-instead of duplicating the if/elif mapping.
-
-### 2. Generate a makefile fragment
-
-In `generate_macrodef.py`, add:
-
-```python
-def generate_build_config():
-    file1 = open(os.path.join(input_data.File_directory, "AMSS_NCKU_build.mk"), "w")
-    print("# Generated by generate_macrodef.py; do not edit manually.", file=file1)
-    print(f"ABE_TYPE := {get_abe_type()}", file=file1)
-    file1.close()
-```
-
-This file is the build-time authority for the equation path.
-
-### 3. Call and copy the generated build config
-
-In `AMSS_NCKU_Program.py`, after generating `macrodef.h` and `macrodef.fh`, call:
-
-```python
-generate_macrodef.generate_build_config()
-print(" AMSS-NCKU build config AMSS_NCKU_build.mk has been generated. ")
-```
-
-When copying generated files into `AMSS_NCKU_source_copy`, also copy:
-
-```python
-build_config_path = os.path.join(File_directory, "AMSS_NCKU_build.mk")
-shutil.copy2(build_config_path, AMSS_NCKU_source_copy)
-```
-
-### 4. Make the source makefile consume the generated config
-
-At the top of `AMSS_NCKU_source/makefile`, after `include makefile.inc`, add:
-
-```make
--include AMSS_NCKU_build.mk
-
-ABE_TYPE ?= $(shell awk '/^[[:space:]]*\#define[[:space:]]+ABEtype/ {print $$3; exit}' macrodef.h 2>/dev/null)
-```
-
-The generated `AMSS_NCKU_build.mk` is used during normal Python-driven builds.
-The fallback keeps manual source-tree builds usable.
-
-### 5. Gate path-specific build options by `ABE_TYPE`
-
-Use effective build switches:
-
-```make
-ifeq ($(USE_TRANSFER_CACHE),auto)
-ifeq ($(ABE_TYPE),0)
-EFFECTIVE_USE_TRANSFER_CACHE = 1
-else
-EFFECTIVE_USE_TRANSFER_CACHE = 0
-endif
-else
-EFFECTIVE_USE_TRANSFER_CACHE = $(USE_TRANSFER_CACHE)
-endif
-
-ifeq ($(USE_CXX_ESCALAR_KERNEL),1)
-ifeq ($(ABE_TYPE),1)
-EFFECTIVE_USE_CXX_ESCALAR_KERNEL = 1
-else
-EFFECTIVE_USE_CXX_ESCALAR_KERNEL = 0
-endif
-else
-EFFECTIVE_USE_CXX_ESCALAR_KERNEL = 0
-endif
-
-TRANSFER_CACHE_FLAG = -DBSSN_USE_TRANSFER_CACHE=$(EFFECTIVE_USE_TRANSFER_CACHE)
-ESCALAR_KERNEL_FLAG = -DBSSN_USE_ESCALAR_C_KERNEL=$(EFFECTIVE_USE_CXX_ESCALAR_KERNEL)
-```
-
-Only add `bssn_escalar_rhs_c.o` when the effective EScalar C kernel switch is
-enabled:
-
-```make
-ifeq ($(EFFECTIVE_USE_CXX_ESCALAR_KERNEL),1)
-CFILES += bssn_escalar_rhs_c.o
-endif
-```
-
-### 6. Use safe transfer-cache default
-
-In `AMSS_NCKU_source/makefile.inc`, keep:
-
-```make
-USE_TRANSFER_CACHE ?= auto
-```
-
-With the effective switch logic above, this enables cached transfer for BSSN
-vacuum while keeping non-BSSN paths on the uncached path by default.
-
-## Verification Checklist
-
-Run these checks after migrating:
-
-```bash
-python3 -c "import generate_macrodef; generate_macrodef.generate_build_config()"
-cat GW150914/AMSS_NCKU_build.mk
-```
-
-For BSSN, the generated file should contain:
-
-```make
-ABE_TYPE := 0
-```
-
-Dry-run the copied or source makefile:
-
-```bash
-make -n -B INTERP_LB_MODE=off ABE | grep -E 'BSSN_USE_TRANSFER_CACHE|BSSN_USE_ESCALAR_C_KERNEL|bssn_escalar_rhs_c'
-```
-
-Expected BSSN result:
-
-```text
--DBSSN_USE_TRANSFER_CACHE=1 -DBSSN_USE_ESCALAR_C_KERNEL=0
-```
-
-and no `bssn_escalar_rhs_c.o` in the final link command.
-
-Run the full workflow:
-
-```bash
-python3 AMSS_NCKU_Program.py
-```
-
-For the 10-step BSSN test, compare coordinate output:
-
-```bash
-python3 - <<'PY'
-from pathlib import Path
-old = Path('../GW150914-06457/AMSS_NCKU_output/bssn_BH.dat')
-new = Path('GW150914/AMSS_NCKU_output/bssn_BH.dat')
-
-def rows(path):
-    out = []
-    for line in path.read_text().splitlines():
-        if not line.strip() or line.lstrip().startswith('#'):
-            continue
-        out.append([float(x) for x in line.split()])
-    return out
-
-ro, rn = rows(old), rows(new)
-n = min(len(ro), len(rn))
-max_abs = 0.0
-for i in range(n):
-    for a, b in zip(ro[i], rn[i]):
-        max_abs = max(max_abs, abs(a - b))
-print(f"old_rows={len(ro)} new_rows={len(rn)} compared_rows={n}")
-print(f"max_abs_diff={max_abs:.17g}")
-PY
-```
-
-For the validated migration, the first 10 rows matched exactly:
-
-```text
-max_abs_diff=0
-```

generate_macrodef.py

@@ -12,37 +12,6 @@ import os
 import AMSS_NCKU_Input as input_data          ## import program input file
 
 
-##################################################################
-
-def get_abe_type():
-    if ( input_data.Equation_Class == "BSSN" ):
-        return 0
-    elif ( input_data.Equation_Class == "BSSN-EScalar" ):
-        return 1
-    elif ( input_data.Equation_Class == "BSSN-EM" ):
-        return 3
-    elif ( input_data.Equation_Class == "Z4C" ):
-        return 2
-    else:
-        raise ValueError("Equation_Class setting error!!!")
-
-
-##################################################################
-
-## Generate the makefile fragment used by the copied source tree.
-## The source-tree macrodef.h is not authoritative because macro files
-## are regenerated under File_directory for each run.
-
-def generate_build_config():
-
-    file1 = open( os.path.join(input_data.File_directory, "AMSS_NCKU_build.mk"), "w")
-
-    print( "# Generated by generate_macrodef.py; do not edit manually.", file=file1 )
-    print( f"ABE_TYPE := {get_abe_type()}",                             file=file1 )
-
-    file1.close()
-
-
 ##################################################################
 
 ## Generate the macro file macrodef.h according to user settings
@@ -89,10 +58,19 @@ def generate_macrodef_h():
     # 2: Z4c vacuum
     # 3: coupled to Maxwell field
 
-    try:
-        print( f"#define ABEtype {get_abe_type()}", file=file1 )
-        print(                                      file=file1 )
-    except ValueError:
+    if ( input_data.Equation_Class == "BSSN" ):
+        print( "#define ABEtype 0", file=file1 )
+        print(                      file=file1 )
+    elif ( input_data.Equation_Class == "BSSN-EScalar" ):
+        print( "#define ABEtype 1", file=file1 )
+        print(                      file=file1 )
+    elif ( input_data.Equation_Class == "BSSN-EM" ):
+        print( "#define ABEtype 3", file=file1 )
+        print(                      file=file1 )
+    elif ( input_data.Equation_Class == "Z4C" ):
+        print( "#define ABEtype 2", file=file1 )
+        print(                      file=file1 )
+    else:
         print( "Equation_Class setting error!!!"                )
         print()
         print( "# Equation type #define ABEtype setting error!!!", file=file1 )
@@ -166,62 +144,6 @@ def generate_macrodef_h():
     print( "#define REGLEV 0",      file=file1 )
     print(                          file=file1 )
 
-    # Define fine-grained timing/debug macros.
-    # All of them default to OFF so production builds do not pay profiling overhead.
-
-    fine_timing = getattr(input_data, "Fine_Timing",
-                  getattr(input_data, "Finegrained_Timing", "no"))
-    kernel_fine_timing = getattr(input_data, "Kernel_Fine_Timing",
-                          getattr(input_data, "BSSN_Kernel_Fine_Timing", "no"))
-    stdin_abort_poll = getattr(input_data, "Enable_Stdin_Abort_Poll",
-                       getattr(input_data, "Stdin_Abort_Poll", "no"))
-    timing_report_every = max(1, int(getattr(
-        input_data, "Timing_Every_Steps",
-        getattr(input_data, "Timing_Report_Every", 1))))
-    timing_top_hotspots = max(1, int(getattr(
-        input_data, "Timing_Top_Hotspots", 8)))
-
-    if ( fine_timing == "yes" ):
-        print( "#define BSSN_FINE_TIMING 1", file=file1 )
-        print(                               file=file1 )
-    elif ( fine_timing == "no" ):
-        print( "#define BSSN_FINE_TIMING 0", file=file1 )
-        print(                               file=file1 )
-    else:
-        print( "Fine_Timing setting error!!!" )
-        print()
-        print( "# Fine_Timing setting error!!!", file=file1 )
-        print(                                   file=file1 )
-
-    print( f"#define BSSN_FINE_TIMING_EVERY {timing_report_every}", file=file1 )
-    print(                                                          file=file1 )
-    print( f"#define BSSN_FINE_TIMING_TOPN {timing_top_hotspots}",  file=file1 )
-    print(                                                          file=file1 )
-
-    if ( kernel_fine_timing == "yes" ):
-        print( "#define BSSN_KERNEL_FINE_TIMING 1", file=file1 )
-        print(                                      file=file1 )
-    elif ( kernel_fine_timing == "no" ):
-        print( "#define BSSN_KERNEL_FINE_TIMING 0", file=file1 )
-        print(                                      file=file1 )
-    else:
-        print( "Kernel_Fine_Timing setting error!!!" )
-        print()
-        print( "# Kernel_Fine_Timing setting error!!!", file=file1 )
-        print(                                          file=file1 )
-
-    if ( stdin_abort_poll == "yes" ):
-        print( "#define BSSN_ENABLE_STDIN_ABORT_POLL 1", file=file1 )
-        print(                                           file=file1 )
-    elif ( stdin_abort_poll == "no" ):
-        print( "#define BSSN_ENABLE_STDIN_ABORT_POLL 0", file=file1 )
-        print(                                           file=file1 )
-    else:
-        print( "Enable_Stdin_Abort_Poll setting error!!!" )
-        print()
-        print( "# Enable_Stdin_Abort_Poll setting error!!!", file=file1 )
-        print(                                               file=file1 )
-
     # Define macro USE_GPU
     # use GPU or not
     
@@ -302,21 +224,6 @@ def generate_macrodef_h():
     print( "//     0: for every level;",                                                 file=file1 ) 
     print( "//     1: for all",                                                          file=file1 )
     print( "//",                                                                         file=file1 )
-    print( "// define BSSN_FINE_TIMING",                                                 file=file1 )
-    print( "//     enable fine-grained per-timestep timing monitor",                     file=file1 )
-    print( "//",                                                                         file=file1 )
-    print( "// define BSSN_FINE_TIMING_EVERY",                                           file=file1 )
-    print( "//     report timing every N coarse timesteps",                              file=file1 )
-    print( "//",                                                                         file=file1 )
-    print( "// define BSSN_FINE_TIMING_TOPN",                                            file=file1 )
-    print( "//     number of hottest timing buckets shown in stdout",                    file=file1 )
-    print( "//",                                                                         file=file1 )
-    print( "// define BSSN_KERNEL_FINE_TIMING",                                          file=file1 )
-    print( "//     enable split timing inside compute_rhs_bssn",                         file=file1 )
-    print( "//",                                                                         file=file1 )
-    print( "// define BSSN_ENABLE_STDIN_ABORT_POLL",                                     file=file1 )
-    print( "//     poll stdin and broadcast abort flag every coarse step",               file=file1 )
-    print( "//",                                                                         file=file1 )
     print( "// define USE_GPU",                                                          file=file1 )
     print( "//     use gpu or not",                                                      file=file1 )
     print( "//",                                                                         file=file1 )