Add two-node MPI launch configuration

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

AMSS_NCKU_Input.py

@@ -16,7 +16,10 @@ import numpy
 File_directory   = "GW150914"                    ## output file directory
 Output_directory = "binary_output"               ## binary data file directory
                                                  ## The file directory name should not be too long
-MPI_processes    = 64                             ## number of mpi processes used in the simulation
+MPI_processes    = 64                            ## number of mpi processes used in the simulation
+OMP_Threads      = 3                             ## number of OpenMP threads used by each MPI process
+MPI_hosts        = ["localhost", "192.168.20.102"] ## MPI hosts for multi-node runs
+MPI_processes_per_node = 32                      ## MPI ranks launched on each node in MPI_hosts
 
 GPU_Calculation  = "no"                          ## Use GPU or not
                                                  ## (prefer "no" in the current version, because the GPU part may have bugs when integrated in this Python interface)

AMSS_NCKU_Program.py

@@ -126,6 +126,11 @@ setup.generate_AMSSNCKU_input()
 #inputvalue = input()  ## Wait for user input (press Enter) to proceed
 #print()
 
+setup.print_puncture_information()
+
+
+##################################################################
+
 ## Generate AMSS-NCKU program input files based on the configured parameters
 
 print(                                                                                   )
@@ -307,7 +312,7 @@ if (input_data.Initial_Data_Method == "Ansorg-TwoPuncture" ):
     
     import generate_TwoPuncture_input
     
-    generate_TwoPuncture_input.generate_AMSSNCKU_TwoPuncture_input(numerical_grid.puncture_data)
+    generate_TwoPuncture_input.generate_AMSSNCKU_TwoPuncture_input()
     
     print(                                                                                              )
     print( " The input parfile for the TwoPunctureABE executable has been generated. " )
@@ -349,7 +354,7 @@ if (input_data.Initial_Data_Method == "Ansorg-TwoPuncture" ):
 
 import renew_puncture_parameter
     
-renew_puncture_parameter.append_AMSSNCKU_BSSN_input(File_directory, output_directory, numerical_grid.puncture_data)
+renew_puncture_parameter.append_AMSSNCKU_BSSN_input(File_directory, output_directory)
 
 
 ## Generated AMSS-NCKU input filename

AMSS_NCKU_Verify_ASC26.py

@@ -9,11 +9,6 @@ Verification Requirements:
    - 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.
 
 RMS Calculation Method:
 - Computes trajectory deviation on the XY plane independently for BH1 and BH2
@@ -28,10 +23,6 @@ Reference: GW150914-origin (baseline simulation)
 import numpy as np
 import sys
 import os
-import shutil
-import subprocess
-import tempfile
-from PIL import Image
 
 # ANSI Color Codes
 class Color:
@@ -70,132 +61,6 @@ def load_constraint_data(filepath):
                 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
