More tweaks to progress bar and defaults

MintonGroup · Nov 20, 2022 · e51926d · e51926d
1 parent b5e0f9b
commit e51926d
Show file tree

Hide file tree

Showing 5 changed files with 973 additions and 13 deletions.
diff --git a/examples/Basic_Simulation/run_simulation.ipynb b/examples/Basic_Simulation/run_simulation.ipynb
@@ -42,7 +42,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "id": "ec7452d6-4c9b-4df3-acc0-b11c32264b91",
    "metadata": {},
    "outputs": [
@@ -66,7 +66,19 @@
       "\n",
       "\n",
       "\n",
-      "[===/                                                                            ] Time =  3.00000E+01 of  1.00000E+03\r"
+      "[======/                                                                         ] Time =  6.50000E+01 of  1.00000E+03\r"
+     ]
+    },
+    {
+     "ename": "KeyboardInterrupt",
+     "evalue": "",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mKeyboardInterrupt\u001b[0m                         Traceback (most recent call last)",
+      "\u001b[0;32m/tmp/ipykernel_62265/187458869.py\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0msim\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mrun\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
+      "\u001b[0;32m~/git_debug/swiftest/python/swiftest/swiftest/simulation_class.py\u001b[0m in \u001b[0;36mrun\u001b[0;34m(self, **kwargs)\u001b[0m\n\u001b[1;32m    404\u001b[0m                               \u001b[0menv\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0menv\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    405\u001b[0m                               universal_newlines=True) as p:\n\u001b[0;32m--> 406\u001b[0;31m             \u001b[0;32mfor\u001b[0m \u001b[0mline\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mp\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mstdout\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m    407\u001b[0m                 \u001b[0;32mif\u001b[0m \u001b[0;34m'['\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mline\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    408\u001b[0m                     \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mline\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mreplace\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'\\n'\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0;34m'\\r'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mend\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m''\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;31mKeyboardInterrupt\u001b[0m: "
      ]
     }
    ],

diff --git a/examples/helio_gr_test/grsim/param.gr.in b/examples/helio_gr_test/grsim/param.gr.in
@@ -0,0 +1,35 @@
+! VERSION        Swiftest input file
+T0               0.0
+TSTART           0.0
+TSTOP            1000.0
+DT               0.005
+ISTEP_OUT        2000
+ISTEP_DUMP       2000
+NC_IN            init_cond.nc
+IN_TYPE          NETCDF_DOUBLE
+IN_FORM          EL
+BIN_OUT          bin.gr.nc
+OUT_FORM         XVEL
+OUT_TYPE         NETCDF_DOUBLE
+OUT_STAT         REPLACE
+CHK_QMIN         0.004650467260962157
+CHK_RMIN         0.004650467260962157
+CHK_RMAX         10000.0
+CHK_EJECT        10000.0
+CHK_QMIN_COORD   HELIO
+CHK_QMIN_RANGE   0.004650467260962157 10000.0
+MU2KG            1.988409870698051e+30
+TU2S             31557600.0
+DU2M             149597870700.0
+FRAGMENTATION    NO
+RESTART          NO
+CHK_CLOSE        YES
+GR               YES
+ROTATION         NO
+ENERGY           NO
+EXTRA_FORCE      NO
+BIG_DISCARD      NO
+RHILL_PRESENT    NO
+INTERACTION_LOOPS TRIANGULAR
+ENCOUNTER_CHECK  TRIANGULAR
+TIDES            NO
diff --git a/examples/helio_gr_test/nogrsim/param.nogr.in b/examples/helio_gr_test/nogrsim/param.nogr.in
@@ -0,0 +1,35 @@
+! VERSION        Swiftest input file
+T0               0.0
+TSTART           0.0
+TSTOP            1000.0
+DT               0.005
+ISTEP_OUT        2000
+ISTEP_DUMP       2000
+NC_IN            init_cond.nc
+IN_TYPE          NETCDF_DOUBLE
+IN_FORM          EL
+BIN_OUT          bin.nogr.nc
+OUT_FORM         XVEL
+OUT_TYPE         NETCDF_DOUBLE
+OUT_STAT         REPLACE
+CHK_QMIN         0.004650467260962157
+CHK_RMIN         0.004650467260962157
+CHK_RMAX         10000.0
+CHK_EJECT        10000.0
+CHK_QMIN_COORD   HELIO
+CHK_QMIN_RANGE   0.004650467260962157 10000.0
+MU2KG            1.988409870698051e+30
+TU2S             31557600.0
+DU2M             149597870700.0
+FRAGMENTATION    NO
+RESTART          NO
+CHK_CLOSE        YES
+GR               NO
+ROTATION         NO
+ENERGY           NO
+EXTRA_FORCE      NO
+BIG_DISCARD      NO
+RHILL_PRESENT    NO
+INTERACTION_LOOPS TRIANGULAR
+ENCOUNTER_CHECK  TRIANGULAR
+TIDES            NO