Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Updated examples and Makefile for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Jun 16, 2021
1 parent e12fa07 commit 42575ee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 58 deletions.
6 changes: 3 additions & 3 deletions Makefile.Defines
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vec -vecabi=cmdtarget -simd -shared-intel
VTUNE_FLAGS = -g -O2 -vec -simd -shared-intel -qopenmp -debug inline-debug-info -parallel-source-info=2 -parallel -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -qopenmp -fp-model no-except -mp1 -xhost -traceback
#Be sure to set the environment variable KMP_FORKJOIN_FRAMES=1 for OpenMP debuging in vtune

IDEBUG = -O0 -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin
IDEBUG = -O0 -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin -init=snan,arrays

STRICTREAL = -mp1 -fp-model strict -prec-div -prec-sqrt -assume protect-parens
SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -prec-div -prec-sqrt -assume protect-parens
Expand All @@ -69,8 +69,8 @@ GMEM = -fsanitize=undefined -fsanitize=address -fsanitize=leak
GWARNINGS = -Wall -Warray-bounds -Wimplicit-interface -Wextra -Warray-temporaries

#FFLAGS = -init=snan,arrays -traceback -no-wrap-margin -O3 -g -CB -nogen-interfaces -no-pie -fp-speculation=safe $(SIMDVEC) $(PAR) #$(HEAPARR)
#FFLAGS = $(IDEBUG) $(HEAPARR)
FFLAGS = -init=snan,arrays -no-wrap-margin -fp-model strict -fp-model no-except -traceback -g $(OPTIMIZE) -O3 $(SIMDVEC) $(PAR) $(HEAPARR)
FFLAGS = $(IDEBUG) $(HEAPARR)
#FFLAGS = -init=snan,arrays -no-wrap-margin -fp-model strict -fp-model no-except -traceback -g $(OPTIMIZE) -O3 $(SIMDVEC) $(PAR) $(HEAPARR)
FORTRAN = ifort
#AR = xiar

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
GMSun = np.longdouble(GMSunSI / (DU2M**3 / TU2S**2))

# Solar oblatenes values: From Mecheri et al. (2004), using Corbard (b) 2002 values (Table II)
J2 = np.longdouble(2.198e-7) * (Rsun / DU2M)**2
J4 = np.longdouble(-4.805e-9) * (Rsun / DU2M)**4
J2 = 0.0 #np.longdouble(2.198e-7) * (Rsun / DU2M)**2
J4 = 0.0 #np.longdouble(-4.805e-9) * (Rsun / DU2M)**4

npl = 9
ntp = 2 * npl
Expand Down
55 changes: 2 additions & 53 deletions examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in
Original file line number Diff line number Diff line change
@@ -1,55 +1,4 @@
18
101
0.008082903154349985 -0.4615820430265793 -0.03846017738329229
0.9734336359718915 0.001934639213990692 -0.001904656977422976
110
0.008036781741686682 -0.46162816443924254 -0.03846017738329229
-0.9284592533307944 0.001934639213990692 -0.001904656977422976
1
102
-0.5115303112484343 0.5031390851942046 0.03642547299277956
2.3040719536228615 -0.01452868630179309 0.0006232072038298823
111
-0.5116447318293788 0.5030246646132601 0.03642547299277956
-2.3325822681319486 -0.01452868630179309 0.0006232072038298823
103
-0.10894183284815118 -1.0098335771038265 4.823302918632528e-05
2.5350192147942225 -0.001910549762056979 3.992660742687128e-08
112
-0.10906228866003023 -1.0099540329157057 4.823302918632528e-05
-2.5013693763428435 -0.001910549762056979 3.992660742687128e-08
104
-1.3428658869178822 0.9778975536820278 0.05343398538723887
1.1170674249808836 -0.01011917844182223 -2.287744801261131e-05
113
-1.34292997174539 0.97783346885452 0.05343398538723887
-1.13249205627167 -0.01011917844182223 -2.287744801261131e-05
105
3.923845092422412 -3.167758871475071 -0.0746147877972047
13.475885385540709 0.006232623300954468 -0.0001300429201057457
114
3.9225232944062176 -3.169080669491265 -0.0746147877972047
-13.466574280262737 0.006232623300954468 -0.0001300429201057457
106
6.186344955150397 -7.803624345449696 -0.110498432926239
8.080901767914629 0.003458637040736611 -0.0002219310939327014
115
6.185243970440136 -7.804725330159957 -0.110498432926239
-8.072768101506659 0.003458637040736611 -0.0002219310939327014
107
14.929337415534302 12.929736493716492 -0.1454099139559955
4.78026282453561 0.002795888198858545 4.391864857782088e-05
116
14.928857899559898 12.929256977742087 -0.1454099139559955
-4.785461940456903 0.002795888198858545 4.391864857782088e-05
108
29.544394452699596 -4.716688841268022 -0.5838030174427992
5.273095244420789 0.00312573757291745 -7.53264045199501e-05
117
29.543928927807162 -4.717154366160452 -0.5838030174427992
-5.272136717178885 0.00312573757291745 -7.53264045199501e-05
109
14.544494696107316 -31.052223962419365 -0.8828000265625595
0.290726330549251 0.0006625916902153526 -0.0009142553677224461
118
14.544472229076623 -31.052246429450054 -0.8828000265625595
-0.2848801753138675 0.0006625916902153526 -0.0009142553677224461
2.3040719536228615 -0.01452868630179309 0.0006232072038298823

0 comments on commit 42575ee

Please sign in to comment.