From c768e1220bf146fa7792dace87dd2e5e5f884945 Mon Sep 17 00:00:00 2001 From: ianchb Date: Fri, 24 Apr 2026 21:06:13 +0800 Subject: [PATCH] Also disable cached sync for Z4C --- AMSS_NCKU_source/bssn_class.C | 78 +++++++++++++++++------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/AMSS_NCKU_source/bssn_class.C b/AMSS_NCKU_source/bssn_class.C index ed40deb..878aa46 100644 --- a/AMSS_NCKU_source/bssn_class.C +++ b/AMSS_NCKU_source/bssn_class.C @@ -2772,7 +2772,7 @@ void bssn_class::Evolve(int Steps) GH->Regrid(Symmetry, BH_num, Porgbr, Porg0, SynchList_cor, OldStateList, StateList, SynchList_pre, fgt(PhysTime - dT_mon, StartTime, dT_mon / 2), ErrorMonitor); -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) 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(); } #endif STEP_TIMER_ADD(TB_REGRID, timer_regrid); @@ -3011,7 +3011,7 @@ void bssn_class::RecursiveStep(int lev) { if (ConstraintRefreshLevels) ConstraintRefreshLevels[lev] = 1; -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) 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(); } #endif } @@ -3195,7 +3195,7 @@ void bssn_class::ParallelStep() SynchList_cor, OldStateList, StateList, SynchList_pre, fgt(PhysTime - dT_lev, StartTime, dT_lev / 2), ErrorMonitor)) { -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) 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(); } #endif } @@ -3366,7 +3366,7 @@ void bssn_class::ParallelStep() SynchList_cor, OldStateList, StateList, SynchList_pre, fgt(PhysTime - dT_levp1, StartTime, dT_levp1 / 2), ErrorMonitor)) { -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) 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(); } #endif } @@ -3385,7 +3385,7 @@ void bssn_class::ParallelStep() SynchList_cor, OldStateList, StateList, SynchList_pre, fgt(PhysTime - dT_lev, StartTime, dT_lev / 2), ErrorMonitor)) { -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) 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(); } #endif } @@ -3408,7 +3408,7 @@ void bssn_class::ParallelStep() SynchList_cor, OldStateList, StateList, SynchList_pre, fgt(PhysTime - dT_lev, StartTime, dT_levm1 / 2), ErrorMonitor)) { -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) 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(); } #endif } @@ -3428,7 +3428,7 @@ void bssn_class::ParallelStep() SynchList_cor, OldStateList, StateList, SynchList_pre, fgt(PhysTime - dT_lev, StartTime, dT_levm1 / 2), ErrorMonitor)) { -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) 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(); } #endif } @@ -4044,7 +4044,7 @@ void bssn_class::Step(int lev, int YN) STEP_TIMER_DECL(timer_predictor_sync); Parallel::AsyncSyncState async_pre; -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SynchList_pre, Symmetry); #else Parallel::Sync_start(GH->PatL[lev], SynchList_pre, Symmetry, sync_cache_pre[lev], async_pre); @@ -4067,7 +4067,7 @@ void bssn_class::Step(int lev, int YN) } } #endif -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) Parallel::Sync_finish(sync_cache_pre[lev], async_pre, SynchList_pre, Symmetry); #endif STEP_TIMER_ADD(TB_PREDICTOR_SYNC, timer_predictor_sync); @@ -4485,7 +4485,7 @@ void bssn_class::Step(int lev, int YN) STEP_TIMER_DECL(timer_corrector_sync); Parallel::AsyncSyncState async_cor; -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SynchList_cor, Symmetry); #else Parallel::Sync_start(GH->PatL[lev], SynchList_cor, Symmetry, sync_cache_cor[lev], async_cor); @@ -4508,7 +4508,7 @@ void bssn_class::Step(int lev, int YN) } } #endif -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) Parallel::Sync_finish(sync_cache_cor[lev], async_cor, SynchList_cor, Symmetry); #endif STEP_TIMER_ADD(TB_CORRECTOR_SYNC, timer_corrector_sync); @@ -5001,7 +5001,7 @@ void bssn_class::Step(int lev, int YN) #endif Parallel::AsyncSyncState async_pre; -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SynchList_pre, Symmetry); #else Parallel::Sync_start(GH->PatL[lev], SynchList_pre, Symmetry, sync_cache_pre[lev], async_pre); @@ -5024,7 +5024,7 @@ void bssn_class::Step(int lev, int YN) } } #endif -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) Parallel::Sync_finish(sync_cache_pre[lev], async_pre, SynchList_pre, Symmetry); #endif @@ -5352,7 +5352,7 @@ void bssn_class::Step(int lev, int YN) #endif Parallel::AsyncSyncState async_cor; -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SynchList_cor, Symmetry); #else Parallel::Sync_start(GH->PatL[lev], SynchList_cor, Symmetry, sync_cache_cor[lev], async_cor); @@ -5375,7 +5375,7 @@ void bssn_class::Step(int lev, int YN) } } #endif -#if (ABEtype != 1) +#if (ABEtype != 1 && ABEtype != 2) Parallel::Sync_finish(sync_cache_cor[lev], async_cor, SynchList_cor, Symmetry); #endif @@ -5769,7 +5769,7 @@ void bssn_class::Step(int lev, int YN) // misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"before Predictor sync"); -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SynchList_pre, Symmetry); #else Parallel::Sync_cached(GH->PatL[lev], SynchList_pre, Symmetry, sync_cache_pre[lev]); @@ -5974,7 +5974,7 @@ void bssn_class::Step(int lev, int YN) // misc::tillherecheck(GH->Commlev[lev],GH->start_rank[lev],"before Corrector sync"); -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SynchList_cor, Symmetry); #else Parallel::Sync_cached(GH->PatL[lev], SynchList_cor, Symmetry, sync_cache_cor[lev]); @@ -6615,7 +6615,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB, #endif #if (RPB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Restrict(GH->PatL[lev - 1], GH->PatL[lev], SL, SynchList_pre, Symmetry); #else Parallel::Restrict_cached(GH->PatL[lev - 1], GH->PatL[lev], SL, SynchList_pre, Symmetry, sync_cache_restrict[lev]); @@ -6632,7 +6632,7 @@ 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 -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev - 1], SynchList_pre, Symmetry); #else #if (RP_SYNC_COARSE_AFTER_RESTRICT == 1) @@ -6649,7 +6649,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB, #if (RPB == 0) #if (MIXOUTB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Ppc = GH->PatL[lev - 1]; while (Ppc) { @@ -6690,7 +6690,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB, #endif #if (RPB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Restrict(GH->PatL[lev - 1], GH->PatL[lev], SL, SL, Symmetry); #else Parallel::Restrict_cached(GH->PatL[lev - 1], GH->PatL[lev], SL, SL, Symmetry, sync_cache_restrict[lev]); @@ -6707,7 +6707,7 @@ 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 -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev - 1], SL, Symmetry); #else #if (RP_SYNC_COARSE_AFTER_RESTRICT == 1) @@ -6724,7 +6724,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB, #if (RPB == 0) #if (MIXOUTB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Ppc = GH->PatL[lev - 1]; while (Ppc) { @@ -6755,7 +6755,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB, #endif } -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SL, Symmetry); #else Parallel::Sync_cached(GH->PatL[lev], SL, Symmetry, sync_cache_rp_fine[lev]); @@ -6813,7 +6813,7 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB, } #if (RPB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Restrict(GH->PatL[lev - 1], GH->PatL[lev], SL, SynchList_pre, Symmetry); #else Parallel::Restrict_cached(GH->PatL[lev - 1], GH->PatL[lev], SL, SynchList_pre, Symmetry, sync_cache_restrict[lev]); @@ -6823,7 +6823,7 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB, Parallel::Restrict_bam(GH->PatL[lev - 1], GH->PatL[lev], SL, SynchList_pre, GH->rsul[lev], Symmetry); #endif -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev - 1], SynchList_pre, Symmetry); #else #if (RP_SYNC_COARSE_AFTER_RESTRICT == 1) @@ -6833,7 +6833,7 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB, #if (RPB == 0) #if (MIXOUTB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Ppc = GH->PatL[lev - 1]; while (Ppc) { @@ -6859,7 +6859,7 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB, else // no time refinement levels and for all same time levels { #if (RPB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Restrict(GH->PatL[lev - 1], GH->PatL[lev], SL, SL, Symmetry); #else Parallel::Restrict_cached(GH->PatL[lev - 1], GH->PatL[lev], SL, SL, Symmetry, sync_cache_restrict[lev]); @@ -6869,7 +6869,7 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB, Parallel::Restrict_bam(GH->PatL[lev - 1], GH->PatL[lev], SL, SL, GH->rsul[lev], Symmetry); #endif -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev - 1], SL, Symmetry); #else #if (RP_SYNC_COARSE_AFTER_RESTRICT == 1) @@ -6879,7 +6879,7 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB, #if (RPB == 0) #if (MIXOUTB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Ppc = GH->PatL[lev - 1]; while (Ppc) { @@ -6903,7 +6903,7 @@ void bssn_class::RestrictProlong_aux(int lev, int YN, bool BB, #endif } -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SL, Symmetry); #else Parallel::Sync_cached(GH->PatL[lev], SL, Symmetry, sync_cache_rp_fine[lev]); @@ -6954,7 +6954,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB) } #if (RPB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Restrict(GH->PatL[lev - 1], GH->PatL[lev], SynchList_cor, SynchList_pre, Symmetry); #else Parallel::Restrict_cached(GH->PatL[lev - 1], GH->PatL[lev], SynchList_cor, SynchList_pre, Symmetry, sync_cache_restrict[lev]); @@ -6964,7 +6964,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB) Parallel::Restrict_bam(GH->PatL[lev - 1], GH->PatL[lev], SynchList_cor, SynchList_pre, GH->rsul[lev], Symmetry); #endif -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev - 1], SynchList_pre, Symmetry); #else #if (RP_SYNC_COARSE_AFTER_RESTRICT == 1) @@ -6974,7 +6974,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB) #if (RPB == 0) #if (MIXOUTB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Ppc = GH->PatL[lev - 1]; while (Ppc) { @@ -7002,7 +7002,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB) if (myrank == 0) cout << "===: " << GH->Lt[lev - 1] << "," << GH->Lt[lev] + dT_lev << endl; #if (RPB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Restrict(GH->PatL[lev - 1], GH->PatL[lev], SynchList_cor, StateList, Symmetry); #else Parallel::Restrict_cached(GH->PatL[lev - 1], GH->PatL[lev], SynchList_cor, StateList, Symmetry, sync_cache_restrict[lev]); @@ -7012,7 +7012,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB) Parallel::Restrict_bam(GH->PatL[lev - 1], GH->PatL[lev], SynchList_cor, StateList, GH->rsul[lev], Symmetry); #endif -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev - 1], StateList, Symmetry); #else #if (RP_SYNC_COARSE_AFTER_RESTRICT == 1) @@ -7022,7 +7022,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB) #if (RPB == 0) #if (MIXOUTB == 0) -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Ppc = GH->PatL[lev - 1]; while (Ppc) { @@ -7046,7 +7046,7 @@ void bssn_class::RestrictProlong(int lev, int YN, bool BB) #endif } -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) Parallel::Sync(GH->PatL[lev], SynchList_cor, Symmetry); #else Parallel::Sync_cached(GH->PatL[lev], SynchList_cor, Symmetry, sync_cache_rp_fine[lev]); @@ -8700,7 +8700,7 @@ void bssn_class::AH_Step_Find(int lev, double dT_lev) ihn++; } -#if (ABEtype == 1) +#if (ABEtype == 1 || ABEtype == 2) if (PhysTime > 10) { ihn--;