Changes to FRUIT installation

README.md

@@ -10,7 +10,7 @@ Directory structure
 
 - `mcm/` contains data files related to specific versions of the MCM.
 - `model/`  contains the chemical mechanism (in FACSIMILE format) and directories for the model configuration, the model constraints and the model output
-- `obj` contains the files generated by the Fortran compiler
+- `obj/` contains the files generated by the Fortran compiler
 - `src/` contains the Fortran source files.
 - `tools/` contains Python and shell scripts to build and compile AtChem2, with the chemical mechanism and configuration in the `model/` directory.
 - `travis/` contains the _testsuite_ files.

tools/Makefile

@@ -99,7 +99,7 @@ test : unittests behaviourtests
 
 clean:
 	rm -f *.o
-	rm -f *.gcda *.gcno
+	rm -f *.gcda *.gcno *.xml
 	rm -f $(AOUT)
 	rm -f $(OBJ)/*.mod
 	rm -f travis/tests/*/*.out travis/tests/*/*.output travis/tests/*/instantaneousRates/*[0-9]

tools/install/install_fruit.sh

@@ -12,15 +12,23 @@
 #!/bin/sh
 
 # This script downloads and installs FRUIT 3.4.3 into the directory
-# given by input argument $1.
+# given by input argument $1. This is dependent on the existence of a
+# Ruby installation.
 #
 # Example usage:
-#   ./install_fruit.sh /path/to/install/directory /path/to/rvm/directory
+#   ./install_fruit.sh /path/to/install/directory
 
-rvm install ruby-2.4.2
+if [ -z "$1" ] ; then
+  echo "Please provide an argument to tools/install/install_fruit.sh"
+  exit 1
+fi
+cd $1
 wget https://kent.dl.sourceforge.net/project/fortranxunit/fruit_3.4.3/fruit_3.4.3.zip
-mkdir -p $1
-unzip -q fruit_3.4.3.zip -d $1
-cd $1/fruit_3.4.3/fruit_processor_gem/
+
+unzip -q fruit_3.4.3.zip
+rm fruit_3.4.3.zip
+
+cd fruit_3.4.3
+gem install rake
+cd fruit_processor_gem
 rake install
-rake

travis/unit_tests/fruit_generator.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'fruit_processor'
 if ENV['TRAVIS'] == nil
-  load "/Users/sc676/Downloads/fruit_3.4.3/rake_base.rb"
+  load "~/libs/fruit_3.4.3/rake_base.rb"
 else
   if ENV['TRAVIS_OS_NAME'] == 'linux'
     load "/home/travis/build/AtChem/AtChem2/fruit/fruit_3.4.3/rake_base.rb"