Updated to PY3

brian-rose · Apr 10, 2018 · ea40263 · ea40263
1 parent dae5fc1
commit ea40263
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/courseware/Two_layer_atmosphere.ipynb b/courseware/Two_layer_atmosphere.ipynb
@@ -175,7 +175,7 @@
    "source": [
     "quarter = sympy.Rational(1,4)\n",
     "out2 = {}\n",
-    "for var4, formula in out1.iteritems():\n",
+    "for var4, formula in out1.items():\n",
     "    var = (var4)**quarter\n",
     "    out2[var] = sympy.simplify(formula**quarter)\n",
     "out2"
@@ -211,7 +211,7 @@
     "#  The special case of equal absorptivities\n",
     "e = sympy.symbols('e')\n",
     "out3 = {}\n",
-    "for var4, formula in out1.iteritems():\n",
+    "for var4, formula in out1.items():\n",
     "    var = (var4)**quarter\n",
     "    simple_formula = sympy.cancel(formula.subs([(e_2, e),(e_1, e)]))\n",
     "    out3[var] = sympy.simplify( simple_formula**quarter )\n",
@@ -288,8 +288,8 @@
     }
    ],
    "source": [
-    "for var, formula in out2.iteritems():\n",
-    "    print formula.subs([(T_e, 255), (e_1, 0.4), (e_2, 0.4)])"
+    "for var, formula in out2.items():\n",
+    "    print(formula.subs([(T_e, 255), (e_1, 0.4), (e_2, 0.4)]))"
    ]
   },
   {
@@ -364,7 +364,7 @@
     }
    ],
    "source": [
-    "print mycolumn"
+    "print(mycolumn)"
    ]
   },
   {
@@ -404,8 +404,8 @@
     }
    ],
    "source": [
-    "print mycolumn.Ts\n",
-    "print mycolumn.Tatm"
+    "print(mycolumn.Ts)\n",
+    "print(mycolumn.Tatm)"
    ]
   },
   {
@@ -425,7 +425,7 @@
    ],
    "source": [
     "(e1, e2)= mycolumn.subprocess['LW'].absorptivity\n",
-    "print e1, e2"
+    "print(e1, e2)"
    ]
   },
   {
@@ -446,7 +446,7 @@
    "source": [
     "ASR = (1-mycolumn.param['albedo_sfc'])*mycolumn.param['Q']\n",
     "Te = (ASR/const.sigma)**0.25\n",
-    "print Te"
+    "print(Te)"
    ]
   },
   {
@@ -472,18 +472,18 @@
     "    (e1, e2)= col.subprocess['LW'].absorptivity\n",
     "    ASR = (1-col.param['albedo_sfc'])*col.param['Q']\n",
     "    Te = (ASR/const.sigma)**0.25\n",
-    "    print 'Surface:'\n",
+    "    print('Surface:')\n",
     "    num = col.Ts\n",
     "    anal = Ts(Te,e1,e2)\n",
-    "    print '  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol\n",
-    "    print 'Level 1'\n",
+    "    print('  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol)\n",
+    "    print('Level 1')\n",
     "    num = col.Tatm[0]\n",
     "    anal = T1(Te,e1,e2)\n",
-    "    print '  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol\n",
-    "    print 'Level 2'\n",
+    "    print('  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol)\n",
+    "    print('Level 2')\n",
     "    num = col.Tatm[1]\n",
     "    anal = T2(Te,e1,e2)\n",
-    "    print '  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol"
+    "    print('  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol)"
    ]
   },
   {
@@ -613,7 +613,7 @@
    "source": [
     "col1 = climlab.GreyRadiationModel(num_lev=2, abs_coeff=1.9E-4)\n",
     "(e1, e2) = col1.subprocess['LW'].absorptivity\n",
-    "print e1, e2\n",
+    "print(e1, e2)\n",
     "col1.integrate_years(10.)\n",
     "test_2level(col1)"
    ]
@@ -953,7 +953,7 @@
    "source": [
     "quarter = sympy.Rational(1,4)\n",
     "out2 = {}\n",
-    "for var4, formula in out1.iteritems():\n",
+    "for var4, formula in out1.items():\n",
     "    var = (var4)**quarter\n",
     "    out2[var] = sympy.simplify(formula**quarter)\n",
     "out2"
@@ -1007,22 +1007,22 @@
     "    (e0, e1, e2)= col.subprocess['LW'].absorptivity\n",
     "    ASR = (1-col.param['albedo_sfc'])*col.param['Q']\n",
     "    Te = (ASR/const.sigma)**0.25\n",
-    "    print 'Surface:'\n",
+    "    print('Surface:')\n",
     "    num = col.Ts\n",
     "    anal = Ts(Te,e0,e1,e2)\n",
-    "    print '  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol\n",
-    "    print 'Level 0'\n",
+    "    print('  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol)\n",
+    "    print('Level 0')\n",
     "    num = col.Tatm[0]\n",
     "    anal = T0(Te,e0,e1,e2)\n",
-    "    print '  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol\n",
-    "    print 'Level 1'\n",
+    "    print('  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol)\n",
+    "    print('Level 1')\n",
     "    num = col.Tatm[1]\n",
     "    anal = T1(Te,e0,e1,e2)\n",
-    "    print '  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol\n",
-    "    print 'Level 2'\n",
+    "    print('  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol)\n",
+    "    print('Level 2')\n",
     "    num = col.Tatm[2]\n",
     "    anal = T2(Te,e0,e1,e2)\n",
-    "    print '  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol"
+    "    print('  Numerical: %.2f   Analytical: %.2f    Same:' %(num, anal) , abs(num - anal)<tol)"
    ]
   },
   {
@@ -1130,7 +1130,7 @@
    "source": [
     "# The 3-layer solution reduces to two layer solution if we set e_2 = 0\n",
     "out3 = {}\n",
-    "for var, formula in out2.iteritems():\n",
+    "for var, formula in out2.items():\n",
     "    if var is not T_2:\n",
     "        out3[var] = sympy.simplify(formula.subs(epsilon_2,0))\n",
     "out3"