diff --git a/Makefile b/Makefile index 50e5f1d89..c3cce41c2 100644 --- a/Makefile +++ b/Makefile @@ -47,13 +47,13 @@ SWIFTEST_MODULES = swiftest_globals.f90 \ swiftest_operators.f90 \ lambda_function.f90\ - walltime_classes.f90 \ swiftest_classes.f90 \ fraggle_classes.f90 \ whm_classes.f90 \ rmvs_classes.f90 \ helio_classes.f90 \ symba_classes.f90 \ + walltime_classes.f90 \ swiftest.f90 @@ -93,11 +93,6 @@ lib: ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ ln -s $(SWIFTEST_HOME)/Makefile .; \ make libdir - cd $(SWIFTEST_HOME)/src/drift; \ - rm -f Makefile.Defines Makefile; \ - ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ - ln -s $(SWIFTEST_HOME)/Makefile .; \ - make libdir cd $(SWIFTEST_HOME)/src/gr; \ rm -f Makefile.Defines Makefile; \ ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ @@ -128,11 +123,6 @@ lib: ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ ln -s $(SWIFTEST_HOME)/Makefile .; \ make libdir - cd $(SWIFTEST_HOME)/src/orbel; \ - rm -f Makefile.Defines Makefile; \ - ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ - ln -s $(SWIFTEST_HOME)/Makefile .; \ - make libdir cd $(SWIFTEST_HOME)/src/setup; \ rm -f Makefile.Defines Makefile; \ ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ @@ -168,6 +158,11 @@ lib: ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ ln -s $(SWIFTEST_HOME)/Makefile .; \ make libdir + cd $(SWIFTEST_HOME)/src/walltime; \ + rm -f Makefile.Defines Makefile; \ + ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ + ln -s $(SWIFTEST_HOME)/Makefile .; \ + make libdir fast: cd $(SWIFTEST_HOME)/src/fraggle; \ @@ -182,6 +177,24 @@ fast: ln -s $(SWIFTEST_HOME)/Makefile .; \ make fastdir + cd $(SWIFTEST_HOME)/src/orbel; \ + rm -f Makefile.Defines Makefile; \ + ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ + ln -s $(SWIFTEST_HOME)/Makefile .; \ + make fastdir + + cd $(SWIFTEST_HOME)/src/drift; \ + rm -f Makefile.Defines Makefile; \ + ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \ + ln -s $(SWIFTEST_HOME)/Makefile .; \ + make fastdir + + cd $(SWIFTEST_HOME)/src/helio; \ + $(FORTRAN) $(FFASTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c helio_drift.f90; \ + $(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \ + $(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \ + rm -f *.o *.smod + cd $(SWIFTEST_HOME)/src/rmvs; \ $(FORTRAN) $(FFASTFLAGS) -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include $(IMKL) -c rmvs_encounter_check.f90; \ $(AR) rv $(SWIFTEST_HOME)/lib/libswiftest.a *.o *.smod; \ @@ -206,7 +219,6 @@ fastdir: $(INSTALL_DATA) *.smod $(SWIFTEST_HOME)/include; \ rm -f *.o *.smod - drivers: cd $(SWIFTEST_HOME)/src/main; \ rm -f Makefile.Defines Makefile; \ @@ -237,6 +249,7 @@ clean: cd $(SWIFTEST_HOME)/src/tides; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/user; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/util; rm -f Makefile.Defines Makefile *.gc* + cd $(SWIFTEST_HOME)/src/walltime; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/src/whm; rm -f Makefile.Defines Makefile *.gc* cd $(SWIFTEST_HOME)/bin; rm -f swiftest_* cd $(SWIFTEST_HOME)/bin; rm -f tool_* diff --git a/Makefile.Defines b/Makefile.Defines index 9e06d56ba..16ce3afc3 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -67,15 +67,15 @@ GWARNINGS = -Wall -Warray-bounds -Wimplicit-interface -Wextra -Warray-temporari GPRODUCTION = -O2 -ffree-line-length-none $(GPAR) -#FFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) -#FFASTFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) -FFLAGS = $(IPRODUCTION) $(STRICTREAL) -FFASTFLAGS = $(IPRODUCTION) -fp-model fast +#FFLAGS = $(IDEBUG) #$(SIMDVEC) $(PAR) +#FFASTFLAGS = $(IDEBUG) #$(SIMDVEC) $(PAR) +FFLAGS = $(IPRODUCTION) $(STRICTREAL) #$(ADVIXE_FLAGS) +FFASTFLAGS = $(IPRODUCTION) -fp-model fast #$(ADVIXE_FLAGS) FORTRAN = ifort AR = xiar #FORTRAN = gfortran -#FFLAGS = $(GDEBUG) $(GMEM) $(GPAR) +#FFLAGS = $(GDEBUG) # $(GMEM) $(GPAR) #FFLAGS = $(GPRODUCTION) -g -fbacktrace #-fcheck=all #-Wall AR = ar # DO NOT include in CFLAGS the "-c" option to compile object only # this is done explicitly as needed in the Makefile diff --git a/docs/index.html b/docs/index.html index d8ecd89b6..90d0813f7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -184,35 +184,35 @@
Input format code ("XV" or "EL")
Error code
Error code: returns 0 if the read is successful
+ +| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(fraggle_colliders), | +intent(inout) | ++ + | :: | +colliders | Fraggle colliders object containing the two-body equivalent values of the colliding bodies |
+
+|
| class(swiftest_nbody_system), | +intent(inout) | ++ + | :: | +system | Swiftest nbody system object |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current run configuration parameters |
+
+|
| logical, | +intent(out) | ++ + | :: | +lfailure | Answers the question: Should this have been a merger instead? |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(in) | ++ + | :: | +frag | + + |
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| character(len=*), | +intent(in) | ++ + | :: | +message | + + |
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(swiftest_pl), | +intent(in) | ++ + | :: | +pl | Swiftest massive body object (only the new bodies generated in a collision) |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current swiftest run configuration parameters |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_colliders), | +intent(in) | ++ + | :: | +colliders | + + | |
| class(fraggle_fragments), | +intent(in) | ++ + | :: | +frag | + + |
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | + + |
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(swiftest_nbody_system), | +intent(inout) | ++ + | :: | +system | Swiftest nbody system object |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current run configuration parameters |
+
+|
| real(kind=DP), | +intent(in) | ++ + | :: | +t | Current simulation time |
+
+|
| logical, | +intent(in) | ++ + | :: | +lbeg | Optional argument that determines whether or not this is the beginning or end of the step |
+
+
The following interfaces are placeholders intended to satisfy the required abstract methods given by the parent class
+ +| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(swiftest_nbody_system), | +intent(inout) | ++ + | :: | +system | Swiftest nbody system objec |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current run configuration parameters |
+
+|
| real(kind=DP), | +intent(in) | ++ + | :: | +t | Current time |
+
+|
| real(kind=DP), | +intent(in) | ++ + | :: | +dt | Stepsize |
+
+|
| logical, | +intent(in) | ++ + | :: | +lbeg | Logical flag indicating whether this is the beginning of the half step or not. |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Helio massive body particle object |
+
+|
| class(swiftest_nbody_system), | +intent(inout) | ++ + | :: | +system | Swiftest nboody system |
+
+|
| class(swiftest_parameters), | +intent(inout) | ++ + | :: | +param | Current run configuration parameters |
+
+|
| real(kind=DP), | +intent(in) | ++ + | :: | +t | Current simulation time |
+
+|
| real(kind=DP), | +intent(in) | ++ + | :: | +dt | Stepsiz |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_colliders), | +intent(inout) | ++ + | :: | +self | Fraggle colliders object |
+
+|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +frag | Fraggle fragment system object |
+
+|
| class(swiftest_nbody_system), | +intent(in) | ++ + | :: | +system | Swiftest nbody system object |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current Swiftest run configuration parameters |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(fraggle_colliders), | +intent(inout) | ++ + | :: | +colliders | Fraggle collider system object |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(fraggle_colliders), | +intent(inout) | ++ + | :: | +colliders | Fraggle collider system object |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(fraggle_colliders), | +intent(inout) | ++ + | :: | +colliders | Fraggle collider system object |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current Swiftest run configuration parameters |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(fraggle_colliders), | +intent(inout) | ++ + | :: | +colliders | Fraggle collider system object |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| class(fraggle_colliders), | +intent(inout) | ++ + | :: | +colliders | Fraggle collider system object |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | Fraggle fragment system object |
+
+|
| integer(kind=I4B), | +intent(in) | ++ + | :: | +n | Number of fragments |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current swiftest run configuration parameters |
+
+
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(inout) | ++ + | :: | +self | + + |
| Type | +Intent | Optional | +Attributes | Name | ||
|---|---|---|---|---|---|---|
| class(fraggle_fragments), | +intent(in) | ++ + | :: | +frag | Fraggle fragment system object |
+
+|
| class(fraggle_colliders), | +intent(in) | ++ + | :: | +colliders | Fraggle collider system object |
+
+|
| class(swiftest_nbody_system), | +intent(inout) | ++ + | :: | +system | Swiftest nbody system object |
+
+|
| class(swiftest_parameters), | +intent(in) | ++ + | :: | +param | Current swiftest run configuration parameters |
+
+
Heliocentric position vector
Swiftestcentric position vector
Heliocentric velocity vector
Swiftestcentric velocity vector