Skip to content

Commit

Permalink
Fixed Data
Browse files Browse the repository at this point in the history
  • Loading branch information
@nick5435
nick5435 committed Apr 10, 2017
1 parent 7a53996 commit ab2bc4d
Show file tree
Hide file tree
Showing 5 changed files with 301 additions and 30 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
finalData/Water_T-216_P-216_U_with_derivatives.csv filter=lfs diff=lfs merge=lfs -text
finalData/Water_T-217_P-217_U_with_derivatives.csv filter=lfs diff=lfs merge=lfs -text
finalData/Water_T-217_P-217_U_with_ders_and_enthalpy.csv filter=lfs diff=lfs merge=lfs -text
finalData/Water_T-217_P-217_U_with_Volume_and_ders.csv filter=lfs diff=lfs merge=lfs -text
3 changes: 3 additions & 0 deletions finalData/Water_T-217_P-217_U_with_Volume_and_ders.csv
View file
Git LFS file not shown
1 change: 1 addition & 0 deletions finalData/Water_T-217_P-217_U_with_Volume_and_ders.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"yvar": "P", "fluid": "Water", "xvar": "T", "zvar": "U", "numPoints": [217, 217], "colorMap": "viridis", "date": "2017-04-09 @ 20:17:25", "units": {"d(T)/d(U)|S": "UnknownVar", "d(S)/d(P)|U": "UnknownVar", "d(P)/d(G)|T": "UnknownVar", "S": "J/kg/K", "d(T)/d(S)|U": "UnknownVar", "d(G)/d(U)|D": "UnknownVar", "d(G)/d(P)|D": "UnknownVar", "d(S)/d(T)|D": "UnknownVar", "d(P)/d(T)|S": "UnknownVar", "V": "UnknownVar", "d(U)/d(P)|S": "UnknownVar", "d(U)/d(D)|S": "UnknownVar", "d(P)/d(D)|T": "UnknownVar", "d(S)/d(U)|D": "UnknownVar", "d(U)/d(T)|G": "UnknownVar", "d(S)/d(T)|U": "UnknownVar", "d(S)/d(D)|G": "UnknownVar", "d(G)/d(P)|S": "UnknownVar", "d(P)/d(D)|G": "UnknownVar", "d(P)/d(S)|T": "UnknownVar", "d(S)/d(G)|U": "UnknownVar", "d(P)/d(U)|D": "UnknownVar", "d(S)/d(P)|D": "UnknownVar", "d(P)/d(T)|U": "UnknownVar", "d(G)/d(P)|U": "UnknownVar", "d(D)/d(G)|P": "UnknownVar", "d(G)/d(T)|P": "UnknownVar", "d(S)/d(P)|G": "UnknownVar", "d(G)/d(D)|S": "UnknownVar", "d(G)/d(S)|P": "UnknownVar", "d(S)/d(U)|T": "UnknownVar", "d(D)/d(P)|G": "UnknownVar", "d(G)/d(S)|T": "UnknownVar", "d(T)/d(S)|P": "UnknownVar", "d(D)/d(G)|U": "UnknownVar", "d(D)/d(S)|U": "UnknownVar", "d(U)/d(G)|S": "UnknownVar", "d(P)/d(D)|U": "UnknownVar", "d(G)/d(T)|U": "UnknownVar", "d(U)/d(P)|T": "UnknownVar", "U": "J/kg", "d(T)/d(P)|G": "UnknownVar", "d(D)/d(T)|S": "UnknownVar", "d(S)/d(D)|U": "UnknownVar", "d(D)/d(T)|U": "UnknownVar", "d(U)/d(G)|P": "UnknownVar", "d(T)/d(U)|G": "UnknownVar", "d(S)/d(D)|T": "UnknownVar", "d(P)/d(U)|T": "UnknownVar", "d(D)/d(P)|T": "UnknownVar", "d(G)/d(U)|S": "UnknownVar", "PHASE": "", "d(S)/d(D)|P": "UnknownVar", "d(D)/d(P)|S": "UnknownVar", "d(T)/d(S)|G": "UnknownVar", "d(U)/d(T)|D": "UnknownVar", "G": "J/kg", "d(P)/d(S)|U": "UnknownVar", "d(T)/d(U)|D": "UnknownVar", "d(U)/d(D)|T": "UnknownVar", "d(P)/d(U)|S": "UnknownVar", "d(T)/d(D)|G": "UnknownVar", "d(G)/d(S)|D": "UnknownVar", "d(P)/d(G)|D": "UnknownVar", "d(G)/d(S)|U": "UnknownVar", "d(U)/d(S)|D": "UnknownVar", "d(S)/d(T)|G": "UnknownVar", "d(T)/d(G)|P": "UnknownVar", "d(D)/d(U)|S": "UnknownVar", "d(D)/d(P)|U": "UnknownVar", "d(G)/d(D)|U": "UnknownVar", "d(D)/d(G)|S": "UnknownVar", "d(P)/d(G)|U": "UnknownVar", "d(S)/d(P)|T": "UnknownVar", "d(T)/d(P)|D": "UnknownVar", "d(T)/d(D)|P": "UnknownVar", "d(S)/d(G)|T": "UnknownVar", "D": "kg/m^3", "d(P)/d(S)|G": "UnknownVar", "d(G)/d(U)|T": "UnknownVar", "d(T)/d(G)|U": "UnknownVar", "P": "Pa", "d(U)/d(S)|T": "UnknownVar", "d(S)/d(T)|P": "UnknownVar", "d(U)/d(D)|G": "UnknownVar", "d(S)/d(G)|D": "UnknownVar", "d(U)/d(S)|G": "UnknownVar", "d(D)/d(U)|P": "UnknownVar", "d(U)/d(T)|S": "UnknownVar", "d(D)/d(S)|T": "UnknownVar", "d(D)/d(G)|T": "UnknownVar", "d(P)/d(T)|G": "UnknownVar", "d(T)/d(D)|S": "UnknownVar", "T": "K", "d(T)/d(G)|S": "UnknownVar", "d(S)/d(U)|G": "UnknownVar", "d(G)/d(D)|P": "UnknownVar", "d(G)/d(T)|D": "UnknownVar", "d(G)/d(P)|T": "UnknownVar", "d(T)/d(P)|S": "UnknownVar", "d(T)/d(S)|D": "UnknownVar", "d(P)/d(U)|G": "UnknownVar", "d(D)/d(U)|T": "UnknownVar", "d(D)/d(S)|P": "UnknownVar", "d(T)/d(G)|D": "UnknownVar", "d(G)/d(D)|T": "UnknownVar", "d(U)/d(S)|P": "UnknownVar", "d(D)/d(T)|P": "UnknownVar", "d(U)/d(P)|D": "UnknownVar", "d(T)/d(P)|U": "UnknownVar", "d(D)/d(T)|G": "UnknownVar", "d(U)/d(G)|D": "UnknownVar", "d(P)/d(G)|S": "UnknownVar", "d(U)/d(T)|P": "UnknownVar", "d(U)/d(P)|G": "UnknownVar", "d(P)/d(T)|D": "UnknownVar", "d(D)/d(S)|G": "UnknownVar", "d(S)/d(G)|P": "UnknownVar", "d(U)/d(D)|P": "UnknownVar", "d(T)/d(D)|U": "UnknownVar", "d(U)/d(G)|T": "UnknownVar", "d(G)/d(T)|S": "UnknownVar", "d(P)/d(D)|S": "UnknownVar", "d(T)/d(U)|P": "UnknownVar", "d(G)/d(U)|P": "UnknownVar", "d(D)/d(U)|G": "UnknownVar", "d(S)/d(U)|P": "UnknownVar", "d(P)/d(S)|D": "UnknownVar"}, "vars": ["d(T)/d(U)|S", "d(S)/d(P)|U", "d(P)/d(G)|T", "S", "d(T)/d(S)|U", "d(G)/d(U)|D", "d(G)/d(P)|D", "d(S)/d(T)|D", "d(P)/d(T)|S", "V", "d(U)/d(P)|S", "d(U)/d(D)|S", "d(P)/d(D)|T", "d(S)/d(U)|D", "d(U)/d(T)|G", "d(S)/d(T)|U", "d(S)/d(D)|G", "d(G)/d(P)|S", "d(P)/d(D)|G", "d(P)/d(S)|T", "d(S)/d(G)|U", "d(P)/d(U)|D", "d(S)/d(P)|D", "d(P)/d(T)|U", "d(G)/d(P)|U", "d(D)/d(G)|P", "d(G)/d(T)|P", "d(S)/d(P)|G", "d(G)/d(D)|S", "d(G)/d(S)|P", "d(S)/d(U)|T", "d(D)/d(P)|G", "d(G)/d(S)|T", "d(T)/d(S)|P", "d(D)/d(G)|U", "d(D)/d(S)|U", "d(U)/d(G)|S", "d(P)/d(D)|U", "d(G)/d(T)|U", "d(U)/d(P)|T", "U", "d(T)/d(P)|G", "d(D)/d(T)|S", "d(S)/d(D)|U", "d(D)/d(T)|U", "d(U)/d(G)|P", "d(T)/d(U)|G", "d(S)/d(D)|T", "d(P)/d(U)|T", "d(D)/d(P)|T", "d(G)/d(U)|S", "PHASE", "d(S)/d(D)|P", "d(D)/d(P)|S", "d(T)/d(S)|G", "d(U)/d(T)|D", "G", "d(P)/d(S)|U", "d(T)/d(U)|D", "d(U)/d(D)|T", "d(P)/d(U)|S", "d(T)/d(D)|G", "d(G)/d(S)|D", "d(P)/d(G)|D", "d(G)/d(S)|U", "d(U)/d(S)|D", "d(S)/d(T)|G", "d(T)/d(G)|P", "d(D)/d(U)|S", "d(D)/d(P)|U", "d(G)/d(D)|U", "d(D)/d(G)|S", "d(P)/d(G)|U", "d(S)/d(P)|T", "d(T)/d(P)|D", "d(T)/d(D)|P", "d(S)/d(G)|T", "D", "d(P)/d(S)|G", "d(G)/d(U)|T", "d(T)/d(G)|U", "P", "d(U)/d(S)|T", "d(S)/d(T)|P", "d(U)/d(D)|G", "d(S)/d(G)|D", "d(U)/d(S)|G", "d(D)/d(U)|P", "d(U)/d(T)|S", "d(D)/d(S)|T", "d(D)/d(G)|T", "d(P)/d(T)|G", "d(T)/d(D)|S", "T", "d(T)/d(G)|S", "d(S)/d(U)|G", "d(G)/d(D)|P", "d(G)/d(T)|D", "d(G)/d(P)|T", "d(T)/d(P)|S", "d(T)/d(S)|D", "d(P)/d(U)|G", "d(D)/d(U)|T", "d(D)/d(S)|P", "d(T)/d(G)|D", "d(G)/d(D)|T", "d(U)/d(S)|P", "d(D)/d(T)|P", "d(U)/d(P)|D", "d(T)/d(P)|U", "d(D)/d(T)|G", "d(U)/d(G)|D", "d(P)/d(G)|S", "d(U)/d(T)|P", "d(U)/d(P)|G", "d(P)/d(T)|D", "d(D)/d(S)|G", "d(S)/d(G)|P", "d(U)/d(D)|P", "d(T)/d(D)|U", "d(U)/d(G)|T", "d(G)/d(T)|S", "d(P)/d(D)|S", "d(T)/d(U)|P", "d(G)/d(U)|P", "d(D)/d(U)|G", "d(S)/d(U)|P", "d(P)/d(S)|D"]}
291 changes: 291 additions & 0 deletions notebooks/Dataset_Merge.ipynb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,291 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 17,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:14:48.906989Z",
"start_time": "2017-04-09T20:14:48.883992-05:00"
},
"collapsed": true,
"run_control": {
"frozen": false,
"read_only": false
}
},
"outputs": [],
"source": [
"import pandas as pd\n",
"import numpy as np\n",
"import matplotlib.pyplot as plt, mpld3\n",
"from ThermoPyle import *\n",
"%matplotlib notebook\n",
"mpld3.enable_notebook()\n",
"plt.style.use([\"seaborn-talk\", \"seaborn-notebook\", \"seaborn-paper\"])"
]
},
{
"cell_type": "code",
"execution_count": 18,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:14:55.707774Z",
"start_time": "2017-04-09T20:14:51.039931-05:00"
},
"collapsed": true,
"run_control": {
"frozen": false,
"read_only": false
}
},
"outputs": [],
"source": [
"waterD = CSVFluid(\"../finalData/Water_T-217_P-217_U_with_derivatives\")"
]
},
{
"cell_type": "code",
"execution_count": 19,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:15:09.836381Z",
"start_time": "2017-04-09T20:14:55.711778-05:00"
},
"collapsed": true,
"run_control": {
"frozen": false,
"read_only": false
}
},
"outputs": [],
"source": [
"Water = ThermoFluid()"
]
},
{
"cell_type": "code",
"execution_count": 20,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:15:09.848381Z",
"start_time": "2017-04-09T20:15:09.838390-05:00"
},
"collapsed": true,
"run_control": {
"frozen": false,
"read_only": false
}
},
"outputs": [],
"source": [
"Water.data = waterD.data"
]
},
{
"cell_type": "code",
"execution_count": 21,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:15:26.800642Z",
"start_time": "2017-04-09T20:15:26.785640-05:00"
},
"collapsed": true,
"run_control": {
"frozen": false,
"read_only": false
}
},
"outputs": [],
"source": [
"Water.data[\"V\"] = pd.Series(Water.M / Water.data[\"D\"], index=Water.data.index)\n",
"Water.vars = list(set(Water.vars).union(list(Water.data.columns)))\n",
"Water.make_units()\n",
"Water.make_meta()"
]
},
{
"cell_type": "code",
"execution_count": 27,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:17:52.250114Z",
"start_time": "2017-04-09T20:17:25.609559-05:00"
}
},
"outputs": [],
"source": [
"Water.write_data(mode=\"dual\", path=\"../finalData/\", filename=\"with_Volume_and_ders\")"
]
},
{
"cell_type": "code",
"execution_count": 23,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:15:37.214248Z",
"start_time": "2017-04-09T20:15:37.170247-05:00"
}
},
"outputs": [
{
"data": {
"text/html": [
"<div>\n",
"<table border=\"1\" class=\"dataframe\">\n",
" <thead>\n",
" <tr style=\"text-align: right;\">\n",
" <th></th>\n",
" <th>T</th>\n",
" <th>P</th>\n",
" <th>U</th>\n",
" <th>d(S)/d(U)|P</th>\n",
" <th>d(D)/d(T)|S</th>\n",
" <th>d(U)/d(T)|S</th>\n",
" <th>d(U)/d(T)|D</th>\n",
" <th>d(T)/d(D)|P</th>\n",
" <th>d(P)/d(U)|S</th>\n",
" <th>d(P)/d(G)|T</th>\n",
" <th>...</th>\n",
" <th>d(P)/d(D)|T</th>\n",
" <th>d(G)/d(U)|T</th>\n",
" <th>d(S)/d(G)|T</th>\n",
" <th>d(T)/d(U)|D</th>\n",
" <th>d(D)/d(G)|S</th>\n",
" <th>d(S)/d(P)|D</th>\n",
" <th>d(P)/d(S)|U</th>\n",
" <th>d(S)/d(T)|U</th>\n",
" <th>D</th>\n",
" <th>V</th>\n",
" </tr>\n",
" </thead>\n",
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>281.216866</td>\n",
" <td>4.608904e+06</td>\n",
" <td>33824.479133</td>\n",
" <td>0.003556</td>\n",
" <td>97.352592</td>\n",
" <td>446.887828</td>\n",
" <td>4177.846549</td>\n",
" <td>-13.649741</td>\n",
" <td>455942.789048</td>\n",
" <td>1002.01292</td>\n",
" <td>...</td>\n",
" <td>2.091388e+06</td>\n",
" <td>-54.461351</td>\n",
" <td>-0.000073</td>\n",
" <td>0.000239</td>\n",
" <td>0.000479</td>\n",
" <td>0.000097</td>\n",
" <td>-1.282085e+08</td>\n",
" <td>-1.779464</td>\n",
" <td>1002.01292</td>\n",
" <td>0.000018</td>\n",
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
" <td>281.216866</td>\n",
" <td>9.217196e+06</td>\n",
" <td>33737.457761</td>\n",
" <td>0.003557</td>\n",
" <td>82.857915</td>\n",
" <td>757.334553</td>\n",
" <td>4159.504239</td>\n",
" <td>-11.735102</td>\n",
" <td>231361.330627</td>\n",
" <td>1004.20534</td>\n",
" <td>...</td>\n",
" <td>2.112507e+06</td>\n",
" <td>-51.233454</td>\n",
" <td>-0.000085</td>\n",
" <td>0.000240</td>\n",
" <td>0.000475</td>\n",
" <td>0.000082</td>\n",
" <td>-6.505054e+07</td>\n",
" <td>-3.292547</td>\n",
" <td>1004.20534</td>\n",
" <td>0.000018</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"<p>2 rows × 128 columns</p>\n",
"</div>"
],
"text/plain": [
" T P U d(S)/d(U)|P d(D)/d(T)|S \\\n",
"0 281.216866 4.608904e+06 33824.479133 0.003556 97.352592 \n",
"1 281.216866 9.217196e+06 33737.457761 0.003557 82.857915 \n",
"\n",
" d(U)/d(T)|S d(U)/d(T)|D d(T)/d(D)|P d(P)/d(U)|S d(P)/d(G)|T \\\n",
"0 446.887828 4177.846549 -13.649741 455942.789048 1002.01292 \n",
"1 757.334553 4159.504239 -11.735102 231361.330627 1004.20534 \n",
"\n",
" ... d(P)/d(D)|T d(G)/d(U)|T d(S)/d(G)|T d(T)/d(U)|D d(D)/d(G)|S \\\n",
"0 ... 2.091388e+06 -54.461351 -0.000073 0.000239 0.000479 \n",
"1 ... 2.112507e+06 -51.233454 -0.000085 0.000240 0.000475 \n",
"\n",
" d(S)/d(P)|D d(P)/d(S)|U d(S)/d(T)|U D V \n",
"0 0.000097 -1.282085e+08 -1.779464 1002.01292 0.000018 \n",
"1 0.000082 -6.505054e+07 -3.292547 1004.20534 0.000018 \n",
"\n",
"[2 rows x 128 columns]"
]
},
"execution_count": 23,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"Water.data.head(2)"
]
},
{
"cell_type": "code",
"execution_count": 26,
"metadata": {
"ExecuteTime": {
"end_time": "2017-04-10T01:17:21.595328Z",
"start_time": "2017-04-09T20:17:21.587328-05:00"
}
},
"outputs": [],
"source": [
"Water.zvar=\"U\"\n",
"Water.make_meta()"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.1"
}
},
"nbformat": 4,
"nbformat_minor": 2
}

0 comments on commit ab2bc4d

Please sign in to comment.