@@ -179,6 +179,15 @@ void Input::ParseCommandLine(int argc, char **argv) {
       this->inputFileName = std::string(argv[i]);
     } else if(std::string(argv[i]) == "-autotune") {
       this->tuningRequested = true;
+    } else if(std::string(argv[i]) == "-maxcycles") {
+      if((i+1)>= argc) {
+        IDEFIX_ERROR("-maxcycles requires an additional integer parameter");
+      } else if(std::isdigit(argv[i+1][0]) == 0) {
+        // next argiment is another parameter (does not start with a number)
+        IDEFIX_ERROR("-maxcycles requires an additional integer paramater");
+      }
+      this->maxCycles = std::stoi(std::string(argv[++i]));
+      inputParameters["CommandLine"]["maxCycles"].push_back(std::to_string(maxCycles));
     } else {
       msg << "Unknown option " << argv[i];
       IDEFIX_ERROR(msg);
 
@@ -49,6 +49,8 @@ class Input {
 
   bool tuningRequested{false};        //< whether the user has asked for loop-tuning
 
+  int maxCycles{-1};                   //< whether we should perform a maximum number of cycles
+
  private:
   std::string inputFileName;
   IdefixInputContainer  inputParameters;
 
@@ -127,10 +127,16 @@ int main( int argc, char* argv[] ) {
       Tint.Cycle(data);
       output.CheckForWrites(data);
       if(input.CheckForAbort() || Tint.CheckForMaxRuntime() ) {
-        idfx::cout << "Main: Saving current state and aborting calculation" << std::endl;
+        idfx::cout << "Main: Saving current state and aborting calculation." << std::endl;
         output.ForceWrite(data);
         break;
       }
+      if(input.maxCycles>=0) {
+        if(Tint.GetNCycles() >= input.maxCycles) {
+          idfx::cout << "Main: Reached maximum number of integration cycles." << std::endl;
+          break;
+        }
+      }
     }
 
     int n_days{0}, n_hours{0}, n_minutes{0}, n_seconds{0};
@@ -144,7 +150,7 @@ int main( int argc, char* argv[] ) {
     n_seconds = divres.rem;
 
     double tintegration = timer.seconds() / grid.np_int[IDIR] / grid.np_int[JDIR]
-                            / grid.np_int[KDIR] / Tint.getNcycles();
+                            / grid.np_int[KDIR] / Tint.GetNCycles();
 
     idfx::cout << "Main: Reached t=" << data.t << std::endl;
     idfx::cout << "Main: Completed in ";
@@ -174,8 +180,8 @@ int main( int argc, char* argv[] ) {
       idfx::cout << "s";
     }
     idfx::cout << " ";
-    idfx::cout << "and " << Tint.getNcycles() << " cycle";
-    if (Tint.getNcycles() != 1) {
+    idfx::cout << "and " << Tint.GetNCycles() << " cycle";
+    if (Tint.GetNCycles() != 1) {
       idfx::cout << "s";
     }
     idfx::cout << std::endl;
 
@@ -337,7 +337,7 @@ void TimeIntegrator::Cycle(DataBlock &data) {
 
 
 
-int64_t TimeIntegrator::getNcycles() {
+int64_t TimeIntegrator::GetNCycles() {
   return(ncycles);
 }
 
 
@@ -16,7 +16,7 @@
 
 class TimeIntegrator {
  public:
-  int64_t getNcycles();   // Get current number of cycles
+  int64_t GetNCycles();   // Get current number of cycles
 
   // Constructor from input and given datablock
   TimeIntegrator(Input &, DataBlock &);
 
@@ -41,7 +41,7 @@ double testLoopType(DataBlock &data, Setup &setup, Input &input,
   }
 
   double tintegration = timer.seconds() / data.mygrid->np_int[IDIR] / data.mygrid->np_int[JDIR]
-                            / data.mygrid->np_int[KDIR] / tint.getNcycles();
+                            / data.mygrid->np_int[KDIR] / tint.GetNCycles();
 
   //idfx::cout << "Perfs are " << 1/tintegration << " cell updates/second" << std::endl;
Original file line number	Diff line number	Diff line change
@@ -337,7 +337,7 @@ void TimeIntegrator::Cycle(DataBlock &data) {
337	337
338	338
339	339
340		- int64_t TimeIntegrator::getNcycles() {
	340	+ int64_t TimeIntegrator::GetNCycles() {
341	341	return(ncycles);
342	342	}
343	343
Original file line number	Diff line number	Diff line change
@@ -41,7 +41,7 @@ double testLoopType(DataBlock &data, Setup &setup, Input &input,
41	41	}
42	42
43	43	double tintegration = timer.seconds() / data.mygrid->np_int[IDIR] / data.mygrid->np_int[JDIR]
44		- / data.mygrid->np_int[KDIR] / tint.getNcycles();
	44	+ / data.mygrid->np_int[KDIR] / tint.GetNCycles();
45	45
46	46	//idfx::cout << "Perfs are " << 1/tintegration << " cell updates/second" << std::endl;
47	47