Taken out an error in the pre-written fortran module which confused c…

…ompiler in Docker. Also removed the requirement for static compilation that was causing problems in Docker
loftytopping · Jul 11, 2018 · fad9aa1 · fad9aa1
1 parent 53c48af
commit fad9aa1
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 # ================================================================================
 #
-# This Dockerfile sets up a container based on the Ubuntu 16:04 image to run PyBox
+# This Dockerfile sets up a container based on the Ubuntu 18:04 image to run PyBox
 # 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER David Topping ([email protected])
 
 # ========================== Basic configuration =================================
@@ -27,9 +27,7 @@ RUN apt-get install -y build-essential \
 # Install BLAS and LAPACK
 RUN apt-get install -y \
     libblas-dev \
-    liblapack-dev \
-    libblas-doc \
-    liblapack-doc 
+    liblapack-dev 
 
 # ========================== Create directory structure ==========================
 RUN mkdir -p /Code

diff --git a/Parse_eqn_file.py b/Parse_eqn_file.py
@@ -2587,7 +2587,6 @@ def write_gas_jacobian_fortran(filename,equations,num_species,loss_dict,gain_dic
     f.write('!    You should have received a copy of the GNU General Public License along with                   # \n')
     f.write('!    PyBox.  If not, see <http://www.gnu.org/licenses/>.                                            # \n')
     f.write('!                                                                                                   # \n')
-    f.write('!§# \n')
     f.write('!##################################################################################################### \n')    
     f.write('! File created at %s \n' % datetime.datetime.now()) # python will convert \n to os.linesep
     f.write('\n') 

diff --git a/f2py/f2py_jacobian.py b/f2py/f2py_jacobian.py
@@ -35,7 +35,6 @@
                                      "-ffast-math",
                                      "-fopenmp"],
                  extra_link_args=["-lgomp",
-                                  "-static",
                                   "-llapack",
                                   "-lblas"])
 if __name__ == '__main__':

diff --git a/f2py/f2py_loss_gain.py b/f2py/f2py_loss_gain.py
@@ -34,7 +34,6 @@
                                      "-ffast-math",
                                      "-fopenmp"],
                  extra_link_args=["-lgomp",
-                                  "-static",
                                   "-llapack",
                                   "-lblas"])
 if __name__ == '__main__':

diff --git a/f2py/f2py_rate_coefficient.py b/f2py/f2py_rate_coefficient.py
@@ -35,7 +35,6 @@
                                      "-ffast-math",
                                      "-fopenmp"],
                  extra_link_args=["-lgomp",
-                                  "-static",
                                   "-llapack",
                                   "-lblas"])
 if __name__ == '__main__':

diff --git a/f2py/f2py_reactant_conc.py b/f2py/f2py_reactant_conc.py
@@ -35,8 +35,7 @@
                                      "-ffast-math",
                                      "-fopenmp"],
                  extra_link_args=["-lgomp",
-                                  "-static",
-                                  "-llapack",
+                                 "-llapack",
                                   "-lblas"])
 if __name__ == '__main__':
     from numpy.distutils.core import setup