From 770997839279dd9b59c33c96725a44da5c060bf5 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 5 Jun 2012 19:56:10 +0000 Subject: [PATCH] Cleanup of MixMaster/Units package --- interfaces/python/MixMaster/Units/SI.py | 31 ++----------------- interfaces/python/MixMaster/Units/__init__.py | 27 ---------------- interfaces/python/MixMaster/Units/area.py | 28 ----------------- interfaces/python/MixMaster/Units/density.py | 27 ---------------- interfaces/python/MixMaster/Units/energy.py | 28 ----------------- interfaces/python/MixMaster/Units/force.py | 29 ----------------- interfaces/python/MixMaster/Units/length.py | 28 ----------------- interfaces/python/MixMaster/Units/mass.py | 28 ----------------- interfaces/python/MixMaster/Units/power.py | 28 ----------------- interfaces/python/MixMaster/Units/pressure.py | 28 ----------------- .../python/MixMaster/Units/specificEnergy.py | 27 ---------------- .../python/MixMaster/Units/specificEntropy.py | 28 ----------------- interfaces/python/MixMaster/Units/speed.py | 28 ----------------- .../python/MixMaster/Units/temperature.py | 28 ----------------- interfaces/python/MixMaster/Units/time.py | 28 ----------------- interfaces/python/MixMaster/Units/unit.py | 28 ----------------- interfaces/python/MixMaster/Units/volume.py | 28 ----------------- 17 files changed, 2 insertions(+), 475 deletions(-) diff --git a/interfaces/python/MixMaster/Units/SI.py b/interfaces/python/MixMaster/Units/SI.py index 6c6b9e287..a363b248a 100644 --- a/interfaces/python/MixMaster/Units/SI.py +++ b/interfaces/python/MixMaster/Units/SI.py @@ -1,28 +1,4 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: SI.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - +#!/usr/bin/env python from unit import unit, dimensionless # @@ -127,7 +103,7 @@ if __name__ == "__main__": print " tesla: %s" % tesla print " henry: %s" % henry - print " degree Celcius: %s" % celcius + print " degree Celsius: %s" % celsius print " lumen: %s" % lumen print " lux: %s" % lux @@ -135,6 +111,3 @@ if __name__ == "__main__": print " becquerel: %s" % becquerel print " gray: %s" % gray print " sievert: %s" % sievert - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/__init__.py b/interfaces/python/MixMaster/Units/__init__.py index 196e1f6c6..e69de29bb 100644 --- a/interfaces/python/MixMaster/Units/__init__.py +++ b/interfaces/python/MixMaster/Units/__init__.py @@ -1,27 +0,0 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: __init__.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/area.py b/interfaces/python/MixMaster/Units/area.py index c73ad84ac..a03759935 100644 --- a/interfaces/python/MixMaster/Units/area.py +++ b/interfaces/python/MixMaster/Units/area.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: area.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from length import meter, centimeter, inch, foot, mile # @@ -41,6 +16,3 @@ acre = 43560 * square_foot hectare = 1000 * square_meter barn = 1e-28 * square_meter - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/density.py b/interfaces/python/MixMaster/Units/density.py index b891229d6..ef89cbbe7 100644 --- a/interfaces/python/MixMaster/Units/density.py +++ b/interfaces/python/MixMaster/Units/density.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: density.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - import SI, math # @@ -34,5 +9,3 @@ units = ['kg__m3', 'g__m3', 'g__cm3'] kg__m3 = SI.kilogram/(SI.meter * SI.meter * SI.meter) g__m3 = 1.e-3*kg__m3 g__cm3 = 1.e3*kg__m3 -# -# End of file diff --git a/interfaces/python/MixMaster/Units/energy.py b/interfaces/python/MixMaster/Units/energy.py index 39f945987..7f7d2f084 100644 --- a/interfaces/python/MixMaster/Units/energy.py +++ b/interfaces/python/MixMaster/Units/energy.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: energy.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from SI import joule # @@ -41,6 +16,3 @@ Calorie = 1000 * calorie kilowatt_hour = 3.6e6 * joule electron_volt = 1.602e-19 * joule - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/force.py b/interfaces/python/MixMaster/Units/force.py index c099c8fd3..6a9a6bdbc 100644 --- a/interfaces/python/MixMaster/Units/force.py +++ b/interfaces/python/MixMaster/Units/force.py @@ -1,35 +1,6 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: force.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from SI import meter # # Definitions of common force units # Data taken from Appendix F of Halliday, Resnick, Walker, "Fundamentals of Physics", # fourth edition, John Willey and Sons, 1993 - - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/length.py b/interfaces/python/MixMaster/Units/length.py index d84fa1399..37c58228a 100644 --- a/interfaces/python/MixMaster/Units/length.py +++ b/interfaces/python/MixMaster/Units/length.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: length.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from SI import meter from SI import nano, milli, centi, kilo @@ -49,6 +24,3 @@ angstrom = 1e-10 * meter fermi = 1e-15 * meter light_year = 9.460e12 * kilometer parsec = 3.084e13 * kilometer - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/mass.py b/interfaces/python/MixMaster/Units/mass.py index cc21a6f2a..35451f4da 100644 --- a/interfaces/python/MixMaster/Units/mass.py +++ b/interfaces/python/MixMaster/Units/mass.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: mass.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from SI import kilogram # @@ -37,6 +12,3 @@ metric_ton = 1000 * kilogram ounce = 28.35 * gram pound = 16 * ounce ton = 2000 * pound - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/power.py b/interfaces/python/MixMaster/Units/power.py index 38caa0d72..2fac3b872 100644 --- a/interfaces/python/MixMaster/Units/power.py +++ b/interfaces/python/MixMaster/Units/power.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: power.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from SI import watt, kilo # @@ -32,6 +7,3 @@ from SI import watt, kilo kilowatt = kilo * watt horsepower = 745.7 * watt - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/pressure.py b/interfaces/python/MixMaster/Units/pressure.py index 233c92473..35397006f 100644 --- a/interfaces/python/MixMaster/Units/pressure.py +++ b/interfaces/python/MixMaster/Units/pressure.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: pressure.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - import SI # @@ -36,6 +11,3 @@ mbar = 100 * SI.pascal Pa = SI.pascal torr = 133.3 * SI.pascal atm = 1.01325e5 * SI.pascal - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/specificEnergy.py b/interfaces/python/MixMaster/Units/specificEnergy.py index 0fa6ddaa9..1adde01c9 100644 --- a/interfaces/python/MixMaster/Units/specificEnergy.py +++ b/interfaces/python/MixMaster/Units/specificEnergy.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: specificEnergy.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - import SI, energy, mass # @@ -37,5 +12,3 @@ Btu__lbm = energy.Btu/mass.pound cal__g = energy.calorie/mass.gram kcal__g = 1000.0*cal__g kcal__kg = cal__g -# -# End of file diff --git a/interfaces/python/MixMaster/Units/specificEntropy.py b/interfaces/python/MixMaster/Units/specificEntropy.py index 4939e26ed..ab8204a2c 100644 --- a/interfaces/python/MixMaster/Units/specificEntropy.py +++ b/interfaces/python/MixMaster/Units/specificEntropy.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: specificEntropy.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - import SI, energy, mass units = ['J__kg_K', 'kJ__kg_K', 'cal__g_K'] @@ -30,6 +5,3 @@ units = ['J__kg_K', 'kJ__kg_K', 'cal__g_K'] J__kg_K = SI.joule/(SI.kilogram * SI.kelvin) kJ__kg_K = 1000.0*J__kg_K cal__g_K = energy.calorie/(mass.gram * SI.kelvin) - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/speed.py b/interfaces/python/MixMaster/Units/speed.py index e024419d1..ca32bd62e 100644 --- a/interfaces/python/MixMaster/Units/speed.py +++ b/interfaces/python/MixMaster/Units/speed.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: speed.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from time import hour from length import nautical_mile @@ -33,6 +8,3 @@ from length import nautical_mile knot = nautical_mile/hour - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/temperature.py b/interfaces/python/MixMaster/Units/temperature.py index e3873da7a..d4339a118 100644 --- a/interfaces/python/MixMaster/Units/temperature.py +++ b/interfaces/python/MixMaster/Units/temperature.py @@ -1,32 +1,4 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: temperature.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - import SI K = SI.kelvin R = (9.0/5.0)*K - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/time.py b/interfaces/python/MixMaster/Units/time.py index 91c5ddc30..3b96a9e0c 100644 --- a/interfaces/python/MixMaster/Units/time.py +++ b/interfaces/python/MixMaster/Units/time.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: time.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from SI import second # @@ -34,6 +9,3 @@ minute = 60 * second hour = 60 * minute day = 24 * hour year = 365.25 * day - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/unit.py b/interfaces/python/MixMaster/Units/unit.py index 2652af0eb..427192a85 100644 --- a/interfaces/python/MixMaster/Units/unit.py +++ b/interfaces/python/MixMaster/Units/unit.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: unit.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - import operator class unit: @@ -130,6 +105,3 @@ class unit: return str dimensionless = unit(1, unit._zero) - -# -# End of file diff --git a/interfaces/python/MixMaster/Units/volume.py b/interfaces/python/MixMaster/Units/volume.py index 7da511d0a..8c491eca3 100644 --- a/interfaces/python/MixMaster/Units/volume.py +++ b/interfaces/python/MixMaster/Units/volume.py @@ -1,28 +1,3 @@ -#!/bin/env python -# -#-------------------------------------------------------------------------- -# -# $License$ -# -#-------------------------------------------------------------------------- - -# $Log: volume.py,v $ -# Revision 1.1.1.1 2003/04/14 17:57:49 dggoodwin -# Initial import. -# -# Revision 1.1 2002/12/20 13:23:41 dgg -# first commit -# -# Revision 1.1.1.1 2000/01/21 22:59:51 dgg -# dgg Cantera -# -# Revision 1.1 1999/11/27 17:27:35 dgg -# initial import to Cantera repository -# -# Revision 1.1 1999/11/25 19:50:58 aivazis -# Original source -# - from length import meter, centimeter, foot, inch # @@ -41,6 +16,3 @@ us_fluid_ounce = 231./128 * cubic_inch us_pint = 16 * us_fluid_ounce us_fluid_quart = 2 * us_pint us_fluid_gallon = 4 * us_fluid_quart - -# -# End of file