correction in terminal output

fabricix · Sep 16, 2024 · 6c4bafc · 6c4bafc
1 parent 990ad43
commit 6c4bafc
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 40 deletions.
diff --git a/inc/Output.h b/inc/Output.h
@@ -68,6 +68,10 @@ namespace Output {
 	/// \brief Print final program screen
 	///
 	void farewellScreen();
+
+	/// \brief Print elapsed time
+	///
+	void printElapsedTime();
 }
 
 #endif /* OUTPUT_H_ */
diff --git a/src/Input.cpp b/src/Input.cpp
@@ -137,10 +137,8 @@ Solver* Input::getSolver() {
 
 				return new SolverExplicitUSL();
 			}
-
 			throw (key);
 		}
-
 		throw(0);
 	}
 

diff --git a/src/MPM.cpp b/src/MPM.cpp
@@ -332,6 +332,7 @@ void MPM::solve(){
 	else{
 		ModelSetup::setInitialSimulationTime(std::chrono::system_clock::now());
 		solver->Solve();
+		Output::printElapsedTime();
 	}
 }
 

diff --git a/src/Output.cpp b/src/Output.cpp
@@ -563,65 +563,79 @@ namespace Output{
 		cout<<"|"+hSpaces+"|"<<"\n";
 		cout<<"|"<<right<<setw(50)<<programDescription<<setw(5)<<right<<"|\n";
 		cout<<"|"+hSpaces+"|"<<"\n";
-		cout<<left<<" "<<setw(width)<<hLines<<"\n\n";
+		cout<<left<<" "<<setw(width)<<hLines<<"\n";
 	}
 
 	void farewellScreen() {
 		 int width = 55;
 		 string hLines(width,'-');
-		 cout<<"\n"<<left<<setw(width)<<hLines<<"\n\n";
+		 cout<<"\n"<<left<<setw(width)<<hLines<<"\n";
 	}
- 
+
 	void updateTerminal(vector<Body*>* bodies, double itime)
 	{
-		clearScreen();
-
-		welcomeScreen();
+		std::cout <<"Time: "<< std::setw(8) << std::scientific << std::setprecision(4) << itime << " s, ";
+		std::cout <<"Energy: "<< std::setw(8) << std::scientific << std::setprecision(4) << DynamicRelaxation::computeKineticEnergy(bodies) << " J, ";
+		std::cout << std::setw(1) << std::fixed << std::setprecision(0) <<"(" << int(100 * itime / ModelSetup::getTime()) << "%) \n";
+	} 
 
-		// get total kinetic energy
-		double ienergy = DynamicRelaxation::computeKineticEnergy(bodies);
-
-		// hours to minutes and seconds
-    	std::chrono::duration<double> elapsed_seconds = std::chrono::system_clock::now() - ModelSetup::getInitialSimulationTime() ;
-		auto hours = std::chrono::duration_cast<std::chrono::hours>(elapsed_seconds);
-    	auto minutes = std::chrono::duration_cast<std::chrono::minutes>(elapsed_seconds) - hours;
-		double seconds = elapsed_seconds.count() - (hours.count() * 3600 + minutes.count() * 60);
-
-        std::cout << "Time         : " << std::setw(8) << std::fixed << std::setprecision(4) << itime << "s" << std::endl;
-        std::cout << "Energy       : " << std::setw(8) << std::scientific << std::setprecision(2) << ienergy << "J" << std::endl;
-        std::cout << "Particles    : " << Particle::getTotalParticles() << std::endl;
-        std::cout << "Threads      : " << ModelSetup::getThreads() << std::endl;
-        std::cout << "Time Step    : " << ModelSetup::getTimeStep() << "s" << std::endl;
-		std::cout << "Elapsed time : "<< hours.count() << "h : " << minutes.count() << "m, " << std::fixed << std::setprecision(2) << seconds << "s"<<std::endl;
-
-        // show the progress bar
-        double progress = itime / ModelSetup::getTime();
-
-		cout << "\n";
+	void printModelInfo(vector<Body*>* bodies, double itime)
+	{
+		std::cout << "     Time : " << std::setw(8) << std::scientific << std::setprecision(4) << ModelSetup::getTime() << "s" << std::endl;
+		std::cout << "Time step : " << std::setw(8) << std::scientific << std::setprecision(4) << ModelSetup::getTimeStep() << "s" << std::endl;
+		std::cout << "Particles : " << Particle::getTotalParticles() << std::endl;
+		std::cout << "  Threads : " << ModelSetup::getThreads() << std::endl;
+		std::cout << "  Results : " << ModelSetup::getResultNum() << std::endl;
+	}
 
-        showProgressBar(progress);		
-		int width = 55;
-		string hLines(width,'-');
-		cout<<"\n"<<left<<setw(width)<<hLines<<"\n";
-
-        // open the simulation CSV file
-        std::ofstream csv_file("simulation_data.csv", std::ios::app);
-        if (!csv_file.is_open()) {
-            std::cerr << "Error in opening the CSV file" << std::endl;
-        }
-        csv_file << itime << "," << ienergy << "\n";
-        csv_file.close();
+	void initializeCSVFile(const std::string& filename) {
+		// Check if the file exists
+		if (std::ifstream(filename)) {
+			// If it exists, delete the file
+			std::remove(filename.c_str());
+		}
 	}
 
+	void writeCSVEnergyFile(std::vector<Body*>* bodies, double iTime) {
+    // Get total kinetic energy
+    double ienergy = DynamicRelaxation::computeKineticEnergy(bodies);
+
+    // Open the simulation CSV file in append mode
+    std::ofstream csv_file("simulation_data.csv", std::ios::app);
+    if (!csv_file.is_open()) {
+        std::cerr << "Error opening the CSV file" << std::endl;
+    }
+
+    // Write time and energy to the file
+    csv_file << iTime << "," << ienergy << "\n";
+
+    // Close the file
+    csv_file.close();
+}
+
 	void writeResultInStep(int loopCounter, int resultSteps,vector<Body*>* bodies, double iTime)
 	{
+		if (iTime == 0) { printModelInfo(bodies, iTime); initializeCSVFile("simulation_data.csv");}
+
 		if (loopCounter%resultSteps==0)
 		{
 			// write model results
 			writeBodies(bodies,iTime);
 
 			// update terminal
 			updateTerminal(bodies,iTime);
+
+			writeCSVEnergyFile(bodies,iTime);
 		}
 	}
+
+	void printElapsedTime() {
+		// hours to minutes and seconds
+		std::chrono::duration<double> elapsed_seconds = std::chrono::system_clock::now() - ModelSetup::getInitialSimulationTime();
+		auto hours = std::chrono::duration_cast<std::chrono::hours>(elapsed_seconds);
+		auto minutes = std::chrono::duration_cast<std::chrono::minutes>(elapsed_seconds) - hours;
+		double seconds = elapsed_seconds.count() - (hours.count() * 3600 + minutes.count() * 60);
+		std::cout << "\nElapsed time: " << hours.count() << " h, " << minutes.count() << " m, " << std::fixed << std::setprecision(2) << seconds << " s" << std::endl;
+		farewellScreen();
+	}
 }