Fixed Data

nick5435 · Apr 27, 2017 · 295808d · 295808d
1 parent 88b3935
commit 295808d
Show file tree

Hide file tree

Showing 18 changed files with 2,448 additions and 48,740 deletions.
diff --git a/ThermoPyle/ThermoPyle.c b/ThermoPyle/ThermoPyle.c
diff --git a/ThermoPyle/ThermoPyle.pyx b/ThermoPyle/ThermoPyle.pyx
@@ -129,14 +129,14 @@ class ThermoFluid:
         self.make_units()
         self.clean()
         self.make_meta()
-    @classmethod
+
     def make_units(self) -> None:
         """(Re)make the units list"""
         self.units = {}
         for var in self.data.columns:
             self.units[var] =  get(str(var), UNITS, "UnknownVar")
 
-    @classmethod
+
     def make_meta(self) -> None:
         """
         (Re)make the metadata object
@@ -155,7 +155,7 @@ class ThermoFluid:
             "units": self.units
         })
 
-    @classmethod
+
     def refresh(self) -> None:
         """
         Refreshes the object, remakes meta, cleans data, remakes units.
@@ -165,7 +165,7 @@ class ThermoFluid:
         self.clean()
         self.make_meta()
 
-    @classmethod
+
     def add_column(self, variables: Union[List[Text], Text]) -> None:
         """
         Adds a column to the dataframe
@@ -199,7 +199,7 @@ class ThermoFluid:
         self.make_units()
         self.make_meta()
 
-    @classmethod
+
     def clean(self) -> None:
         """Re-cleans data"""
         if "P" in self.vars:
@@ -213,7 +213,7 @@ class ThermoFluid:
         if "U" in self.vars:
             self.data = self.data[self.data["U"] >= 0.0]
 
-    @classmethod
+
     def write_data(self, path: str="./data/", filename: str="", mode: str="default") -> None:
         """
         Does what it says on the tin. Makes a CSV and JSON files and saves them to path given.
@@ -302,14 +302,14 @@ class CSVFluid:
         self.numPoints = self.meta["numPoints"]
         self.units = self.meta["units"]
 
-    @classmethod
+
     def make_units(self) -> None:
         """(Re)make the units list"""
         self.units = {}
         for var in self.data.columns:
             self.units[var] =  get(str(var), UNITS, "UnknownVar")
 
-    @classmethod
+
     def make_meta(self) -> None:
         """
         (Re)make the metadata object
@@ -327,7 +327,7 @@ class CSVFluid:
             "colorMap": self.colorMap,
             "units": self.units})
 
-    @classmethod
+
     def add_column(self, variables: Union[List[Text], Text]) -> None:
         """
         Adds a column to the dataframe
@@ -357,7 +357,7 @@ class CSVFluid:
         self.make_units()
         self.make_meta()
 
-    @classmethod
+
     def refresh(self) -> None:
         """
         Refreshes the object, remakes meta, cleans data, remakes units.
@@ -367,7 +367,7 @@ class CSVFluid:
         self.clean()
         self.make_meta()
 
-    @classmethod
+
     def changeOrder(self, order: List[Text]) -> None:
         """
         Changes order of the columns:
@@ -397,7 +397,7 @@ class CSVFluid:
         """
         return deepcopy(self)
 
-    @classmethod
+
     def write_data(self, path: str="./data/", filename: str="", mode: str="default") -> None:
         """
         Does what it says on the tin. Makes a CSV and JSON files and saves them to path given.
@@ -442,7 +442,7 @@ class CSVFluid:
         with open(path + middle_string + ".json", mode="w+", encoding="utf-8") as f:
             json.dump(dict(self.meta), f)
 
-    @classmethod
+
     def add_column(self, variables: Union[List[Text], Text]) -> None:
         """
         Adds a column to the dataframe

diff --git a/finalData/Water_T-217_P-217_U__withVolume.csv b/finalData/Water_T-217_P-217_U__withVolume.csv
diff --git a/finalData/Water_T-217_P-217_U__withVolume.json b/finalData/Water_T-217_P-217_U__withVolume.json
diff --git a/finalData/Water_T-217_P-217_U_with_Volume_and_ders.csv b/finalData/Water_T-217_P-217_U_with_Volume_and_ders.csv
diff --git a/finalData/Water_T-217_P-217_U_with_Volume_and_ders.json b/finalData/Water_T-217_P-217_U_with_Volume_and_ders.json
diff --git a/finalData/Water_T-217_P-217_U_with_derivatives.csv b/finalData/Water_T-217_P-217_U_with_derivatives.csv
diff --git a/finalData/Water_T-217_P-217_U_with_derivatives.json b/finalData/Water_T-217_P-217_U_with_derivatives.json
diff --git a/finalData/Water_T-217_P-217_U_with_derivatives_and_volume.csv b/finalData/Water_T-217_P-217_U_with_derivatives_and_volume.csv