From 64d949698432e05f2a372d9edc859c5b9df1f438 Mon Sep 17 00:00:00 2001
From: kinitrupti
Date: Fri, 12 May 2017 18:40:35 +0530
Subject: Revised list of TBCs

---
 .../Chapter7.ipynb                                 | 29 ++++++++--------------
 1 file changed, 10 insertions(+), 19 deletions(-)
 mode change 100755 => 100644 Basic_And_Applied_Thermodynamics_by_P._K._Nag/Chapter7.ipynb

(limited to 'Basic_And_Applied_Thermodynamics_by_P._K._Nag/Chapter7.ipynb')

diff --git a/Basic_And_Applied_Thermodynamics_by_P._K._Nag/Chapter7.ipynb b/Basic_And_Applied_Thermodynamics_by_P._K._Nag/Chapter7.ipynb
old mode 100755
new mode 100644
index c4be7cbe..a84c6d65
--- a/Basic_And_Applied_Thermodynamics_by_P._K._Nag/Chapter7.ipynb
+++ b/Basic_And_Applied_Thermodynamics_by_P._K._Nag/Chapter7.ipynb
@@ -55,7 +55,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 1,
    "metadata": {
     "collapsed": false
    },
@@ -67,18 +67,9 @@
       "\n",
       " Example 7.2\n",
       "\n",
-      " The entropy change of the universe is  -1.12252010724  kJ/K\n"
-     ]
-    },
-    {
-     "ename": "NameError",
-     "evalue": "name 'log' is not defined",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[1;31mNameError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[1;32m<ipython-input-13-726fd0a673a1>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[0;32m     16\u001b[0m \u001b[1;31m# Part (b)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m     17\u001b[0m \u001b[0mT3\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;36m323\u001b[0m \u001b[1;31m# Temperature of intermediate reservoir in K\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m---> 18\u001b[1;33m \u001b[0mSw\u001b[0m \u001b[1;33m=\u001b[0m \u001b[0mm\u001b[0m\u001b[1;33m*\u001b[0m\u001b[0mcv\u001b[0m\u001b[1;33m*\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mlog\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mT3\u001b[0m\u001b[1;33m/\u001b[0m\u001b[0mT1\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m+\u001b[0m\u001b[0mlog\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mT2\u001b[0m\u001b[1;33m/\u001b[0m\u001b[0mT3\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;31m# entropy change of water\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m     19\u001b[0m \u001b[0mSr1\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;33m-\u001b[0m\u001b[0mm\u001b[0m\u001b[1;33m*\u001b[0m\u001b[0mcv\u001b[0m\u001b[1;33m*\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mT3\u001b[0m\u001b[1;33m-\u001b[0m\u001b[0mT1\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m/\u001b[0m\u001b[0mT3\u001b[0m \u001b[1;31m# Entropy change of universe\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m     20\u001b[0m \u001b[0mSr2\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;33m-\u001b[0m\u001b[0mm\u001b[0m\u001b[1;33m*\u001b[0m\u001b[0mcv\u001b[0m\u001b[1;33m*\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mT2\u001b[0m\u001b[1;33m-\u001b[0m\u001b[0mT3\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m/\u001b[0m\u001b[0mT2\u001b[0m \u001b[1;31m# Entropy change of universe\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
-      "\u001b[1;31mNameError\u001b[0m: name 'log' is not defined"
+      " The entropy change of the universe is  -1.12252010724  kJ/K\n",
+      "\n",
+      " The entropy change of the universe is  -1.20940246848  kJ/K\n"
      ]
     }
    ],
@@ -100,7 +91,7 @@
     "\n",
     "# Part (b)\n",
     "T3 = 323 # Temperature of intermediate reservoir in K\n",
-    "Sw = m*cv*(log(T3/T1)+log(T2/T3)) # entropy change of water\n",
+    "Sw = m*cv*(math.log(T3/T1)+math.log(T2/T3)) # entropy change of water\n",
     "Sr1 = -m*cv*(T3-T1)/T3 # Entropy change of universe\n",
     "Sr2 = -m*cv*(T2-T3)/T2 # Entropy change of universe\n",
     "Su = Sw+Sr1+Sr2 # Total entropy change\n",
@@ -117,7 +108,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -195,7 +186,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
@@ -269,7 +260,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
@@ -335,7 +326,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
@@ -399,7 +390,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
-- 
cgit