From e9dc3bfb33c3e0c80f3ff3e0070517ecfac8a91e Mon Sep 17 00:00:00 2001 From: David Minton Date: Fri, 27 Aug 2021 07:08:09 -0400 Subject: [PATCH] Updated the WHM_GR test to use new features: NetCDF, EL inputs, and XVEL outputs --- examples/whm_gr_test/init_cond.py | 10 ++++-- examples/whm_gr_test/param.swifter.in | 2 +- examples/whm_gr_test/param.swiftest.in | 13 ++++--- examples/whm_gr_test/pl.swifter.in | 50 +++++++++++++------------- examples/whm_gr_test/pl.swiftest.in | 48 ++++++++++++------------- 5 files changed, 63 insertions(+), 60 deletions(-) diff --git a/examples/whm_gr_test/init_cond.py b/examples/whm_gr_test/init_cond.py index 09feca135..edb4f3db3 100755 --- a/examples/whm_gr_test/init_cond.py +++ b/examples/whm_gr_test/init_cond.py @@ -5,7 +5,7 @@ sim.param['PL_IN'] = "pl.swiftest.in" sim.param['TP_IN'] = "tp.swiftest.in" sim.param['CB_IN'] = "cb.swiftest.in" -sim.param['BIN_OUT'] = "bin.swiftest.dat" +sim.param['BIN_OUT'] = "bin.swiftest.nc" sim.param['ENC_OUT'] = "enc.swiftest.dat" sim.param['MU2KG'] = swiftest.MSun @@ -22,8 +22,10 @@ sim.param['CHK_RMIN'] = swiftest.RSun / swiftest.AU2M sim.param['CHK_RMAX'] = 1000.0 sim.param['CHK_EJECT'] = 1000.0 -sim.param['OUT_FORM'] = "EL" sim.param['OUT_STAT'] = "UNKNOWN" +sim.param['IN_FORM'] = "EL" +sim.param['OUT_FORM'] = "XVEL" +sim.param['OUT_TYPE'] = "NETCDF_DOUBLE" sim.param['RHILL_PRESENT'] = "YES" sim.param['GR'] = 'YES' @@ -40,13 +42,15 @@ } for name, id in bodyid.items(): - sim.add(name, idval=id) + sim.add(name) sim.save("param.swiftest.in") sim.param['PL_IN'] = "pl.swifter.in" sim.param['TP_IN'] = "tp.swifter.in" sim.param['BIN_OUT'] = "bin.swifter.dat" sim.param['ENC_OUT'] = "enc.swifter.dat" +sim.param['OUT_FORM'] = "EL" +sim.param['OUT_TYPE'] = "REAL8" sim.save("param.swifter.in", codename="Swifter") diff --git a/examples/whm_gr_test/param.swifter.in b/examples/whm_gr_test/param.swifter.in index f1574759a..105579a82 100644 --- a/examples/whm_gr_test/param.swifter.in +++ b/examples/whm_gr_test/param.swifter.in @@ -11,13 +11,13 @@ IN_TYPE ASCII PL_IN pl.swifter.in TP_IN tp.swifter.in BIN_OUT bin.swifter.dat -ENC_OUT enc.swifter.dat CHK_QMIN 0.004650467260962157 CHK_RMIN 0.004650467260962157 CHK_RMAX 1000.0 CHK_EJECT 1000.0 CHK_QMIN_COORD HELIO CHK_QMIN_RANGE 0.004650467260962157 1000.0 +ENC_OUT enc.swifter.dat EXTRA_FORCE NO BIG_DISCARD NO CHK_CLOSE YES diff --git a/examples/whm_gr_test/param.swiftest.in b/examples/whm_gr_test/param.swiftest.in index 00b2c2546..d7f584790 100644 --- a/examples/whm_gr_test/param.swiftest.in +++ b/examples/whm_gr_test/param.swiftest.in @@ -4,15 +4,14 @@ TSTOP 1000.0 DT 0.0006844626967830253 ISTEP_OUT 1461 ISTEP_DUMP 1461 -OUT_FORM EL -OUT_TYPE REAL8 +OUT_FORM XVEL +OUT_TYPE NETCDF_DOUBLE OUT_STAT UNKNOWN IN_TYPE ASCII PL_IN pl.swiftest.in TP_IN tp.swiftest.in CB_IN cb.swiftest.in -BIN_OUT bin.swiftest.dat -ENC_OUT enc.swiftest.dat +BIN_OUT bin.swiftest.nc CHK_QMIN 0.004650467260962157 CHK_RMIN 0.004650467260962157 CHK_RMAX 1000.0 @@ -22,7 +21,10 @@ CHK_QMIN_RANGE 0.004650467260962157 1000.0 MU2KG 1.988409870698051e+30 TU2S 31557600.0 DU2M 149597870700.0 +IN_FORM EL +ENC_OUT enc.swiftest.dat EXTRA_FORCE NO +DISCARD_OUT discard.out BIG_DISCARD NO CHK_CLOSE YES RHILL_PRESENT YES @@ -31,6 +33,3 @@ ROTATION NO TIDES NO ENERGY NO GR YES -YARKOVSKY NO -YORP NO -MTINY 0.0 diff --git a/examples/whm_gr_test/pl.swifter.in b/examples/whm_gr_test/pl.swifter.in index 0b02f19c8..0d8d216fb 100644 --- a/examples/whm_gr_test/pl.swifter.in +++ b/examples/whm_gr_test/pl.swifter.in @@ -1,36 +1,36 @@ 9 -0 39.476926408897625196 +1 39.476926408897626 0.0 0.0 0.0 0.0 0.0 0.0 -1 6.5537098095653139645e-06 0.001475124456355905224 +2 6.553709809565314146e-06 0.0014751261514880139061 1.6306381826061645943e-05 --0.30949970210807342674 0.1619004125820537876 0.041620272188990829754 --6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286 -2 9.663313399581537916e-05 0.006759069616556246028 +-0.29510017042975300594 -0.34346884022084378518 -0.000997917547895216684 +5.709185893355676925 -6.2220892824670268354 -1.0321515701207669188 +3 9.6633133995815381836e-05 0.006759061578633710828 4.0453784346544178454e-05 --0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906 -4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309 -3 0.000120026935827952453094 0.010044908171483009529 +-0.21096294566811030213 -0.6945147553261317164 0.0026420019351886940041 +7.0187176732445560167 -2.1783670470162428854 -0.43491289164169576724 +4 0.000120026935827952456416 0.010044949983771724966 4.25875607065040958e-05 -0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05 -4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448 -4 1.2739802010675941456e-05 0.0072466797341124641736 +0.905522725638602366 -0.44829515638659761523 1.8122901980659660508e-05 +2.685845700565266851 5.6080546137104218133 -0.00027833838024725729542 +5 1.2739802010675941808e-05 0.0072465915674003790445 2.265740805092889601e-05 --1.617661473167097963 0.38314370807747849534 0.04771055403546069218 --0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221 -5 0.037692251088985676735 0.35527079166215922855 +-1.6511945936824949932 0.1180803833522415941 0.042978148735422203042 +-0.17443328105136805607 -4.661619009141641736 -0.09341597039948347882 +6 0.03769225108898567778 0.3552713110772063853 0.00046732617030490929307 -4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336 -1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833 -6 0.011285899820091272997 0.43765832419088212185 +4.2381319671740662614 -2.694827110197309139 -0.08362807329786287047 +1.44742540330701551 2.4581907268113588696 -0.042593445938391914576 +7 0.01128589982009127331 0.4376635990332856823 0.00038925687730393611812 -6.39471595410062843 -7.621162747287802297 -0.121992225877669294154 -1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155 -7 0.0017236589478267730203 0.46960112247450473807 +6.4776155764849425722 -7.5454781609219372385 -0.12660625214421539209 +1.4343694668413992401 1.3251694474665614901 -0.08010594537316981756 +8 0.001723658947826773068 0.46966224198242572768 0.00016953449859497231466 -14.793135356927480828 13.074218343364380601 -0.14311846037737518955 --0.9605086875596024784 1.0118431725941020164 0.016148779866732710198 -8 0.0020336100526728302319 0.78136567314580814177 +14.737783583010530819 13.132284780084109599 -0.14218874866247160904 +-0.96494157148906816704 1.0080364706941240677 0.016191990849809560611 +9 0.0020336100526728302882 0.7814394516095526881 0.000164587904124493665 -29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874 -0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838 +29.578253698940308425 -4.488584904681241383 -0.58928426126360722304 +0.16609282485651713797 1.143247554888599065 -0.027336661118935745503 diff --git a/examples/whm_gr_test/pl.swiftest.in b/examples/whm_gr_test/pl.swiftest.in index 84cae57a2..ddb1a7016 100644 --- a/examples/whm_gr_test/pl.swiftest.in +++ b/examples/whm_gr_test/pl.swiftest.in @@ -1,33 +1,33 @@ 8 -1 6.5537098095653139645e-06 0.001475124456355905224 +2 6.553709809565314146e-06 0.0014751261514880139061 1.6306381826061645943e-05 --0.30949970210807342674 0.1619004125820537876 0.041620272188990829754 --6.8742992150644793847 -8.672423996611946485 -0.078109307586001638286 -2 9.663313399581537916e-05 0.006759069616556246028 +0.38709861919270799335 0.20562987442219879397 7.0036598799530471737 +48.303764444546942514 29.187012577257871015 139.02452846395490837 +3 9.6633133995815381836e-05 0.006759061578633710828 4.0453784346544178454e-05 --0.5567137338251560985 -0.46074173273652380134 0.02580196630219121906 -4.6580776303108450487 -5.726444072926637749 -0.3473859047161406309 -3 0.000120026935827952453094 0.010044908171483009529 +0.72332350338494522113 0.0067851993472706276234 3.3945100118236060105 +76.62172575937908903 55.11451498626085055 120.69543184874230235 +4 0.000120026935827952456416 0.010044949983771724966 4.25875607065040958e-05 -0.6978790186886838498 -0.73607603319120218366 3.261671020506711323e-05 -4.4579240279134950613 4.300011122687349501 -0.00022055769049333364448 -4 1.2739802010675941456e-05 0.0072466797341124641736 +1.000022414803547921 0.016679693167334301573 0.002750719340522077977 +175.59912721852418827 287.3487256951211748 232.20474506920808722 +5 1.2739802010675941808e-05 0.0072465915674003790445 2.265740805092889601e-05 --1.617661473167097963 0.38314370807747849534 0.04771055403546069218 --0.98751874613118001086 -4.5371239937302254657 -0.07086074102213555221 -5 0.037692251088985676735 0.35527079166215922855 +1.5237056817307590428 0.09335454089002033495 1.8479086301002540793 +49.490790672135332784 286.7030449733272235 203.56009534652309867 +6 0.03769225108898567778 0.3552713110772063853 0.00046732617030490929307 -4.1527454588897487753 -2.8347492039446908763 -0.081136554176388195336 -1.5225069137843642898 2.4087104911325327961 -0.044067446366273183833 -6 0.011285899820091272997 0.43765832419088212185 +5.203524963998765074 0.048518619089771883313 1.3035691332389880426 +100.516740776557597314 273.38311024861741316 317.57998688455870706 +7 0.01128589982009127331 0.4376635990332856823 0.00038925687730393611812 -6.39471595410062843 -7.621162747287802297 -0.121992225877669294154 -1.4493167787574136286 1.3075474785896286071 -0.08039429377859412155 -7 0.0017236589478267730203 0.46960112247450473807 +9.581861578191695372 0.05220296447788015659 2.4862598063103709123 +113.59526938704850352 335.69019804854252698 225.44748806008931297 +8 0.001723658947826773068 0.46966224198242572768 0.00016953449859497231466 -14.793135356927480828 13.074218343364380601 -0.14311846037737518955 --0.9605086875596024784 1.0118431725941020164 0.016148779866732710198 -8 0.0020336100526728302319 0.78136567314580814177 +19.23638216159032055 0.04433184777155944195 0.7703424893861580136 +74.09557761028084144 95.84993853316392176 235.82773290830229485 +9 0.0020336100526728302882 0.7814394516095526881 0.000164587904124493665 -29.568629894896030663 -4.5543028991960081697 -0.58771107137394917874 -0.16867624969736024011 1.1427992197933557251 -0.027387722828706092838 +30.289653279202511271 0.013458737599393380546 1.769000156955224945 +131.74519418988560915 245.79890439350270981 334.51418242279709148