Merge branch 'incomp_reports'

dev/incompressible_liquids/CPIncomp/CoefficientFluids.py

@@ -1,6 +1,6 @@
 from __future__ import division, print_function
 import numpy as np
-from CPIncomp.DataObjects import CoefficientData,PureData
+from .DataObjects import CoefficientData,PureData
 
 
 class NitrateSalt(PureData,CoefficientData):

dev/incompressible_liquids/CPIncomp/DataObjects.py

@@ -1,9 +1,8 @@
 from __future__ import division, print_function
 import numpy as np
 import os, math
-from BaseObjects import IncompressibleData
+from .BaseObjects import IncompressibleData,IncompressibleFitter
 from abc import ABCMeta
-from CPIncomp.BaseObjects import IncompressibleFitter
 
 class SolutionData(object):
     """

dev/incompressible_liquids/CPIncomp/DigitalFluids.py

@@ -11,7 +11,7 @@ parameter form.
 """
 from __future__ import division, print_function
 import numpy as np
-from CPIncomp.DataObjects import DigitalData, PureData
+from .DataObjects import DigitalData, PureData
 
 class HyCool20(PureData,DigitalData):
     def __init__(self):

dev/incompressible_liquids/CPIncomp/ExampleObjects.py

@@ -1,6 +1,6 @@
 from __future__ import division, print_function
 import numpy as np
-from CPIncomp.DataObjects import PureData, SolutionData, DigitalData,\
+from .DataObjects import PureData, SolutionData, DigitalData,\
     CoefficientData
 
 class PureExample(PureData):

dev/incompressible_liquids/CPIncomp/MelinderFluids.py

@@ -1,7 +1,7 @@
 from __future__ import division, print_function
 import numpy as np
-from CPIncomp.DataObjects import PureData,CoefficientData
-from CPIncomp.BaseObjects import IncompressibleFitter
+from .DataObjects import PureData,CoefficientData
+from .BaseObjects import IncompressibleFitter
 
 
 class DEBLiquidClass(CoefficientData,PureData):

dev/incompressible_liquids/CPIncomp/PureFluids.py

@@ -1,6 +1,6 @@
 from __future__ import division, print_function
 import numpy as np
-from CPIncomp.DataObjects import PureData
+from .DataObjects import PureData
 
 class TherminolD12(PureData):
     """

dev/incompressible_liquids/CPIncomp/SecCoolFluids.py

@@ -1,11 +1,8 @@
 from __future__ import division, print_function
 import numpy as np
-from BaseObjects import IncompressibleData
-from DataObjects import DigitalData, PureData
-import os, sys
-from scipy import interpolate
-from CPIncomp.BaseObjects import IncompressibleFitter
-from scipy.io.matlab.miobase import arr_dtype_number
+from .BaseObjects import IncompressibleData,IncompressibleFitter
+from .DataObjects import DigitalData, PureData
+import os
 
 class SecCoolSolutionData(DigitalData):
     """

dev/incompressible_liquids/CPIncomp/SolutionFluids.py

@@ -1,6 +1,6 @@
 from __future__ import division, print_function
 import numpy as np
-from CPIncomp.DataObjects import SolutionData
+from .DataObjects import SolutionData
 
 
 class LiBrData(SolutionData):

dev/incompressible_liquids/CPIncomp/WriterObjects.py

@@ -104,11 +104,11 @@ class SolutionDataWriter(object):
         self.resolveRef = True # Resolve references and print text
 
         # Latex document mode
-#         self.ext        = "pgf"
-#         self.usebp      = True
-#         self.ispage     = False # Do you want a page or a figure?
-#         self.isportrait = True
-#         self.resolveRef = False # Resolve references and print text
+        #self.ext        = "pgf"
+        #self.usebp      = True
+        #self.ispage     = False # Do you want a page or a figure?
+        #self.isportrait = True
+        #self.resolveRef = False # Resolve references and print text
 
         if self.ext=="pgf" or matplotlib.rcParams['text.usetex']:
             self.usetex = True
@@ -1194,7 +1194,7 @@ class SolutionDataWriter(object):
 
         #TODO: Fix this problem: ValueError: Can only output finite numbers in PDF
         if self.ext=="pdf" and self.usetex:
