Allow more failures

Author: aaronjridley

src/read_input_file.cpp

@@ -31,74 +31,72 @@ bool Inputs::read_inputs_json(Times &time) {
   isOk = set_verbose(settings);
 
   try {
-
     // Then read in user perturbations on those defaults:
     user_inputs = read_json("aether.json");
-    isOk = set_verbose(user_inputs);
-
-    // Read in a restart file also if user specified it.
-    //   - Here we merge the restart inputs with the defaults inputs
-    //   - This is BEFORE the user inputs are merged!!!
-
-    if (user_inputs.contains("Restart")) {
-      if (user_inputs["Restart"].contains("do")) {
-        if (user_inputs["Restart"]["do"]) {
-          std::string restart_file = get_setting_str("Restart", "InDir");
-          restart_file = restart_file + "/settings.json";
-          json restart_inputs;
-          restart_inputs = read_json(restart_file);
-          // This forces the logfile to append.  User can override
-          // if they really want:
-          restart_inputs["Logfile"]["append"] = true;
-          settings.merge_patch(restart_inputs);
-        }
+  } catch (...) {
+    report.error("Error in reading inputs!");
+    isOk = false;
+  }
+
+  isOk = set_verbose(user_inputs);
+
+  // Read in a restart file also if user specified it.
+  //   - Here we merge the restart inputs with the defaults inputs
+  //   - This is BEFORE the user inputs are merged!!!
+  if (user_inputs.contains("Restart")) {
+    if (user_inputs["Restart"].contains("do")) {
+      if (user_inputs["Restart"]["do"]) {
+        std::string restart_file = get_setting_str("Restart", "InDir");
+        restart_file = restart_file + "/settings.json";
+        json restart_inputs;
+        restart_inputs = read_json(restart_file);
+        // This forces the logfile to append.  User can override
+        // if they really want:
+        restart_inputs["Logfile"]["append"] = true;
+        settings.merge_patch(restart_inputs);
       }
     }
+  }
 
-    // Merge the defaults/restart settings with the user provided
-    // settings, with the default/restart settings being the default:
-    settings.merge_patch(user_inputs);
-
-    //change planet file to the one specified on aether.json:
-    if (isOk)
-      settings["PlanetSpeciesFile"] = get_setting_str("Planet", "file");
+  // Merge the defaults/restart settings with the user provided
+  // settings, with the default/restart settings being the default:
+  settings.merge_patch(user_inputs);
 
-    std::string planet_filename = get_setting_str("PlanetSpeciesFile");
-    report.print(1, "Using planet file : " + planet_filename);
+  //change planet file to the one specified on aether.json:
+  if (isOk)
+    settings["PlanetSpeciesFile"] = get_setting_str("Planet", "file");
 
-    // Debug Stuff:
-    if (isOk)
-      report.set_verbose(get_setting_int("Debug", "iVerbose"));
+  std::string planet_filename = get_setting_str("PlanetSpeciesFile");
+  report.print(1, "Using planet file : " + planet_filename);
 
-    if (isOk)
-      report.set_DefaultVerbose(get_setting_int("Debug", "iVerbose"));
+  // Debug Stuff:
+  if (isOk)
+    report.set_verbose(get_setting_int("Debug", "iVerbose"));
 
-    if (isOk)
-      report.set_doInheritVerbose(get_setting_bool("Debug", "doInheritVerbose"));
+  if (isOk)
+    report.set_DefaultVerbose(get_setting_int("Debug", "iVerbose"));
 
-    if (isOk)
-      report.set_timing_depth(get_setting_int("Debug", "iTimingDepth"));
+  if (isOk)
+    report.set_doInheritVerbose(get_setting_bool("Debug", "doInheritVerbose"));
 
-    if (isOk)
-      report.set_timing_percent(get_setting_float("Debug", "TimingPercent"));
+  if (isOk)
+    report.set_timing_depth(get_setting_int("Debug", "iTimingDepth"));
 
-    if (isOk)
-      report.set_iProc(get_setting_int("Debug", "iProc"));
+  if (isOk)
+    report.set_timing_percent(get_setting_float("Debug", "TimingPercent"));
 
-    for (auto &item : settings["Debug"]["iFunctionVerbose"].items())
-      report.set_FunctionVerbose(item.key(), item.value());
+  if (isOk)
+    report.set_iProc(get_setting_int("Debug", "iProc"));
 
-    // Capture time information:
-    if (isOk)
-      time.set_times(get_setting_timearr("StartTime"));
+  for (auto &item : settings["Debug"]["iFunctionVerbose"].items())
+    report.set_FunctionVerbose(item.key(), item.value());
 
-    if (isOk)
-      time.set_end_time(get_setting_timearr("EndTime"));
+  // Capture time information:
+  if (isOk)
+    time.set_times(get_setting_timearr("StartTime"));
 
-  } catch (...) {
-    report.error("Error in reading inputs!");
-    isOk = false;
-  }
+  if (isOk)
+    time.set_end_time(get_setting_timearr("EndTime"));
 
   return isOk;
 }