64-BitBrainstorm_2026/AMSS-NCKU
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix timing: replace clock() with MPI_Wtime() for wall-clock measurement"

Browse Source 
This reverts commit 09b937c022.
This commit is contained in:
ianchb
2026-02-25 22:21:43 +08:00
parent 284ab80baf
commit f5a63f1e42
2 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
AMSS_NCKU_source/bssn_class.C
View File

@@ -2028,7 +2028,7 @@ void bssn_class::Read_Ansorg()
void bssn_class::Evolve(int Steps) void bssn_class::Evolve(int Steps)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
double LastDump = 0.0, LastCheck = 0.0, Last2dDump = 0.0; double LastDump = 0.0, LastCheck = 0.0, Last2dDump = 0.0;
LastAnas = 0; LastAnas = 0;
#if 0 #if 0
@@ -2142,7 +2142,7 @@ void bssn_class::Evolve(int Steps)
// { GH->levels=GH->movls; } // { GH->levels=GH->movls; }
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
#if (PSTR == 0) #if (PSTR == 0)
RecursiveStep(0); RecursiveStep(0);
#elif (PSTR == 1 || PSTR == 2 || PSTR == 3) #elif (PSTR == 1 || PSTR == 2 || PSTR == 3)
@@ -2198,10 +2198,10 @@ void bssn_class::Evolve(int Steps)
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << endl; cout << endl;
cout << " Timestep # " << ncount << ": integrating to time: " << PhysTime << " " cout << " Timestep # " << ncount << ": integrating to time: " << PhysTime << " "
<< " Computer used " << (curr_clock - prev_clock) << " Computer used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
// cout << endl; // cout << endl;
} }
@@ -2403,15 +2403,15 @@ void bssn_class::RecursiveStep(int lev)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(StateList, Symmetry); SH->CS_Inter(StateList, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) << " seconds! " << endl; cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
} }
#endif #endif
@@ -2543,15 +2543,15 @@ void bssn_class::ParallelStep()
SHStep(); SHStep();
#if (RPS == 1) #if (RPS == 1)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(StateList, Symmetry); SH->CS_Inter(StateList, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) << " seconds! " << endl; cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
} }
#endif #endif
@@ -2846,15 +2846,15 @@ void bssn_class::ParallelStep()
#if (RPS == 1) #if (RPS == 1)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(StateList, Symmetry); SH->CS_Inter(StateList, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
// a_stream.clear(); // a_stream.clear();
@@ -3355,16 +3355,16 @@ void bssn_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_pre, Symmetry); SH->Synch(SynchList_pre, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " cout << " Shell stuff synchronization used "
<< (curr_clock - prev_clock) << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -3715,16 +3715,16 @@ void bssn_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_cor, Symmetry); SH->Synch(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " cout << " Shell stuff synchronization used "
<< (curr_clock - prev_clock) << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -3842,15 +3842,15 @@ void bssn_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(SynchList_cor, Symmetry); SH->CS_Inter(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -4214,16 +4214,16 @@ void bssn_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_pre, Symmetry); SH->Synch(SynchList_pre, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " cout << " Shell stuff synchronization used "
<< (curr_clock - prev_clock) << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -4559,16 +4559,16 @@ void bssn_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_cor, Symmetry); SH->Synch(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " cout << " Shell stuff synchronization used "
<< (curr_clock - prev_clock) << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -4679,15 +4679,15 @@ void bssn_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(SynchList_cor, Symmetry); SH->CS_Inter(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -5476,16 +5476,16 @@ void bssn_class::SHStep()
} }
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_pre, Symmetry); SH->Synch(SynchList_pre, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " cout << " Shell stuff synchronization used "
<< (curr_clock - prev_clock) << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -5653,16 +5653,16 @@ void bssn_class::SHStep()
} }
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_cor, Symmetry); SH->Synch(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " cout << " Shell stuff synchronization used "
<< (curr_clock - prev_clock) << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -5698,15 +5698,15 @@ void bssn_class::SHStep()
} }
#if (RPS == 0) #if (RPS == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(SynchList_cor, Symmetry); SH->CS_Inter(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }
@@ -7639,9 +7639,9 @@ void bssn_class::AH_Step_Find(int lev, double dT_lev)
} }
if (tf) if (tf)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
prev_clock = MPI_Wtime(); prev_clock = clock();
const int cdumpid = int(PhysTime / AHdumptime) + 1; const int cdumpid = int(PhysTime / AHdumptime) + 1;
for (int ihn = 0; ihn < HN_num; ihn++) for (int ihn = 0; ihn < HN_num; ihn++)
dumpid[ihn] = cdumpid; dumpid[ihn] = cdumpid;
@@ -7720,9 +7720,9 @@ void bssn_class::AH_Step_Find(int lev, double dT_lev)
if (myrank == 0) if (myrank == 0)
{ {
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Finding horizon used " cout << " Finding horizon used "
<< (curr_clock - prev_clock) << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC)
<< " seconds! " << endl; << " seconds! " << endl;
} }
} }

