Commit 9345a435 authored by Toth's avatar Toth
Browse files

Clean up merge attempt

parent 37a35374
......@@ -65,7 +65,6 @@ T UseFieldLineThreads
200 nPointThreadMax
2.0e-3 DsThreadMin
<<<<<<< HEAD:Events/CR2209/AWSoM_AWSoMR_comp_06Oct2020/
T UseBody
1.0 rBody
......@@ -85,13 +84,10 @@ util/DATAREAD/srcMagnetogram directory of SWMF.
GONG magnetograms are obtained from
radiative_cooling StringTest
>>>>>>> No need for #BODY commands as long as the new code is used:Param/
B0 NameTable
load NameCommand
SC/fdips_bxyz.out NameFile
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment