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 @@

Source Files

-
  • eucl.f90
  • +
  • fraggle_classes.f90
  • -
  • fragmentation.f90
  • +
  • fraggle_generate.f90
  • -
  • gr.f90
  • +
  • fraggle_io.f90
  • -
  • helio_classes.f90
  • +
  • fraggle_placeholder.f90
  • -
  • helio_coord.f90
  • +
  • fraggle_regime.f90
  • -
  • helio_drift.f90
  • +
  • fraggle_set.f90
  • -
  • helio_gr.f90
  • +
  • fraggle_setup.f90
  • -
  • helio_kick.f90
  • +
  • fraggle_util.f90
  • @@ -314,6 +314,26 @@

    Source Files

    + + + + + + + + + + + + + + + + + + + + @@ -343,6 +363,10 @@

    Modules

    @@ -387,6 +417,10 @@

    Procedures

    @@ -219,63 +219,66 @@

    Calls

    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - - - -interface~~symba_fragmentation_casesupercatastrophic~~CallsGraph - - - -interface~symba_fragmentation_casesupercatastrophic - -symba_fragmentation_casesupercatastrophic - - - -proc~symba_fragmentation_casesupercatastrophic - - -symba_fragmentation_casesupercatastrophic + + + +interface~~fraggle_util_vmag_to_vb~~CallsGraph + + + +interface~fraggle_util_vmag_to_vb + +fraggle_util_vmag_to_vb + + + +proc~fraggle_util_vmag_to_vb + + +fraggle_util_vmag_to_vb - - -interface~symba_fragmentation_casesupercatastrophic->proc~symba_fragmentation_casesupercatastrophic - - - - - -fragmentation_initialize - -fragmentation_initialize - - - -proc~symba_fragmentation_casesupercatastrophic->fragmentation_initialize - - - - - -proc~symba_fragmentation_mergeaddsub - - -symba_fragmentation_mergeaddsub + + +interface~fraggle_util_vmag_to_vb->proc~fraggle_util_vmag_to_vb + + + + + +interface~fraggle_util_shift_vector_to_origin + + +fraggle_util_shift_vector_to_origin + + + + + +proc~fraggle_util_vmag_to_vb->interface~fraggle_util_shift_vector_to_origin + + + + + +proc~fraggle_util_shift_vector_to_origin + + +fraggle_util_shift_vector_to_origin - - -proc~symba_fragmentation_casesupercatastrophic->proc~symba_fragmentation_mergeaddsub - - + + +interface~fraggle_util_shift_vector_to_origin->proc~fraggle_util_shift_vector_to_origin + + -
    Help