48
AMSS_NCKU_source/scalar_class.C
View File

@@ -319,7 +319,7 @@ void scalar_class::Setup_Initial_Data()
} }
void scalar_class::Evolve(int Steps) void scalar_class::Evolve(int Steps)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
double LastDump = 0.0, LastCheck = 0.0; double LastDump = 0.0, LastCheck = 0.0;
LastAnas = 0; LastAnas = 0;
@@ -328,7 +328,7 @@ void scalar_class::Evolve(int Steps)
for (int ncount = 1; ncount < Steps + 1; ncount++) for (int ncount = 1; ncount < Steps + 1; ncount++)
{ {
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
RecursiveStep(0); RecursiveStep(0);
LastDump += dT_mon; LastDump += dT_mon;
@@ -346,9 +346,9 @@ void scalar_class::Evolve(int Steps)
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Timestep # " << ncount << ": integrating to time: " << PhysTime cout << " Timestep # " << ncount << ": integrating to time: " << PhysTime
<< " Computer used " << (curr_clock - prev_clock) << " seconds! " << endl; << " Computer used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
if (PhysTime >= TotalTime) if (PhysTime >= TotalTime)
break; break;
@@ -549,15 +549,15 @@ void scalar_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_pre, Symmetry); SH->Synch(SynchList_pre, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " << (curr_clock - prev_clock) << " seconds! " << endl; cout << " Shell stuff synchronization used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
} }
#endif #endif
@@ -731,15 +731,15 @@ void scalar_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_cor, Symmetry); SH->Synch(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " << (curr_clock - prev_clock) << " seconds! " << endl; cout << " Shell stuff synchronization used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
} }
#endif #endif
@@ -786,15 +786,15 @@ void scalar_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(SynchList_cor, Symmetry); SH->CS_Inter(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) << " seconds! " << endl; cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
} }
#endif #endif
@@ -1010,15 +1010,15 @@ void scalar_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->Synch(SynchList_cor, Symmetry); SH->Synch(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " Shell stuff synchronization used " << (curr_clock - prev_clock) << " seconds! " << endl; cout << " Shell stuff synchronization used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
} }
#endif #endif
@@ -1027,15 +1027,15 @@ void scalar_class::Step(int lev, int YN)
#ifdef WithShell #ifdef WithShell
if (lev == 0) if (lev == 0)
{ {
double prev_clock, curr_clock; clock_t prev_clock, curr_clock;
if (myrank == 0) if (myrank == 0)
curr_clock = MPI_Wtime(); curr_clock = clock();
SH->CS_Inter(SynchList_cor, Symmetry); SH->CS_Inter(SynchList_cor, Symmetry);
if (myrank == 0) if (myrank == 0)
{ {
prev_clock = curr_clock; prev_clock = curr_clock;
curr_clock = MPI_Wtime(); curr_clock = clock();
cout << " CS_Inter used " << (curr_clock - prev_clock) << " seconds! " << endl; cout << " CS_Inter used " << (double)(curr_clock - prev_clock) / ((double)CLOCKS_PER_SEC) << " seconds! " << endl;
} }
} }
#endif #endif