Optimization

* compile script has been updated
* shell script has been updated
* updated default samples
* double precision everywhere
* extended object name length
* Included -O2 keys in "gfortran" commands in "compile.sh".

Author: idovgalyov-4xxi

README.md

@@ -15,6 +15,25 @@ and answer "yes" for the question about creating sample files.
 
 **Original message by John E. Chambers**
 
+-----------------------------------------------------------------------
+-----------------------------------------------------------------------
+THIS VERSION OF MERCURY6 PACKAGE WAS MODIFIED BY I. DOVGALEV
+TO PROVIDE TRUE DOUBLE PRECISION CALCULATIONS. ALSO, THE INITIAL DATA
+FOR PLANETS IN "big.in" FILE WAS UPDATED (see http://ssd.jpl.nasa.gov).
+**2016-12-05**
+
+[2016-12-08]: Provided length for object names is now 25 (instead of 8
+in older versions). Please take into account.
+
+[2016-12-12]: Compile.sh has been modified. Now to create input data
+files from samples run the compile.sh simply. If you want to use your
+own input data files run compile.sh with key -s
+
+**Please note that if you use other programs to create input data files
+you must keep "fortran" double precision format (e.g. use "d" exponent)**
+
+-----------------------------------------------------------------------
+-----------------------------------------------------------------------
 
                M A N U A L   F O R   T H E   M E R C U R Y   I N T E G R A T O R
                =================================================================

big.in.sample

@@ -2,41 +2,41 @@
 ) Lines beginning with `)' are ignored.
 )---------------------------------------------------------------------
  style (Cartesian, Asteroidal, Cometary) = Cartesian
- epoch (in days) = 2451000.5
-)---------------------------------------------------------------------
- MERCURY    m=1.66013679527193009E-07 r=20.D0 d=5.43
- -3.83966017419175965E-01 -1.76865300855700736E-01  2.07959213998758705E-02
-  5.96286238644834141E-03 -2.43281292146216750E-02 -2.53463209848734695E-03
-  0. 0. 0.
- VENUS      m=2.44783833966454430E-06 r=20.d0 d=5.24
-  6.33469157915745540E-01  3.49855234102151691E-01 -3.17853172088953667E-02
- -9.84258038001823571E-03  1.76183746921837227E-02  8.08822351013463794E-04
-  0. 0. 0.
- EARTHMOO   m=3.04043264264672381E-06 r=20.d0 d=5.52
-  2.42093942183383037E-01 -9.87467766698604366E-01 -4.54276292555233496E-06
-  1.64294055023289365E-02  4.03200725816140870E-03  1.13609607260006795E-08
-  0. 0. 0.
- MARS       m=3.22715144505386530E-07 r=20.d0 d=3.94
-  2.51831018120174499E-01  1.52598983115984788E+00  2.57781137811807781E-02
- -1.32744166042475433E-02  3.46582959610421387E-03  3.98930013246952611E-04
-  0. 0. 0.
- JUPITER    m=9.54791938424326609E-04 r=3.d0 d=1.33
-  4.84143144246472090E+00 -1.16032004402742839E+00 -1.03622044471123109E-01
-  1.66007664274403694E-03  7.69901118419740425E-03 -6.90460016972063023E-05
-  0. 0. 0.
- SATURN     m=2.85885980666130812E-04 r=3.d0 d=0.70
-  8.34336671824457987E+00  4.12479856412430479E+00 -4.03523417114321381E-01
- -2.76742510726862411E-03  4.99852801234917238E-03  2.30417297573763929E-05
-  0. 0. 0.
- URANUS     m=4.36624404335156298E-05 r=3.d0 d=1.30
-  1.28943695621391310E+01 -1.51111514016986312E+01 -2.23307578892655734E-01
-  2.96460137564761618E-03  2.37847173959480950E-03 -2.96589568540237556E-05
-  0. 0. 0.
- NEPTUNE    m=5.15138902046611451E-05 r=3.d0 d=1.76
-  1.53796971148509165E+01 -2.59193146099879641E+01  1.79258772950371181E-01
-  2.68067772490389322E-03  1.62824170038242295E-03 -9.51592254519715870E-05
-  0. 0. 0.
- PLUTO      m=7.39644970414201173E-09 r=3.d0 d=1.1
- -1.15095623952731607E+01 -2.70779438829451422E+01  6.22871533567077229E+00
-  2.97220056963797431E-03 -1.69820233395912967E-03 -6.76798264809371094E-04
-  0. 0. 0.
+ epoch (in days) = 2457724.5D0
+)----------------------------------------------------d or D is not matter--0d0 is possible too
+ MERCURY    m=1.6601367952719304D-07 r=20.D0 d=5.43D0
+  3.067925455119497D-01 -2.695851754307215D-01 -5.017408038016835D-02
+  1.300791785131080D-02  2.245507195129482D-02  6.414809034847098D-04
+  0.D0 0.D0 0.D0  
+ VENUS      m=2.4478383396645447D-06 r=20.d0 d=5.24D0
+  7.248985943229426D-01  2.250842837066930D-02 -4.152252796285734D-02
+ -7.115663662455383D-04  2.012442278126239D-02  3.170051245998433D-04
+  0.D0 0.D0 0.D0
+ EARTHMOO   m=3.0404326462685257D-06 r=20.d0 d=5.52D0
+  3.371149298368602D-01  9.264627375634086D-01 -3.656592330717117D-05
+ -1.644763250008539D-02  5.818900153313822D-03 -1.401742451705546D-07
+  0.D0 0.D0 0.D0
+ MARS       m=3.2271514450538743D-07 r=20.d0 d=3.94D0
+  1.387314349787443D+00 -6.417694205651260D-02 -3.539252627294046D-02
+  1.182433685289971D-03  1.517628652546086D-02  2.890089362707097D-04
+  0.D0 0.D0 0.D0
+ JUPITER    m=9.547919384243222D-04 r=3.d0 d=1.33D0
+ -5.394668400177522D+00 -7.999400608267450D-01  1.240342694780650D-01
+  1.017430886009646D-03 -7.114767972297869D-03  6.788739409026838D-06
+  0.D0 0.D0 0.D0
+ SATURN     m=2.858859806661029D-04 r=3.d0 d=0.70D0
+ -2.023594923525499D+00 -9.836589990338709D+00  2.515230776758679D-01
+  5.160849399720572D-03 -1.147589054910672D-03 -1.852057559666422D-04
+  0.D0 0.D0 0.D0
+ URANUS     m=4.3662440433515637D-05 r=3.d0 d=1.30D0
+  1.838604285828665D+01  7.723267785152875D+00 -2.093835488169170D-01
+ -1.549928077363440D-03  3.435924384648363D-03  3.287752876026161D-05
+  0.D0 0.D0 0.D0
+ NEPTUNE    m=5.151389020535497D-05 r=3.d0 d=1.76D0
+  2.830602595046843D+01 -9.782837959471639D+00 -4.508807468243554D-01
+  1.006779314710060D-03  2.979403494209059D-03 -8.458453553880726D-05
+  0.D0 0.D0 0.D0
+ PLUTO      m=7.407407407407407D-09 r=3.d0 d=1.1D0  
+  9.567892811759823D+00 -3.181011870947866D+01  6.350230130441942D-01
+  3.063970287718061D-03  2.416600270961735D-04 -9.066478029110260D-04
+  0.D0 0.D0 0.D0

clean.sh

@@ -9,7 +9,7 @@ rm *.dmp *.clo *.out *.tmp *.aei
 echo "Delete compiled files? (yes/no)"
 read need_delete
 
-if [ $need_delete = 'yes' ]; then
+if [ $need_delete = 'yes' ] || [ $need_delete = 'y' ]; then
   echo "Compiled files are deleted"
   if [ -e 'close6' ]; then
     rm close6
@@ -25,7 +25,7 @@ fi
 echo "Delete input files? (yes/no)"
 read need_delete_input
 
-if [ $need_delete_input = 'yes' ]; then
+if [ $need_delete_input = 'yes' ] || [ $need_delete_input = 'y' ]; then
   echo "Deleting input files"
   rm *.in
 fi

close.in.sample

@@ -7,7 +7,7 @@
  ce.out
 )---------------------------------------------------------------------
  express time in days or years = years
- express time relative to integration start time = yes
+ express time relative to integration start time = no
 )---------------------------------------------------------------------
 ) Which bodies do you want? (List one per line or leave blank for all bodies)
 )