-            warn("This is a dangerous combination, be prepared to experience problems with the PDF backend. It might help manually change the number of columns.")
+            warn("This is a dangerous combination, be prepared to experience problems with the PDF backend. It might help to manually change the number of columns.")
         else:
             table_axis.legend(
               legVal, legKey,
@@ -1218,7 +1218,7 @@ class SolutionDataWriter(object):
                 os.makedirs(os.path.dirname(report_path))
 
             if self.usebp and self.ext=="pgf":
-                self.bp.savepgf(report_path, fig=fig)
+                self.bp.savepgf(report_path, fig=fig, customReplace=["\\cite{","\\citet{"])
             else:
                 fig.savefig(report_path)
 

dev/incompressible_liquids/CPIncomp/__init__.py

@@ -7,9 +7,8 @@ readme.md       - General instructions and copyright information / credits.
 """
 from __future__ import division, absolute_import, print_function
 import inspect
-from . import DataObjects,ExampleObjects,PureFluids,CoefficientFluids,DigitalFluids,MelinderFluids
-from CPIncomp.SecCoolFluids import SecCoolSolutionData
-from CPIncomp import SolutionFluids
+from . import DataObjects,ExampleObjects,PureFluids,CoefficientFluids,DigitalFluids,MelinderFluids,SolutionFluids
+from .SecCoolFluids import SecCoolSolutionData
 
 
 def getBaseClassNames():

dev/incompressible_liquids/json/ExampleDigital.json

@@ -56,9 +56,9 @@
       [
         8.229999e+02, 
         4.865001e+02, 
-        1.452454e-03, 
-        -6.440389e-03, 
-        -8.477386e-03, 
+        1.452453e-03, 
+        -6.440387e-03, 
+        -8.477381e-03, 
         1.756515e-02
       ], 
       [
@@ -70,7 +70,7 @@
         0.000000e+00
       ], 
       [
-        1.022319e-08, 
+        1.022323e-08, 
         4.058102e-08, 
         -1.062292e-07, 
         -2.782324e-07, 
@@ -78,8 +78,8 @@
         0.000000e+00
       ], 
       [
-        4.002567e-10, 
-        5.493779e-11, 
+        4.002552e-10, 
+        5.493715e-11, 
         -3.138209e-09, 
         0.000000e+00, 
         0.000000e+00, 
@@ -145,9 +145,9 @@
       [
         8.366499e+02, 
         4.364991e+02, 
-        4.205852e-04, 
-        1.299597e-02, 
-        2.128750e-03, 
+        4.205843e-04, 
+        1.299598e-02, 
+        2.128754e-03, 
         -3.598992e-02
       ], 
       [
@@ -159,17 +159,17 @@
         0.000000e+00
       ], 
       [
-        1.642444e-08, 
-        1.864576e-08, 
-        -1.661903e-07, 
+        1.642434e-08, 
+        1.864575e-08, 
+        -1.661904e-07, 
         -2.168917e-07, 
         0.000000e+00, 
         0.000000e+00
       ], 
       [
-        2.557012e-10, 
-        7.808462e-10, 
-        -8.067017e-11, 
+        2.556999e-10, 
+        7.808459e-10, 
+        -8.067010e-11, 
         0.000000e+00, 
         0.000000e+00, 
         0.000000e+00

dev/incompressible_liquids/json/ExamplePure.json

@@ -60,8 +60,8 @@
   "saturation_pressure": {
     "NRMS": 6.550487e-03, 
     "coeffs": [
-      -3.663549e+03, 
-      -7.399698e+01, 
+      -3.663550e+03, 
+      -7.399696e+01, 
       -1.400146e+01
     ], 
     "type": "exponential"
@@ -87,9 +87,9 @@
   "viscosity": {
     "NRMS": 4.390378e-03, 
     "coeffs": [
-      1.324502e+03, 
-      -7.728096e+00, 
-      4.420218e+00
+      1.324503e+03, 
+      -7.727881e+00, 
+      4.420220e+00
     ], 
     "type": "exponential"
   },