-
 def calculate_all_rms_errors(bh_data_ref, bh_data_target):
     """
     Calculate 3D Vector RMS and component-wise RMS (X, Y, Z) independently.
@@ -319,45 +184,18 @@ def print_constraint_results(results, threshold=2.0):
     return passed
 
 
-def print_figure_results(results, threshold_percent=0.001):
+def print_summary(rms_passed, constraint_passed):
-    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
+    all_passed = rms_passed and constraint_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}")
     
     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}")
@@ -374,8 +212,6 @@ def main():
 
     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")
@@ -394,8 +230,6 @@ def main():
     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}")
 
     bh_data_ref = load_bh_trajectory(bh_file_ref)
     bh_data_target = load_bh_trajectory(bh_file_target)
@@ -409,13 +243,7 @@ def main():
     constraint_results = analyze_constraint_violation(constraint_data)
     constraint_passed = print_constraint_results(constraint_results)
 
-    try:
+    all_passed = print_summary(rms_passed, constraint_passed)
-        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)
 
 if __name__ == "__main__":

AMSS_NCKU_source/Parallel.C

@@ -5284,41 +5284,6 @@ double Parallel::L2Norm(Patch *Pat, var *vf)
 
   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;
@@ -5350,41 +5315,6 @@ double Parallel::L2Norm(Patch *Pat, var *vf, MPI_Comm Comm_here)
 
   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;

AMSS_NCKU_source/Parallel.h

@@ -183,7 +183,6 @@ namespace Parallel
                          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);
   MyList<Parallel::gridseg> *divide_gsl(MyList<Parallel::gridseg> *p, Patch *Pat);
@@ -219,7 +218,6 @@ namespace Parallel
   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);

AMSS_NCKU_source/ShellPatch.C

@@ -3472,43 +3472,6 @@ double ShellPatch::L2Norm(var *vf)
 
   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,

AMSS_NCKU_source/ShellPatch.h

@@ -198,7 +198,6 @@ public:
    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);
 };
 

AMSS_NCKU_source/bssn_class.C

@@ -47,233 +47,6 @@ using namespace std;
 #define BSSN_ENABLE_MEM_USAGE_LOG 0
 #endif
 
-#ifndef BSSN_FINE_TIMING
-#define BSSN_FINE_TIMING 0
-#endif
-
-#ifndef BSSN_FINE_TIMING_EVERY
-#define BSSN_FINE_TIMING_EVERY 1
-#endif
-
-#ifndef BSSN_FINE_TIMING_TOPN
-#define BSSN_FINE_TIMING_TOPN 8
-#endif
-
-#ifndef BSSN_KERNEL_FINE_TIMING
-#define BSSN_KERNEL_FINE_TIMING 0
-#endif
-
-#ifndef BSSN_ENABLE_STDIN_ABORT_POLL
-#define BSSN_ENABLE_STDIN_ABORT_POLL 0
-#endif
-
-#if BSSN_FINE_TIMING
-namespace step_timing
-{
-  enum Bucket
-  {
-    TB_ANALYSIS_PSI4 = 0,
-    TB_ANALYSIS_SURFACE,
-    TB_ANALYSIS_IO,
-    TB_BH_PREDICTOR,
-    TB_PREDICTOR_RHS,
-    TB_PREDICTOR_SYNC,
-    TB_BH_CORRECTOR,
-    TB_CORRECTOR_RHS,
-    TB_CORRECTOR_SYNC,
-    TB_STATE_SWAP,
-    TB_RESTRICT_PROLONG,
-    TB_CONSTRAINT_OUT,
-    TB_DUMP_3D,
-    TB_DUMP_2D,
-    TB_CHECKPOINT,
-    TB_REGRID,
-    TB_COUNT
-  };
-
-  static double local_bucket_seconds[TB_COUNT];
-
-  static const char *bucket_labels[TB_COUNT] =
-  {
-    "analysis_psi4",
-    "analysis_surface",
-    "analysis_io",
-    "bh_predictor",
-    "predictor_rhs",
-    "predictor_sync",
-    "bh_corrector",
-    "corrector_rhs",
-    "corrector_sync",
-    "state_swap",
-    "restrict_prolong",
-    "constraint_out",
-    "dump_3d",
-    "dump_2d",
-    "checkpoint",
-    "regrid"
-  };
-
-  void reset()
-  {
-    for (int i = 0; i < TB_COUNT; i++)
-      local_bucket_seconds[i] = 0.0;
-  }
-
-  void add(Bucket bucket, double seconds)
-  {
-    local_bucket_seconds[int(bucket)] += seconds;
-  }
-
-  void report(int myrank, int nprocs, monitor *TimingMonitor,
-              int step_index, double phys_time, double step_wall_seconds)
-  {
-    double max_bucket_seconds[TB_COUNT];
-    double avg_bucket_seconds[TB_COUNT];
-
-    MPI_Reduce(local_bucket_seconds, max_bucket_seconds, TB_COUNT, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD);
-    MPI_Reduce(local_bucket_seconds, avg_bucket_seconds, TB_COUNT, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD);
-
-    if (myrank != 0)
-      return;
-
-    for (int i = 0; i < TB_COUNT; i++)
-      avg_bucket_seconds[i] /= Mymax(1, nprocs);
-
-    if (TimingMonitor)
-    {
-      double row[2 + 2 * TB_COUNT];
-      row[0] = double(step_index);
-      row[1] = step_wall_seconds;
-      for (int i = 0; i < TB_COUNT; i++)
-      {
-        row[2 + i] = max_bucket_seconds[i];
-        row[2 + TB_COUNT + i] = avg_bucket_seconds[i];
-      }
-      TimingMonitor->writefile(phys_time, 2 + 2 * TB_COUNT, row);
-    }
-
-    double residual = step_wall_seconds;
-    for (int i = 0; i < TB_COUNT; i++)
-      residual -= max_bucket_seconds[i];
-    if (residual < 0.0)
-      residual = 0.0;
-
-    int order[TB_COUNT];
-    for (int i = 0; i < TB_COUNT; i++)
-      order[i] = i;
-
-    for (int i = 0; i < TB_COUNT - 1; i++)
-      for (int j = i + 1; j < TB_COUNT; j++)
-        if (max_bucket_seconds[order[j]] > max_bucket_seconds[order[i]])
-        {
-          int tmp = order[i];
-          order[i] = order[j];
-          order[j] = tmp;
-        }
-
-    ios::fmtflags old_flags = cout.flags();
-    streamsize old_precision = cout.precision();
-
-    cout << " Fine timing hot spots (max rank wall estimate):" << endl;
-    const int topn = Mymin(BSSN_FINE_TIMING_TOPN, TB_COUNT);
-    for (int i = 0; i < topn; i++)
-    {
-      const int ib = order[i];
-      const double frac = (step_wall_seconds > 0.0) ? (100.0 * max_bucket_seconds[ib] / step_wall_seconds) : 0.0;
-      cout << "  "
-           << setw(20) << left << bucket_labels[ib]
-           << " = " << setw(10) << right << setprecision(6) << max_bucket_seconds[ib]
-           << " s  (" << setw(6) << setprecision(4) << frac << "%)" << endl;
-    }
-    if (residual > 1.0e-6)
-    {
-      const double frac = (step_wall_seconds > 0.0) ? (100.0 * residual / step_wall_seconds) : 0.0;
-      cout << "  "
-           << setw(20) << left << "unprofiled_residual"
-           << " = " << setw(10) << right << setprecision(6) << residual
-           << " s  (" << setw(6) << setprecision(4) << frac << "%)" << endl;
-    }
-    cout << endl;
-    cout.flags(old_flags);
-    cout.precision(old_precision);
-  }
-}
-
-#define STEP_TIMER_DECL(var_name) const double var_name = MPI_Wtime()
-#define STEP_TIMER_ADD(bucket_name, var_name) step_timing::add(step_timing::bucket_name, MPI_Wtime() - (var_name))
-#else
-#define STEP_TIMER_DECL(var_name)
-#define STEP_TIMER_ADD(bucket_name, var_name)
-#endif
-
-#if BSSN_KERNEL_FINE_TIMING
-namespace rhs_kernel_timing_report
-{
-  void report(int myrank, int nprocs, int step_index, double step_wall_seconds)
-  {
-    const int bucket_count = f_bssn_rhs_kernel_timing_bucket_count();
-    const double *local_bucket_seconds = f_bssn_rhs_kernel_timing_local_seconds();
-
-    if (bucket_count <= 0 || !local_bucket_seconds)
-      return;
-
-    double *max_bucket_seconds = new double[bucket_count];
-    double *avg_bucket_seconds = new double[bucket_count];
-    int *order = new int[bucket_count];
-
-    MPI_Reduce((void *)local_bucket_seconds, max_bucket_seconds, bucket_count, MPI_DOUBLE, MPI_MAX, 0, MPI_COMM_WORLD);
-    MPI_Reduce((void *)local_bucket_seconds, avg_bucket_seconds, bucket_count, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD);
-
-    if (myrank == 0)
-    {
-      double kernel_total = 0.0;
-      for (int i = 0; i < bucket_count; ++i)
-      {
-        avg_bucket_seconds[i] /= Mymax(1, nprocs);
-        order[i] = i;
-        kernel_total += max_bucket_seconds[i];
-      }
-
-      for (int i = 0; i < bucket_count - 1; ++i)
-        for (int j = i + 1; j < bucket_count; ++j)
-          if (max_bucket_seconds[order[j]] > max_bucket_seconds[order[i]])
-          {
-            int tmp = order[i];
-            order[i] = order[j];
-            order[j] = tmp;
-          }
-
-      ios::fmtflags old_flags = cout.flags();
-      streamsize old_precision = cout.precision();
-
-      const double kernel_frac = (step_wall_seconds > 0.0) ? (100.0 * kernel_total / step_wall_seconds) : 0.0;
-      cout << " RHS kernel split (max-rank accumulated over step " << step_index << "): total "
-           << setprecision(6) << kernel_total << " s  (" << setprecision(4)
-           << kernel_frac << "% of coarse step)" << endl;
-
-      const int topn = Mymin(BSSN_FINE_TIMING_TOPN, bucket_count);
-      for (int i = 0; i < topn; ++i)
-      {
-        const int ib = order[i];
-        const double frac = (kernel_total > 0.0) ? (100.0 * max_bucket_seconds[ib] / kernel_total) : 0.0;
-        cout << "  "
-             << setw(20) << left << f_bssn_rhs_kernel_timing_label(ib)
-             << " = " << setw(10) << right << setprecision(6) << max_bucket_seconds[ib]
-             << " s  (" << setw(6) << setprecision(4) << frac << "% of kernel)" << endl;
-      }
-      cout << endl;
-
-      cout.flags(old_flags);
-      cout.precision(old_precision);
-    }
-
-    delete[] max_bucket_seconds;
-    delete[] avg_bucket_seconds;
-    delete[] order;
-  }
-}
-#endif
-
 //================================================================================================
 
 // define bssn_class
@@ -292,7 +65,6 @@ bssn_class::bssn_class(double Couranti, double StartTimei, double TotalTimei,
                          xc(0), yc(0), zc(0), xr(0), yr(0), zr(0), trigger(0), dTT(0), dumpid(0),
 #endif
                          a_lev(a_levi), maxl(maxli), decn(decni), maxrex(maxrexi), drex(drexi),
-                         ConstraintRefreshLevels(0),
                          CheckPoint(0)
                          // CheckPoint(0)
 {
@@ -335,24 +107,6 @@ bssn_class::bssn_class(double Couranti, double StartTimei, double TotalTimei,
     a_stream.str("");
     a_stream << setw(15) << "# time Ham Px Py Pz Gx Gy Gz";
     ConVMonitor = new monitor("bssn_constraint.dat", myrank, a_stream.str());
-
-#if BSSN_FINE_TIMING
-    a_stream.clear();
-    a_stream.str("");
-    a_stream << setw(8) << "# step";
-    a_stream << setw(14) << "wall";
-    for (int ib = 0; ib < step_timing::TB_COUNT; ib++)
-      a_stream << setw(18) << step_timing::bucket_labels[ib];
-    for (int ib = 0; ib < step_timing::TB_COUNT; ib++)
-    {
-      char str_avg[64];
-      sprintf(str_avg, "avg_%s", step_timing::bucket_labels[ib]);
-      a_stream << setw(18) << str_avg;
-    }
-    TimingMonitor = new monitor("bssn_step_timing.dat", myrank, a_stream.str());
-#else
-    TimingMonitor = 0;
-#endif
   }
   // setup sphere integration engine
   Waveshell = new surface_integral(Symmetry);
@@ -948,9 +702,6 @@ void bssn_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
@@ -1040,8 +791,6 @@ bssn_class::~bssn_class()
   DumpList->clearList();
   ConstraintList->clearList();
 
-  delete[] ConstraintRefreshLevels;
-
   delete phio;
   delete trKo;
   delete gxxo;
@@ -1301,7 +1050,6 @@ bssn_class::~bssn_class()
   delete BHMonitor;
   delete MAPMonitor;
   delete ConVMonitor;
-  delete TimingMonitor;
   delete Waveshell;
 
   delete CheckPoint;
@@ -2288,7 +2036,7 @@ void bssn_class::Read_Ansorg()
 
 void bssn_class::Evolve(int Steps)
 {
-  clock_t prev_clock, curr_clock;
+  double prev_clock = 0.0, curr_clock = 0.0;
   double LastDump = 0.0, LastCheck = 0.0, Last2dDump = 0.0;
   LastAnas = 0;
 #if 0
@@ -2399,21 +2147,12 @@ void bssn_class::Evolve(int Steps)
 
   for (int ncount = 1; ncount < Steps + 1; ncount++)
   {
-#if BSSN_FINE_TIMING
-    step_timing::reset();
-#endif
-#if BSSN_KERNEL_FINE_TIMING
-    f_bssn_rhs_kernel_timing_reset();
-#endif
-#if (BSSN_FINE_TIMING || BSSN_KERNEL_FINE_TIMING)
-    const double step_wall_start = MPI_Wtime();
-#endif
     // special for large mass ratio consideration
     //     if(fabs(Porg0[0][0]-Porg0[1][0])+fabs(Porg0[0][1]-Porg0[1][1])+fabs(Porg0[0][2]-Porg0[1][2])<1e-6) 
     //     { GH->levels=GH->movls; }
 
     if (myrank == 0)
-      curr_clock = clock();
+      curr_clock = MPI_Wtime();
 #if (PSTR == 0)
     RecursiveStep(0);
 #elif (PSTR == 1 || PSTR == 2 || PSTR == 3)
@@ -2434,7 +2173,6 @@ void bssn_class::Evolve(int Steps)
     // When LastDump >= DumpTime, output corresponding binary data
     if (LastDump >= DumpTime)
     {
-      STEP_TIMER_DECL(timer_dump3d);
       //       misc::tillherecheck("before Dump_Data");
 
       for (int lev = 0; lev < GH->levels; lev++)
@@ -2442,7 +2180,6 @@ void bssn_class::Evolve(int Steps)
 #ifdef WithShell
       SH->Dump_Data(DumpList, 0, PhysTime, dT_mon);
 #endif
-      STEP_TIMER_ADD(TB_DUMP_3D, timer_dump3d);
 
       LastDump = 0;
 
@@ -2455,12 +2192,10 @@ void bssn_class::Evolve(int Steps)
     // When Last2dDump >= d2DumpTime, output corresponding 2D data
     if (Last2dDump >= d2DumpTime)
     {
-      STEP_TIMER_DECL(timer_dump2d);
       //       misc::tillherecheck("before 2dDump_Data");
 
       for (int lev = 0; lev < GH->levels; lev++)
         Parallel::d2Dump_Data(GH->PatL[lev], DumpList, 0, PhysTime, dT_mon);
-      STEP_TIMER_ADD(TB_DUMP_2D, timer_dump2d);
 
       Last2dDump = 0;
 
@@ -2473,10 +2208,10 @@ void bssn_class::Evolve(int Steps)
     if (myrank == 0)
     {
       prev_clock = curr_clock;
-      curr_clock = clock();
+      curr_clock = MPI_Wtime();
       cout << endl;
       cout << " Timestep # " << ncount << ": integrating to time: " << PhysTime << "   "
-           << " Computer used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) 
+           << " Computer used " << (curr_clock - prev_clock)
            << " seconds! " << endl;
       // cout << endl;
     }
@@ -2485,12 +2220,10 @@ void bssn_class::Evolve(int Steps)
       break;
 
 #if (REGLEV == 1)
-    STEP_TIMER_DECL(timer_regrid);
     GH->Regrid(Symmetry, BH_num, Porgbr, Porg0,
                SynchList_cor, OldStateList, StateList, SynchList_pre,
                fgt(PhysTime - dT_mon, StartTime, dT_mon / 2), ErrorMonitor);
     for (int il = 0; il < GH->levels; il++) { sync_cache_pre[il].invalidate(); sync_cache_cor[il].invalidate(); sync_cache_rp_coarse[il].invalidate(); sync_cache_rp_fine[il].invalidate(); sync_cache_restrict[il].invalidate(); sync_cache_outbd[il].invalidate(); }
-    STEP_TIMER_ADD(TB_REGRID, timer_regrid);
 #endif
 
 #if (REGLEV == 0 && (PSTR == 1 || PSTR == 2))
@@ -2530,13 +2263,10 @@ void bssn_class::Evolve(int Steps)
              << endl;
       }
       cout << endl;
-#if BSSN_ENABLE_STDIN_ABORT_POLL
       cout << " If you think the physical evolution time is enough for this simulation, please input 'stop' in the terminal to stop the MPI processes in the next evolution step ! " << endl;
-#endif
       // cout << endl;
     }
     
-#if BSSN_ENABLE_STDIN_ABORT_POLL
     ////////////////////////////////////////////////////////////
     // If an "abort" command is detected on stdin, terminate MPI processes
     ////////////////////////////////////////////////////////////
@@ -2564,12 +2294,10 @@ void bssn_class::Evolve(int Steps)
     }
         
     ////////////////////////////////////////////////////////////
-#endif
 
     // When LastCheck >= CheckTime, perform runtime checks and output status data
     if (LastCheck >= CheckTime)
     {
-      STEP_TIMER_DECL(timer_checkpoint);
       LastCheck = 0;
 
       CheckPoint->write_Black_Hole_position(BH_num_input, BH_num, Porg0, Porgbr, Mass);
@@ -2578,20 +2306,7 @@ void bssn_class::Evolve(int Steps)
       CheckPoint->writecheck_sh(PhysTime, SH);
 #endif
       CheckPoint->write_bssn(LastDump, Last2dDump, LastAnas);
-      STEP_TIMER_ADD(TB_CHECKPOINT, timer_checkpoint);
     }
-
-#if (BSSN_FINE_TIMING || BSSN_KERNEL_FINE_TIMING)
-    const double step_wall_seconds = MPI_Wtime() - step_wall_start;
-#endif
-#if BSSN_FINE_TIMING
-    if (ncount % BSSN_FINE_TIMING_EVERY == 0)
-      step_timing::report(myrank, nprocs, TimingMonitor, ncount, PhysTime, step_wall_seconds);
-#endif
-#if BSSN_KERNEL_FINE_TIMING
-    if (ncount % BSSN_FINE_TIMING_EVERY == 0)
-      rhs_kernel_timing_report::report(myrank, nprocs, ncount, step_wall_seconds);
-#endif
   }
   /*
   #ifdef With_AHF
@@ -2723,16 +2438,10 @@ void bssn_class::RecursiveStep(int lev)
 #endif
 
 #if (REGLEV == 0)
-  STEP_TIMER_DECL(timer_regrid_onelevel);
   if (GH->Regrid_Onelevel(lev, Symmetry, BH_num, Porgbr, Porg0,
                       SynchList_cor, OldStateList, StateList, SynchList_pre,
                       fgt(PhysTime - dT_lev, StartTime, dT_lev / 2), ErrorMonitor))
-  {
-  if (ConstraintRefreshLevels)
-    ConstraintRefreshLevels[lev] = 1;
   for (int il = 0; il < GH->levels; il++) { sync_cache_pre[il].invalidate(); sync_cache_cor[il].invalidate(); sync_cache_rp_coarse[il].invalidate(); sync_cache_rp_fine[il].invalidate(); sync_cache_restrict[il].invalidate(); sync_cache_outbd[il].invalidate(); }
-  }
-  STEP_TIMER_ADD(TB_REGRID, timer_regrid_onelevel);
 #endif
 }
 
@@ -3325,7 +3034,6 @@ void bssn_class::Step(int lev, int YN)
 
 // new code 2013-2-15, zjcao
 #if (MAPBH == 1)
-  STEP_TIMER_DECL(timer_bh_predictor);
   // for black hole position
   if (BH_num > 0 && lev == GH->levels - 1)
   {
@@ -3356,7 +3064,6 @@ void bssn_class::Step(int lev, int YN)
       }
     }
   }
-  STEP_TIMER_ADD(TB_BH_PREDICTOR, timer_bh_predictor);
 
   // data analysis part
   // Warning NOTE: the variables1 are used as temp storege room
@@ -3379,7 +3086,6 @@ void bssn_class::Step(int lev, int YN)
   int ERROR = 0;
 
   MyList<ss_patch> *sPp;
-  STEP_TIMER_DECL(timer_predictor_rhs);
   // Predictor
   MyList<Patch> *Pp = GH->PatL[lev];
   while (Pp)
@@ -3655,9 +3361,6 @@ void bssn_class::Step(int lev, int YN)
   }
 #endif
 
-  STEP_TIMER_ADD(TB_PREDICTOR_RHS, timer_predictor_rhs);
-
-  STEP_TIMER_DECL(timer_predictor_sync);
   Parallel::AsyncSyncState async_pre;
   Parallel::Sync_start(GH->PatL[lev], SynchList_pre, Symmetry, sync_cache_pre[lev], async_pre);
 
@@ -3695,7 +3398,6 @@ void bssn_class::Step(int lev, int YN)
     }
   }
 #endif
-  STEP_TIMER_ADD(TB_PREDICTOR_SYNC, timer_predictor_sync);
 
 #if (MAPBH == 0)
   // for black hole position
@@ -3740,7 +3442,6 @@ void bssn_class::Step(int lev, int YN)
   // corrector
   for (iter_count = 1; iter_count < 4; iter_count++)
   {
-    STEP_TIMER_DECL(timer_corrector_rhs);
     // for RK4: t0, t0+dt/2, t0+dt/2, t0+dt;
     if (iter_count == 1 || iter_count == 3)
       TRK4 += dT_lev / 2;
@@ -4020,9 +3721,6 @@ void bssn_class::Step(int lev, int YN)
     }
 #endif
 
-    STEP_TIMER_ADD(TB_CORRECTOR_RHS, timer_corrector_rhs);
-
-    STEP_TIMER_DECL(timer_corrector_sync);
     Parallel::AsyncSyncState async_cor;
     Parallel::Sync_start(GH->PatL[lev], SynchList_cor, Symmetry, sync_cache_cor[lev], async_cor);
 
@@ -4062,10 +3760,8 @@ void bssn_class::Step(int lev, int YN)
       }
     }
 #endif
-    STEP_TIMER_ADD(TB_CORRECTOR_SYNC, timer_corrector_sync);
 
 #if (MAPBH == 0)
-    STEP_TIMER_DECL(timer_bh_corrector);
     // for black hole position
     if (BH_num > 0 && lev == GH->levels - 1)
     {
@@ -4098,13 +3794,11 @@ void bssn_class::Step(int lev, int YN)
         }
       }
     }
-    STEP_TIMER_ADD(TB_BH_CORRECTOR, timer_bh_corrector);
 #endif
 
     // swap time level
     if (iter_count < 3)
     {
-      STEP_TIMER_DECL(timer_state_swap);
       Pp = GH->PatL[lev];
       while (Pp)
       {
@@ -4151,11 +3845,9 @@ void bssn_class::Step(int lev, int YN)
         }
       }
 #endif
-      STEP_TIMER_ADD(TB_STATE_SWAP, timer_state_swap);
     }
   }
 #if (RPS == 0)
-  STEP_TIMER_DECL(timer_restrict_prolong);
   // mesh refinement boundary part
   RestrictProlong(lev, YN, BB);
 
@@ -4176,7 +3868,6 @@ void bssn_class::Step(int lev, int YN)
   }
 #endif
 
-  STEP_TIMER_ADD(TB_RESTRICT_PROLONG, timer_restrict_prolong);
 #endif
   // note the data structure before update
   // SynchList_cor 1   -----------
@@ -4185,7 +3876,6 @@ void bssn_class::Step(int lev, int YN)
   //
   // OldStateList  old -----------
   // update
-  STEP_TIMER_DECL(timer_state_commit);
   Pp = GH->PatL[lev];
   while (Pp)
   {
@@ -4242,7 +3932,6 @@ void bssn_class::Step(int lev, int YN)
       Porg0[ithBH][2] = Porg1[ithBH][2];
     }
   }
-  STEP_TIMER_ADD(TB_STATE_SWAP, timer_state_commit);
 }
 
 //================================================================================================
@@ -4569,9 +4258,7 @@ void bssn_class::Step(int lev, int YN)
     }
   }
 #endif
-  STEP_TIMER_ADD(TB_PREDICTOR_SYNC, timer_predictor_sync);
 
-  STEP_TIMER_DECL(timer_bh_predictor);
   // for black hole position
   if (BH_num > 0 && lev == GH->levels - 1)
   {
@@ -4610,7 +4297,6 @@ void bssn_class::Step(int lev, int YN)
   {
     AnalysisStuff(lev, dT_lev);
   }
-  STEP_TIMER_ADD(TB_BH_PREDICTOR, timer_bh_predictor);
   // corrector
   for (iter_count = 1; iter_count < 3; iter_count++)
   {
@@ -6081,7 +5767,6 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB,
 //
 // SynchList_cor  old -----------
 {
-  STEP_TIMER_DECL(timer_restrict_prolong);
 #if (PSTR == 1 || PSTR == 2)
 //  stringstream a_stream;
 //  a_stream.setf(ios::left);
@@ -6224,7 +5909,6 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB,
 //    misc::tillherecheck(GH->Commlev[GH->mylev],GH->start_rank[GH->mylev],a_stream.str());
 #endif
   }
-  STEP_TIMER_ADD(TB_RESTRICT_PROLONG, timer_restrict_prolong);
 }
 
 //================================================================================================
@@ -6244,7 +5928,6 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB,
 //
 // SynchList_cor  old -----------
 {
-  STEP_TIMER_DECL(timer_restrict_prolong);
   //  misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"starting RestrictProlong_aux");
 
   if (lev >= GH->levels - 1)
@@ -6313,7 +5996,6 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB,
 
     Parallel::Sync_cached(GH->PatL[lev], SL, Symmetry, sync_cache_rp_fine[lev]);
   }
-  STEP_TIMER_ADD(TB_RESTRICT_PROLONG, timer_restrict_prolong);
 }
 
 //================================================================================================
@@ -6324,7 +6006,6 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB,
 
 void bssn_class::RestrictProlong(int lev, int YN, bool BB)
 {
-  STEP_TIMER_DECL(timer_restrict_prolong);
   double dT_lev = dT * pow(0.5, Mymax(lev, trfls));
   // we assume  for fine
   // SynchList_cor 1   -----------
@@ -6404,7 +6085,6 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB)
 
     Parallel::Sync_cached(GH->PatL[lev], SynchList_cor, Symmetry, sync_cache_rp_fine[lev]);
   }
-  STEP_TIMER_ADD(TB_RESTRICT_PROLONG, timer_restrict_prolong);
 }
 
 //================================================================================================
@@ -7155,15 +6835,18 @@ void bssn_class::compute_Porg_rhs(double **BH_PS,double **BH_RHS,var *forx,var *
 
 void bssn_class::compute_Porg_rhs(double **BH_PS, double **BH_RHS, var *forx, var *fory, var *forz, int ilev)
 {
-  MyList<var> DG_List_x(forx);
+  const int InList = 3;
-  MyList<var> DG_List_y(fory);
-  MyList<var> DG_List_z(forz);
-  DG_List_x.next = &DG_List_y;
-  DG_List_y.next = &DG_List_z;
 
-  double shellf[3];
+  MyList<var> *DG_List = new MyList<var>(forx);
-  double pox_buf[3][1];
+  DG_List->insert(fory);
-  double *pox[3] = {pox_buf[0], pox_buf[1], pox_buf[2]};
+  DG_List->insert(forz);
+
+  double *x1, *y1, *z1;
+  double *shellf;
+  shellf = new double[3];
+  double *pox[3];
+  for (int i = 0; i < 3; i++)
+    pox[i] = new double[1];
 
   for (int n = 0; n < BH_num; n++)
   {
@@ -7174,9 +6857,9 @@ void bssn_class::compute_Porg_rhs(double **BH_PS, double **BH_RHS, var *forx, va
     int lev = ilev;
 
 #if (PSTR == 0)
-    while (!Parallel::PatList_Interp_Points(GH->PatL[lev], &DG_List_x, 1, pox, shellf, Symmetry))
+    while (!Parallel::PatList_Interp_Points(GH->PatL[lev], DG_List, 1, pox, shellf, Symmetry))
 #elif (PSTR == 1 || PSTR == 2 || PSTR == 3)
-    while (!Parallel::PatList_Interp_Points(GH->PatL[lev], &DG_List_x, 1, pox, shellf, Symmetry, GH->Commlev[lev]))
+    while (!Parallel::PatList_Interp_Points(GH->PatL[lev], DG_List, 1, pox, shellf, Symmetry, GH->Commlev[lev]))
 #endif
     {
       lev--;
@@ -7185,7 +6868,7 @@ void bssn_class::compute_Porg_rhs(double **BH_PS, double **BH_RHS, var *forx, va
         ErrorMonitor->outfile << "fail to find black holes at t = " << PhysTime << endl;
         for (n = 0; n < BH_num; n++)
           ErrorMonitor->outfile << "(x,y,z) = (" 
-                                << BH_PS[n][0] << "," << BH_PS[n][1] << "," << BH_PS[n][2] 
+                                << pox[0][n] << "," << pox[1][n] << "," << pox[2][n] 
                                 << ")" << endl;
         break;
       }
@@ -7198,6 +6881,11 @@ void bssn_class::compute_Porg_rhs(double **BH_PS, double **BH_RHS, var *forx, va
       BH_RHS[n][2] = -shellf[2];
     }
   }
+
+  DG_List->clearList();
+  delete[] shellf;
+  for (int i = 0; i < 3; i++)
+    delete[] pox[i];
 }
 #endif
 
@@ -7420,10 +7108,6 @@ void bssn_class::AnalysisStuff(int lev, double dT_lev)
     IP = new double[NN];
     RoutMAP = new double[7];
     double Rex = maxrex;
-    bool patch_mass_prepared = false;
-#ifdef WithShell
-    bool shell_mass_prepared = false;
-#endif
     for (int i = 0; i < decn; i++)
     {
 #ifdef Point_Psi4
@@ -7451,8 +7135,7 @@ void bssn_class::AnalysisStuff(int lev, double dT_lev)
                                  gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
                                  Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
                                  Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
-                                 RoutMAP, ErrorMonitor, !patch_mass_prepared);
+                                 RoutMAP, ErrorMonitor);
-        patch_mass_prepared = true;
       }
       else
       {
@@ -7460,52 +7143,44 @@ void bssn_class::AnalysisStuff(int lev, double dT_lev)
                                  gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
                                  Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
                                  Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
-                                 RoutMAP, ErrorMonitor, !shell_mass_prepared);
+                                 RoutMAP, ErrorMonitor);
-        shell_mass_prepared = true;
       }
 #else
       Waveshell->surf_MassPAng(Rex, lev, GH, phi0, trK0,
                                gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
                                Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
                                Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
-                               RoutMAP, ErrorMonitor, !patch_mass_prepared);
+                               RoutMAP, ErrorMonitor);
-      patch_mass_prepared = true;
 #endif
 #else
 //        misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"before surface integral");
 #ifdef WithShell
       if (lev > 0 || Rex < GH->bbox[0][0][3])
       {
-        Waveshell->surf_WaveMassPAng(Rex, lev, GH,
+        Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor);
-                                     Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
+        Waveshell->surf_MassPAng(Rex, lev, GH, phi0, trK0,
-                                     phi0, trK0,
+                                 gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
-                                     gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
+                                 Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
-                                     Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
+                                 Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
-                                     Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
+                                 RoutMAP, ErrorMonitor);
-                                     RoutMAP, ErrorMonitor, !patch_mass_prepared);
-        patch_mass_prepared = true;
       }
       else
       {
-        Waveshell->surf_WaveMassPAng(Rex, lev, SH,
+        Waveshell->surf_Wave(Rex, lev, SH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor);
-                                     Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
+        Waveshell->surf_MassPAng(Rex, lev, SH, phi0, trK0,
-                                     phi0, trK0,
+                                 gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
-                                     gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
+                                 Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
-                                     Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
+                                 Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
-                                     Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
+                                 RoutMAP, ErrorMonitor);
-                                     RoutMAP, ErrorMonitor, !shell_mass_prepared);
-        shell_mass_prepared = true;
       }
 #else
 #if (PSTR == 0)
-      Waveshell->surf_WaveMassPAng(Rex, lev, GH,
+      Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor);
-                                   Rpsi4, Ipsi4, 2, maxl, NN, RP, IP,
+      Waveshell->surf_MassPAng(Rex, lev, GH, phi0, trK0,
-                                   phi0, trK0,
+                               gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
-                                   gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
+                               Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
-                                   Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
+                               Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
-                                   Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1,
+                               RoutMAP, ErrorMonitor);
-                                   RoutMAP, ErrorMonitor, !patch_mass_prepared);
-      patch_mass_prepared = true;
 #elif (PSTR == 1 || PSTR == 2)
       Waveshell->surf_Wave(Rex, lev, GH, Rpsi4, Ipsi4, 2, maxl, NN, RP, IP, ErrorMonitor, GH->Commlev[lev]);
       //        misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"after surf_Wave");
@@ -7513,8 +7188,7 @@ void bssn_class::AnalysisStuff(int lev, double dT_lev)
                                gxx0, gxy0, gxz0, gyy0, gyz0, gzz0,
                                Axx0, Axy0, Axz0, Ayy0, Ayz0, Azz0,
                                Gmx0, Gmy0, Gmz0, Sfx1, Sfy1, Sfz1, // here we can not touch rhs variables, but 1 variables
-                               RoutMAP, ErrorMonitor, GH->Commlev[lev], !patch_mass_prepared);
+                               RoutMAP, ErrorMonitor, GH->Commlev[lev]);
-      patch_mass_prepared = true;
 #endif
 #endif
 //        misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"end surface integral");
@@ -7587,7 +7261,7 @@ void bssn_class::Constraint_Out()
     for (int lev = 0; lev < GH->levels; lev++)
     {
       // make sure the data consistent for higher levels
-      if (lev > 0 && ConstraintRefreshLevels && ConstraintRefreshLevels[lev]) // only refresh levels whose grid layout changed after evolution
+      if (lev > 0) // if the constrait quantities can be reused from the step rhs calculation
       {
         double TRK4 = PhysTime;
         double ndeps = numepsb;
@@ -7741,18 +7415,35 @@ void bssn_class::Constraint_Out()
 #if (PSTR == 1 || PSTR == 2)
     double ConV_h[7];
 #endif
-    var *ConstraintVars[7] = {Cons_Ham, Cons_Px, Cons_Py, Cons_Pz, Cons_Gx, Cons_Gy, Cons_Gz};
 
 #ifdef WithShell
-    SH->L2Norm7(ConstraintVars, ConV);
+    ConV[0] = SH->L2Norm(Cons_Ham);
+    ConV[1] = SH->L2Norm(Cons_Px);
+    ConV[2] = SH->L2Norm(Cons_Py);
+    ConV[3] = SH->L2Norm(Cons_Pz);
+    ConV[4] = SH->L2Norm(Cons_Gx);
+    ConV[5] = SH->L2Norm(Cons_Gy);
+    ConV[6] = SH->L2Norm(Cons_Gz);
     ConVMonitor->writefile(PhysTime, 7, ConV);
 #endif
     for (int levi = 0; levi < GH->levels; levi++)
     {
 #if (PSTR == 0)
-      Parallel::L2Norm7(GH->PatL[levi]->data, ConstraintVars, ConV);
+      ConV[0] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Ham);
+      ConV[1] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Px);
+      ConV[2] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Py);
+      ConV[3] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Pz);
+      ConV[4] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Gx);
+      ConV[5] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Gy);
+      ConV[6] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Gz);
 #elif (PSTR == 1 || PSTR == 2)
-      Parallel::L2Norm7(GH->PatL[levi]->data, ConstraintVars, ConV, GH->Commlev[levi]);
+      ConV[0] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Ham, GH->Commlev[levi]);
+      ConV[1] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Px, GH->Commlev[levi]);
+      ConV[2] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Py, GH->Commlev[levi]);
+      ConV[3] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Pz, GH->Commlev[levi]);
+      ConV[4] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Gx, GH->Commlev[levi]);
+      ConV[5] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Gy, GH->Commlev[levi]);
+      ConV[6] = Parallel::L2Norm(GH->PatL[levi]->data, Cons_Gz, GH->Commlev[levi]);
       //        misc::tillherecheck("before collect data to cpu0");
       // MPI_ALLREDUCE( sendbuf, recvbuf, count, datatype, op, comm), sendbu and recvbuf must be different
       if (levi > 0)
@@ -7783,9 +7474,6 @@ void bssn_class::Constraint_Out()
     Interp_Constraint(false);
 
     LastConsOut = 0;
-    if (ConstraintRefreshLevels)
-      for (int lev = 0; lev < GH->levels; lev++)
-        ConstraintRefreshLevels[lev] = 0;
   }
 }
 

AMSS_NCKU_source/bssn_class.h

@@ -48,7 +48,6 @@ public:
        double StartTime, TotalTime;
        double AnasTime, DumpTime, d2DumpTime, CheckTime;
        double LastAnas, LastConsOut;
-       int *ConstraintRefreshLevels;
        double Courant;
        double numepss, numepsb, numepsh;
        int Symmetry;
@@ -135,7 +134,7 @@ public:
        Parallel::SyncCache *sync_cache_outbd;      // cached OutBdLow2Hi in RestrictProlong
 
        monitor *ErrorMonitor, *Psi4Monitor, *BHMonitor, *MAPMonitor;
-       monitor *ConVMonitor, *TimingMonitor;
+       monitor *ConVMonitor;
        surface_integral *Waveshell;
        checkpoint *CheckPoint;
 

AMSS_NCKU_source/bssn_gpu_class.C

@@ -1891,7 +1891,7 @@ void bssn_class::Read_Ansorg()
 void bssn_class::Evolve(int Steps)
 {
 
-  clock_t prev_clock, curr_clock;
+  double prev_clock = 0.0, curr_clock = 0.0;
   double LastDump = 0.0, LastCheck = 0.0, Last2dDump = 0.0;
   LastAnas = 0;
 #if 0
@@ -2037,6 +2037,8 @@ void bssn_class::Evolve(int Steps)
 
   for (int ncount = 1; ncount < Steps + 1; ncount++)
   {
+    if (myrank == 0)
+      curr_clock = MPI_Wtime();
     cout << "Before Step: " << ncount << " My Rank: " << myrank 
          << " takes " << MPI_Wtime() - beg_time << " seconds!" << endl;
     beg_time = MPI_Wtime();
@@ -2096,9 +2098,9 @@ void bssn_class::Evolve(int Steps)
     if (myrank == 0)
     {
       prev_clock = curr_clock;
-      curr_clock = clock();
+      curr_clock = MPI_Wtime();
       cout << "Timestep # " << ncount << ": integrating to time: " << PhysTime << endl;
-      cout << "used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds!" << endl;
+      cout << "used " << (curr_clock - prev_clock) << " seconds!" << endl;
     }
 
     if (PhysTime >= TotalTime)

AMSS_NCKU_source/bssn_rhs.h

@@ -32,19 +32,6 @@
 #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

AMSS_NCKU_source/bssn_rhs_c.C

@@ -2,88 +2,30 @@
 #include "bssn_rhs.h"
 #include "share_func.h"
 #include "tool.h"
-#include <time.h>
+
+#ifdef _OPENMP
+#define BSSN_OMP_TASK_GROUP_BEGIN \
+    _Pragma("omp parallel")       \
+    {                             \
+        _Pragma("omp single nowait") \
+        {
+#define BSSN_OMP_TASK_CALL(...) \
+            _Pragma("omp task") { __VA_ARGS__; }
+#define BSSN_OMP_TASK_GROUP_END \
+            _Pragma("omp taskwait") \
+        } \
+    }
+#else
+#define BSSN_OMP_TASK_GROUP_BEGIN {
+#define BSSN_OMP_TASK_CALL(...) { __VA_ARGS__; }
+#define BSSN_OMP_TASK_GROUP_END }
+#endif
 // 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,25 +120,26 @@ 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;
             chin1[i] = chi[i] + 1.0;
         }
         // 9ms //
-        fderivs(ex,betax,betaxx,betaxy,betaxz,X,Y,Z,ANTI, SYM, SYM,Symmetry,Lev);
+        BSSN_OMP_TASK_GROUP_BEGIN
-        fderivs(ex,betay,betayx,betayy,betayz,X,Y,Z, SYM,ANTI, SYM,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,betax,betaxx,betaxy,betaxz,X,Y,Z,ANTI, SYM, SYM,Symmetry,Lev))
-        fderivs(ex,betaz,betazx,betazy,betazz,X,Y,Z, SYM, SYM,ANTI,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,betay,betayx,betayy,betayz,X,Y,Z, SYM,ANTI, SYM,Symmetry,Lev))
-        fderivs(ex,chi,chix,chiy,chiz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,betaz,betazx,betazy,betazz,X,Y,Z, SYM, SYM,ANTI,Symmetry,Lev))
-        fderivs(ex,dxx,gxxx,gxxy,gxxz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,chi,chix,chiy,chiz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev))
-        fderivs(ex,gxy,gxyx,gxyy,gxyz,X,Y,Z,ANTI,ANTI,SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,dxx,gxxx,gxxy,gxxz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,Lev))
-        fderivs(ex,gxz,gxzx,gxzy,gxzz,X,Y,Z,ANTI,SYM ,ANTI,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,gxy,gxyx,gxyy,gxyz,X,Y,Z,ANTI,ANTI,SYM ,Symmetry,Lev))
-        fderivs(ex,dyy,gyyx,gyyy,gyyz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,gxz,gxzx,gxzy,gxzz,X,Y,Z,ANTI,SYM ,ANTI,Symmetry,Lev))
-        fderivs(ex,gyz,gyzx,gyzy,gyzz,X,Y,Z,SYM ,ANTI,ANTI,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,dyy,gyyx,gyyy,gyyz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,Lev))
-        fderivs(ex,dzz,gzzx,gzzy,gzzz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,gyz,gyzx,gyzy,gyzz,X,Y,Z,SYM ,ANTI,ANTI,Symmetry,Lev))
-        fderivs(ex,Lap,Lapx,Lapy,Lapz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,dzz,gzzx,gzzy,gzzz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,Lev))
-        fderivs(ex,trK,Kx,Ky,Kz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,Lap,Lapx,Lapy,Lapz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev))
+        BSSN_OMP_TASK_CALL(fderivs(ex,trK,Kx,Ky,Kz,X,Y,Z,SYM,SYM,SYM,Symmetry,Lev))
+        BSSN_OMP_TASK_GROUP_END
 
         // 3ms //
         for(int i=0;i<all;i+=1){
@@ -218,8 +161,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 +303,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,18 +335,15 @@ 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,
+        BSSN_OMP_TASK_GROUP_BEGIN
-        X,Y,Z,ANTI,SYM, SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fdderivs(ex,betax,gxxx,gxyx,gxzx,gyyx,gyzx,gzzx,X,Y,Z,ANTI,SYM, SYM ,Symmetry,Lev))
-        fdderivs(ex,betay,gxxy,gxyy,gxzy,gyyy,gyzy,gzzy,
+        BSSN_OMP_TASK_CALL(fdderivs(ex,betay,gxxy,gxyy,gxzy,gyyy,gyzy,gzzy,X,Y,Z,SYM ,ANTI,SYM ,Symmetry,Lev))
-        X,Y,Z,SYM ,ANTI,SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fdderivs(ex,betaz,gxxz,gxyz,gxzz,gyyz,gyzz,gzzz,X,Y,Z,SYM ,SYM, ANTI,Symmetry,Lev))
-        fdderivs(ex,betaz,gxxz,gxyz,gxzz,gyyz,gyzz,gzzz,
+        BSSN_OMP_TASK_CALL(fderivs(ex,Gamx,Gamxx,Gamxy,Gamxz,X,Y,Z,ANTI,SYM ,SYM ,Symmetry,Lev))
-        X,Y,Z,SYM ,SYM, ANTI,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,Gamy,Gamyx,Gamyy,Gamyz,X,Y,Z,SYM ,ANTI,SYM ,Symmetry,Lev))
-        fderivs(ex,Gamx,Gamxx,Gamxy,Gamxz,X,Y,Z,ANTI,SYM ,SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_CALL(fderivs(ex,Gamz,Gamzx,Gamzy,Gamzz,X,Y,Z,SYM ,SYM ,ANTI,Symmetry,Lev))
-        fderivs(ex,Gamy,Gamyx,Gamyy,Gamyz,X,Y,Z,SYM ,ANTI,SYM ,Symmetry,Lev);
+        BSSN_OMP_TASK_GROUP_END
-        fderivs(ex,Gamz,Gamzx,Gamzy,Gamzz,X,Y,Z,SYM ,SYM ,ANTI,Symmetry,Lev);
 
         // Fused: fxx/Gamxa + Gamma_rhs part 2 (2 loops -> 1)
         for(int i=0;i<all;i+=1){
@@ -410,6 +351,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 +705,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];
+            fxx[i] = fxx[i] - Gamxxx[i] * chix[i] - Gamyxx[i] * chiy[i] - Gamzxx[i] * chiz[i];
-            const double half_inv_chin1 = HALF * inv_chin1;
+            fxy[i] = fxy[i] - Gamxxy[i] * chix[i] - Gamyxy[i] * chiy[i] - Gamzxy[i] * chiz[i];
-            const double scaled_inv = F3o2 * inv_chin1;
+            fxz[i] = fxz[i] - Gamxxz[i] * chix[i] - Gamyxz[i] * chiy[i] - Gamzxz[i] * chiz[i];
-            const double cxx = fxx[i] - Gamxxx[i] * chix[i] - Gamyxx[i] * chiy[i] - Gamzxx[i] * chiz[i];
+            fyy[i] = fyy[i] - Gamxyy[i] * chix[i] - Gamyyy[i] * chiy[i] - Gamzyy[i] * chiz[i];
-            const double cxy = fxy[i] - Gamxxy[i] * chix[i] - Gamyxy[i] * chiy[i] - Gamzxy[i] * chiz[i];
+            fyz[i] = fyz[i] - Gamxyz[i] * chix[i] - Gamyyz[i] * chiy[i] - Gamzyz[i] * chiz[i];
-            const double cxz = fxz[i] - Gamxxz[i] * chix[i] - Gamyxz[i] * chiy[i] - Gamzxz[i] * chiz[i];
+            fzz[i] = fzz[i] - Gamxzz[i] * chix[i] - Gamyzz[i] * chiy[i] - Gamzzz[i] * chiz[i];
-            const double cyy = fyy[i] - Gamxyy[i] * chix[i] - Gamyyy[i] * chiy[i] - Gamzyy[i] * chiz[i];
+            f[i] =
-            const double cyz = fyz[i] - Gamxyz[i] * chix[i] - Gamyyz[i] * chiy[i] - Gamzyz[i] * chiz[i];
+                gupxx[i] * (fxx[i] - (F3o2 / chin1[i]) * chix[i] * chix[i])
-            const double czz = fzz[i] - Gamxzz[i] * chix[i] - Gamyzz[i] * chiy[i] - Gamzzz[i] * chiz[i];
+                + gupyy[i] * (fyy[i] - (F3o2 / chin1[i]) * chiy[i] * chiy[i])
-            const double ricci_chi =
+                + gupzz[i] * (fzz[i] - (F3o2 / chin1[i]) * chiz[i] * chiz[i])
-                gupxx[i] * (cxx - scaled_inv * chix[i] * chix[i])
+                + TWO * gupxy[i] * (fxy[i] - (F3o2 / chin1[i]) * chix[i] * chiy[i])
-                + gupyy[i] * (cyy - scaled_inv * chiy[i] * chiy[i])
+                + TWO * gupxz[i] * (fxz[i] - (F3o2 / chin1[i]) * chix[i] * chiz[i])
-                + gupzz[i] * (czz - scaled_inv * chiz[i] * chiz[i])
+                + TWO * gupyz[i] * (fyz[i] - (F3o2 / chin1[i]) * chiy[i] * chiz[i]);
-                + TWO * gupxy[i] * (cxy - scaled_inv * chix[i] * chiy[i])
+            Rxx[i] = Rxx[i] + ( fxx[i] - (chix[i] * chix[i]) / (chin1[i] * TWO) + (dxx[i] + ONE) * f[i] ) / (chin1[i] * TWO);
-                + TWO * gupxz[i] * (cxz - scaled_inv * chix[i] * chiz[i])
+            Ryy[i] = Ryy[i] + ( fyy[i] - (chiy[i] * chiy[i]) / (chin1[i] * TWO) + (dyy[i] + ONE) * f[i] ) / (chin1[i] * TWO);
-                + TWO * gupyz[i] * (cyz - scaled_inv * chiy[i] * chiz[i]);
+            Rzz[i] = Rzz[i] + ( fzz[i] - (chiz[i] * chiz[i]) / (chin1[i] * TWO) + (dzz[i] + ONE) * f[i] ) / (chin1[i] * TWO);
-            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;
 
-            Rxy[i] = Rxy[i] + ( cxy - half_inv_chin1 * chix[i] * chiy[i] + gxy[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] + ( cxz - half_inv_chin1 * chix[i] * chiz[i] + gxz[i] * ricci_chi ) * half_inv_chin1;
+            Rxz[i] = Rxz[i] + ( fxz[i] - (chix[i] * chiz[i]) / (chin1[i] * TWO) + gxz[i] * f[i] ) / (chin1[i] * TWO);
-            Ryz[i] = Ryz[i] + ( cyz - half_inv_chin1 * chiy[i] * chiz[i] + gyz[i] * ricci_chi ) * half_inv_chin1;
+            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];
+            /* gxxx,gxxy,gxxz (这里是“升指标后的chi导数/chi”那类量，你沿用原变量名即可) */
-            const double gchi_x = (gupxx[i] * chix[i] + gupxy[i] * chiy[i] + gupxz[i] * chiz[i]) * inv_chin1;
+            gxxx[i] = (gupxx[i] * chix[i] + gupxy[i] * chiy[i] + gupxz[i] * chiz[i]) / chin1[i];
-            const double gchi_y = (gupxy[i] * chix[i] + gupyy[i] * chiy[i] + gupyz[i] * chiz[i]) * inv_chin1;
+            gxxy[i] = (gupxy[i] * chix[i] + gupyy[i] * chiy[i] + gupyz[i] * chiz[i]) / chin1[i];
-            const double gchi_z = (gupxz[i] * chix[i] + gupyz[i] * chiy[i] + gupzz[i] * chiz[i]) * inv_chin1;
+            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;
+            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) * gchi_y ) * HALF;  /* 原式只有 -gxx*gxxy */
+            Gamyxx[i] = Gamyxx[i] - ( 0.0           - (dxx[i] + ONE) * gxxy[i] ) * HALF;  /* 原式只有 -gxx*gxxy */
-            Gamzxx[i] = Gamzxx[i] - ( 0.0           - (dxx[i] + ONE) * gchi_z ) * HALF;
+            Gamzxx[i] = Gamzxx[i] - ( 0.0           - (dxx[i] + ONE) * gxxz[i] ) * HALF;
 
-            Gamxyy[i] = Gamxyy[i] - ( 0.0           - (dyy[i] + ONE) * gchi_x ) * HALF;
+            Gamxyy[i] = Gamxyy[i] - ( 0.0           - (dyy[i] + ONE) * gxxx[i] ) * HALF;
-            Gamyyy[i] = Gamyyy[i] - ( ((chiy[i] + chiy[i]) * inv_chin1) - (dyy[i] + ONE) * gchi_y ) * 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) * gchi_z ) * 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;
+            Gamxzz[i] = Gamxzz[i] - ( 0.0           - (dzz[i] + ONE) * gxxx[i] ) * HALF;
-            Gamyzz[i] = Gamyzz[i] - ( 0.0           - (dzz[i] + ONE) * gchi_y ) * HALF;
+            Gamyzz[i] = Gamyzz[i] - ( 0.0           - (dzz[i] + ONE) * gxxy[i] ) * HALF;
-            Gamzzz[i] = Gamzzz[i] - ( ((chiz[i] + chiz[i]) * inv_chin1) - (dzz[i] + ONE) * gchi_z ) * 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;
+            Gamxxy[i] = Gamxxy[i] - ( ( chiy[i] / chin1[i])      - gxy[i] * gxxx[i] ) * HALF;
-            Gamyxy[i] = Gamyxy[i] - ( ( chix[i] * inv_chin1)      - gxy[i] * gchi_y ) * HALF;
+            Gamyxy[i] = Gamyxy[i] - ( ( chix[i] / chin1[i])      - gxy[i] * gxxy[i] ) * HALF;
-            Gamzxy[i] = Gamzxy[i] - ( 0.0           - gxy[i] * gchi_z ) * 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;
+            Gamxxz[i] = Gamxxz[i] - ( ( chiz[i] / chin1[i])      - gxz[i] * gxxx[i] ) * HALF;
-            Gamyxz[i] = Gamyxz[i] - ( 0.0           - gxz[i] * gchi_y ) * HALF;
+            Gamyxz[i] = Gamyxz[i] - ( 0.0           - gxz[i] * gxxy[i] ) * HALF;
-            Gamzxz[i] = Gamzxz[i] - ( ( chix[i] * inv_chin1)      - gxz[i] * gchi_z ) * 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;
+            Gamxyz[i] = Gamxyz[i] - ( 0.0           - gyz[i] * gxxx[i] ) * HALF;
-            Gamyyz[i] = Gamyyz[i] - ( ( chiz[i] * inv_chin1)      - gyz[i] * gchi_y ) * HALF;
+            Gamyyz[i] = Gamyyz[i] - ( ( chiz[i] / chin1[i])      - gyz[i] * gxxy[i] ) * HALF;
-            Gamzyz[i] = Gamzyz[i] - ( ( chiy[i] * inv_chin1)      - gyz[i] * gchi_z ) * 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 +781,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,33 +1081,33 @@ 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);
+        BSSN_OMP_TASK_GROUP_BEGIN
-        lopsided_kodis(ex,X,Y,Z,Gamz,Gamz_rhs,betax,betay,betaz,Symmetry,SSA,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,dxx,gxx_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,gxy,gxy_rhs,betax,betay,betaz,Symmetry,AAS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Gamz,Gamz_rhs,betax,betay,betaz,Symmetry,SSA,eps))
-        lopsided_kodis(ex,X,Y,Z,Lap,Lap_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,gxy,gxy_rhs,betax,betay,betaz,Symmetry,AAS,eps))
-        lopsided_kodis(ex,X,Y,Z,gxz,gxz_rhs,betax,betay,betaz,Symmetry,ASA,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Lap,Lap_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,betax,betax_rhs,betax,betay,betaz,Symmetry,ASS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,gxz,gxz_rhs,betax,betay,betaz,Symmetry,ASA,eps))
-        lopsided_kodis(ex,X,Y,Z,dyy,gyy_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,betax,betax_rhs,betax,betay,betaz,Symmetry,ASS,eps))
-        lopsided_kodis(ex,X,Y,Z,betay,betay_rhs,betax,betay,betaz,Symmetry,SAS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,dyy,gyy_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,gyz,gyz_rhs,betax,betay,betaz,Symmetry,SAA,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,betay,betay_rhs,betax,betay,betaz,Symmetry,SAS,eps))
-        lopsided_kodis(ex,X,Y,Z,betaz,betaz_rhs,betax,betay,betaz,Symmetry,SSA,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,gyz,gyz_rhs,betax,betay,betaz,Symmetry,SAA,eps))
-        lopsided_kodis(ex,X,Y,Z,dzz,gzz_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,betaz,betaz_rhs,betax,betay,betaz,Symmetry,SSA,eps))
-        lopsided_kodis(ex,X,Y,Z,dtSfx,dtSfx_rhs,betax,betay,betaz,Symmetry,ASS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,dzz,gzz_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,Axx,Axx_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,dtSfx,dtSfx_rhs,betax,betay,betaz,Symmetry,ASS,eps))
-        lopsided_kodis(ex,X,Y,Z,dtSfy,dtSfy_rhs,betax,betay,betaz,Symmetry,SAS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Axx,Axx_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,Axy,Axy_rhs,betax,betay,betaz,Symmetry,AAS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,dtSfy,dtSfy_rhs,betax,betay,betaz,Symmetry,SAS,eps))
-        lopsided_kodis(ex,X,Y,Z,dtSfz,dtSfz_rhs,betax,betay,betaz,Symmetry,SSA,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Axy,Axy_rhs,betax,betay,betaz,Symmetry,AAS,eps))
-        lopsided_kodis(ex,X,Y,Z,Axz,Axz_rhs,betax,betay,betaz,Symmetry,ASA,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,dtSfz,dtSfz_rhs,betax,betay,betaz,Symmetry,SSA,eps))
-        lopsided_kodis(ex,X,Y,Z,Ayy,Ayy_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Axz,Axz_rhs,betax,betay,betaz,Symmetry,ASA,eps))
-        lopsided_kodis(ex,X,Y,Z,Ayz,Ayz_rhs,betax,betay,betaz,Symmetry,SAA,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Ayy,Ayy_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,Azz,Azz_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Ayz,Ayz_rhs,betax,betay,betaz,Symmetry,SAA,eps))
-        lopsided_kodis(ex,X,Y,Z,chi,chi_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Azz,Azz_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,trK,trK_rhs,betax,betay,betaz,Symmetry,SSS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,chi,chi_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,Gamx,Gamx_rhs,betax,betay,betaz,Symmetry,ASS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,trK,trK_rhs,betax,betay,betaz,Symmetry,SSS,eps))
-        lopsided_kodis(ex,X,Y,Z,Gamy,Gamy_rhs,betax,betay,betaz,Symmetry,SAS,eps);
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Gamx,Gamx_rhs,betax,betay,betaz,Symmetry,ASS,eps))
+        BSSN_OMP_TASK_CALL(lopsided_kodis(ex,X,Y,Z,Gamy,Gamy_rhs,betax,betay,betaz,Symmetry,SAS,eps))
+        BSSN_OMP_TASK_GROUP_END
         // 2ms //
         if(co==0){
             for (int i=0;i<all;i+=1) {
@@ -1219,12 +1154,14 @@ int f_compute_rhs_bssn(int *ex, double &T,
             }
 
             // 1ms //
-            fderivs(ex,Axx,gxxx,gxxy,gxxz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0);
+            BSSN_OMP_TASK_GROUP_BEGIN
-            fderivs(ex,Axy,gxyx,gxyy,gxyz,X,Y,Z,ANTI,ANTI,SYM ,Symmetry,0);
+            BSSN_OMP_TASK_CALL(fderivs(ex,Axx,gxxx,gxxy,gxxz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0))
-            fderivs(ex,Axz,gxzx,gxzy,gxzz,X,Y,Z,ANTI,SYM ,ANTI,Symmetry,0);
+            BSSN_OMP_TASK_CALL(fderivs(ex,Axy,gxyx,gxyy,gxyz,X,Y,Z,ANTI,ANTI,SYM ,Symmetry,0))
-            fderivs(ex,Ayy,gyyx,gyyy,gyyz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0);
+            BSSN_OMP_TASK_CALL(fderivs(ex,Axz,gxzx,gxzy,gxzz,X,Y,Z,ANTI,SYM ,ANTI,Symmetry,0))
-            fderivs(ex,Ayz,gyzx,gyzy,gyzz,X,Y,Z,SYM ,ANTI,ANTI,Symmetry,0);
+            BSSN_OMP_TASK_CALL(fderivs(ex,Ayy,gyyx,gyyy,gyyz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0))
-            fderivs(ex,Azz,gzzx,gzzy,gzzz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0);
+            BSSN_OMP_TASK_CALL(fderivs(ex,Ayz,gyzx,gyzy,gyzz,X,Y,Z,SYM ,ANTI,ANTI,Symmetry,0))
+            BSSN_OMP_TASK_CALL(fderivs(ex,Azz,gzzx,gzzy,gzzz,X,Y,Z,SYM ,SYM ,SYM ,Symmetry,0))
+            BSSN_OMP_TASK_GROUP_END
             // 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]
@@ -1279,7 +1216,6 @@ int f_compute_rhs_bssn(int *ex, double &T,
                 movz_Res[i] = movz_Res[i] - F2o3*Kz[i] - F8*PI*Sz[i];
             }
         }
-        RHS_KERNEL_TIMER_ADD(KB_KO_CONSTRAINT, timer_ko_constraint);