From 348aecbb39eb0d599d3ad4ea7af44651ca93bb6f Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 5 Dec 2014 18:13:12 -0500 Subject: [PATCH] Removed old C# and Java examples, updated current ones Signed-off-by: Ian Bell --- Web/coolprop/examples/CSharp/Example.cs | 107 ------------------- Web/coolprop/examples/CSharp/Output.txt | 60 ----------- Web/coolprop/examples/CSharp/example.rst | 11 -- Web/coolprop/examples/CSharp/run_example.bat | 33 ------ Web/coolprop/examples/Java/Example.java | 101 ----------------- Web/coolprop/examples/Java/Output.txt | 57 ---------- Web/coolprop/examples/Java/example.rst | 11 -- Web/coolprop/examples/Java/run_example.bat | 31 ------ Web/coolprop/wrappers/Csharp/Example.cs | 2 +- Web/coolprop/wrappers/Java/Example.java | 2 +- 10 files changed, 2 insertions(+), 413 deletions(-) delete mode 100644 Web/coolprop/examples/CSharp/Example.cs delete mode 100644 Web/coolprop/examples/CSharp/Output.txt delete mode 100644 Web/coolprop/examples/CSharp/example.rst delete mode 100644 Web/coolprop/examples/CSharp/run_example.bat delete mode 100644 Web/coolprop/examples/Java/Example.java delete mode 100644 Web/coolprop/examples/Java/Output.txt delete mode 100644 Web/coolprop/examples/Java/example.rst delete mode 100644 Web/coolprop/examples/Java/run_example.bat diff --git a/Web/coolprop/examples/CSharp/Example.cs b/Web/coolprop/examples/CSharp/Example.cs deleted file mode 100644 index 1671cb75..00000000 --- a/Web/coolprop/examples/CSharp/Example.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace ConsoleApplication1 -{ - class Program - { - static void Main(string[] args) - { - double T, h, p, D; - Console.Write("CoolProp version: " + CoolProp.get_global_param_string("version") + "\n"); - Console.Write("CoolProp gitrevision: " + CoolProp.get_global_param_string("gitrevision") + "\n"); - Console.Write("CoolProp fluids: " + CoolProp.get_global_param_string("FluidsList") + "\n"); - - Console.Write(" " + "\n"); - Console.Write("************ USING EOS *************" + "\n"); - Console.Write(" " + "\n"); - Console.Write("FLUID STATE INDEPENDENT INPUTS" + "\n"); - Console.Write("Critical Density Propane: " + CoolProp.Props1("Propane", "rhocrit") + "kg/m^3" + "\n"); - Console.Write("TWO PHASE INPUTS (Pressure)" + "\n"); - Console.Write("Density of saturated liquid Propane at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 0, "Propane") + " kg/m^3" + "\n"); - Console.Write("Density of saturated vapor R290 at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 1, "R290") + " kg/m^3" + "\n"); - Console.Write("TWO PHASE INPUTS (Temperature)" + "\n"); - Console.Write("Density of saturated liquid Propane at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 0, "Propane") + " kg/m^3" + "\n"); - Console.Write("Density of saturated vapor R290 at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 1, "R290") + " kg/m^3" + "\n"); - Console.Write("SINGLE PHASE CYCLE (propane)" + "\n"); - p = CoolProp.Props("P", 'T', 300, 'D', 1, "Propane"); - h = CoolProp.Props("H", 'T', 300, 'D', 1, "Propane"); - Console.Write("T,D -> P,H " + 300 + "," + 1 + " --> " + p + ',' + h + "\n"); - T = CoolProp.Props("T", 'P', p, 'H', h, "Propane"); - D = CoolProp.Props("D", 'P', p, 'H', h, "Propane"); - Console.Write("P,H -> T,D " + p + ',' + h + " --> " + T + ',' + D + "\n"); - - Console.Write(" " + "\n"); - Console.Write("************ USING TTSE ***************" + "\n"); - Console.Write(" " + "\n"); - CoolProp.enable_TTSE_LUT("Propane"); - Console.Write("TWO PHASE INPUTS (Pressure)" + "\n"); - Console.Write("Density of saturated liquid Propane at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 0, "Propane") + " kg/m^3" + "\n"); - Console.Write("Density of saturated vapor R290 at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 1, "R290") + " kg/m^3" + "\n"); - Console.Write("TWO PHASE INPUTS (Temperature)" + "\n"); - Console.Write("Density of saturated liquid Propane at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 0, "Propane") + " kg/m^3" + "\n"); - Console.Write("Density of saturated vapor R290 at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 1, "R290") + " kg/m^3" + "\n"); - Console.Write("SINGLE PHASE CYCLE (propane)" + "\n"); - p = CoolProp.Props("P", 'T', 300, 'D', 1, "Propane"); - h = CoolProp.Props("H", 'T', 300, 'D', 1, "Propane"); - Console.Write("T,D -> P,H " + 300 + ","+ 1+ " --> " + p + ',' + h + "\n"); - T = CoolProp.Props("T", 'P', p, 'H', h, "Propane"); - D = CoolProp.Props("D", 'P', p, 'H', h, "Propane"); - Console.Write("P,H -> T,D " + p + ',' + h + " --> " + T + ',' + D + "\n"); - CoolProp.disable_TTSE_LUT("Propane"); - - try - { - Console.Write(" " + "\n"); - Console.Write("************ USING REFPROP ***************" + "\n"); - Console.Write(" " + "\n"); - Console.Write("TWO PHASE INPUTS (Pressure)" + "\n"); - Console.Write("Density of saturated liquid Propane at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 0, "Propane") + " kg/m^3" + "\n"); - Console.Write("Density of saturated vapor R290 at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 1, "R290") + " kg/m^3" + "\n"); - Console.Write("TWO PHASE INPUTS (Temperature)" + "\n"); - Console.Write("Density of saturated liquid Propane at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 0, "Propane") + " kg/m^3" + "\n"); - Console.Write("Density of saturated vapor R290 at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 1, "R290") + " kg/m^3" + "\n"); - Console.Write("SINGLE PHASE CYCLE (propane)" + "\n"); - p = CoolProp.Props("P",'T',300,'D',1,"Propane"); - h = CoolProp.Props("H",'T',300,'D',1,"Propane"); - Console.Write("T,D -> P,H " + 300 + "," + 1 + " --> " + p + ',' + h + "\n"); - T = CoolProp.Props("T",'P',p,'H',h,"Propane"); - D = CoolProp.Props("D",'P',p,'H',h,"Propane"); - Console.Write("P,H -> T,D " + p + ',' + h + " --> " + T + ',' + D + "\n"); - } - catch - { - Console.Write(" " + "\n"); - Console.Write("************ CANT USE REFPROP ************" + "\n"); - Console.Write(" " + "\n"); - } - - Console.Write(" " + "\n"); - Console.Write("************ CHANGE UNIT SYSTEM (default is kSI) *************" + "\n"); - Console.Write(" " + "\n"); - int SI = (int)unit_systems.UNIT_SYSTEM_SI; - int kSI = (int)unit_systems.UNIT_SYSTEM_KSI; - CoolProp.set_standard_unit_system(SI); - Console.Write("Vapor pressure of water at 373.15 K in SI units (Pa): " + CoolProp.Props("P", 'T', 373.15, 'Q', 0, "Water") + "\n"); - CoolProp.set_standard_unit_system(kSI); - Console.Write("Vapor pressure of water at 373.15 K in kSI units (kPa): " + CoolProp.Props("P", 'T', 373.15, 'Q', 0, "Water") + "\n"); - - Console.Write(" " + "\n"); - Console.Write("************ BRINES AND SECONDARY WORKING FLUIDS *************" + "\n"); - Console.Write(" " + "\n"); - Console.Write("Density of 50% (mass) ethylene glycol/water at 300 K, 101.325 kPa: " + CoolProp.Props("D", 'T', 300, 'P', 101.325, "INCOMP::MEG-50%") + "kg/m^3" + "\n"); - Console.Write("Viscosity of Therminol D12 at 350 K, 101.325 kPa: " + CoolProp.Props("V", 'T', 350, 'P', 101.325, "INCOMP::TD12") + "Pa-s" + "\n"); - - Console.Write(" " + "\n"); - Console.Write("************ HUMID AIR PROPERTIES *************" + "\n"); - Console.Write(" " + "\n"); - Console.Write("Humidity ratio of 50% rel. hum. air at 300 K, 101.325 kPa: " + CoolProp.HAPropsSI("W", "T", 300, "P", 101.325, "R", 0.5) + " kg_w/kg_da" + "\n"); - Console.Write("Relative humidity from last calculation: " + CoolProp.HAPropsSI("R", "T", 300, "P", 101.325, "W", CoolProp.HAPropsSI("W", "T", 300, "P", 101.325, "R", 0.5)) + "(fractional)" + "\n"); - - //Console.Write("Enter to quit"); - //Console.ReadLine(); - } - } -} diff --git a/Web/coolprop/examples/CSharp/Output.txt b/Web/coolprop/examples/CSharp/Output.txt deleted file mode 100644 index d4511e63..00000000 --- a/Web/coolprop/examples/CSharp/Output.txt +++ /dev/null @@ -1,60 +0,0 @@ -CoolProp version: 4.1.2 -CoolProp gitrevision: 016d3219602f0ea2e5eac89f21b3ab0e54cdc941 -CoolProp fluids: Water,R134a,Helium,Oxygen,Hydrogen,ParaHydrogen,OrthoHydrogen,Argon,CarbonDioxide,Nitrogen,n-Propane,Ammonia,R1234yf,R1234ze(E),R32,R22,SES36,Ethylene,SulfurHexafluoride,Ethanol,DimethylEther,DimethylCarbonate,R143a,R23,n-Dodecane,Propylene,Cyclopentane,R236FA,R236EA,R227EA,R365MFC,R161,HFE143m,Benzene,n-Undecane,R125,CycloPropane,Neon,R124,Propyne,Fluorine,Methanol,RC318,R21,R114,R13,R14,R12,R113,R1234ze(Z),R1233zd(E),AceticAcid,R245fa,R41,CarbonMonoxide,CarbonylSulfide,n-Decane,HydrogenSulfide,Isopentane,Neopentane,Isohexane,Krypton,n-Nonane,Toluene,Xenon,R116,Acetone,NitrousOxide,SulfurDioxide,R141b,R142b,R218,Methane,Ethane,n-Butane,IsoButane,n-Pentane,n-Hexane,n-Heptane,n-Octane,CycloHexane,R152A,R123,R11,MDM,MD2M,MD3M,D6,MM,MD4M,D4,D5,1-Butene,IsoButene,cis-2-Butene,trans-2-Butene,MethylPalmitate,MethylStearate,MethylOleate,MethylLinoleate,MethylLinolenate,o-Xylene,m-Xylene,p-Xylene,EthylBenzene,Deuterium,ParaDeuterium,OrthoDeuterium,Air,R404A,R410A,R407C,R507A,R407F - -************ USING EOS ************* - -FLUID STATE INDEPENDENT INPUTS -Critical Density Propane: 220.4781kg/m^3 -TWO PHASE INPUTS (Pressure) -Density of saturated liquid Propane at 101.325 kPa: 580.88295195482 kg/m^3 -Density of saturated vapor R290 at 101.325 kPa: 2.41613600878816 kg/m^3 -TWO PHASE INPUTS (Temperature) -Density of saturated liquid Propane at 300 K: 489.447375251959 kg/m^3 -Density of saturated vapor R290 at 300 K: 21.6295320184622 kg/m^3 -SINGLE PHASE CYCLE (propane) -T,D -> P,H 300,1 --> 56.0727627482929,634.733625928477 -P,H -> T,D 56.0727627482929,634.733625928477 --> 300,0.999999999999999 - -************ USING TTSE *************** - -TWO PHASE INPUTS (Pressure) -0.204 to build both two phase tables -2.716 to build single phase table with p,h -14.365 to build single phase table for T,rho -write time: 0.077 -Density of saturated liquid Propane at 101.325 kPa: 580.882952265689 kg/m^3 -Density of saturated vapor R290 at 101.325 kPa: 2.41613600655145 kg/m^3 -TWO PHASE INPUTS (Temperature) -Density of saturated liquid Propane at 300 K: 489.44737744117 kg/m^3 -Density of saturated vapor R290 at 300 K: 21.629531877304 kg/m^3 -SINGLE PHASE CYCLE (propane) -T,D -> P,H 300,1 --> 56.0727644058219,634.733625854333 -P,H -> T,D 56.0727644058219,634.733625854333 --> 299.999999906753,0.999999979733272 - -************ USING REFPROP *************** - -TWO PHASE INPUTS (Pressure) -Density of saturated liquid Propane at 101.325 kPa: 580.88295195482 kg/m^3 -Density of saturated vapor R290 at 101.325 kPa: 2.41613600878816 kg/m^3 -TWO PHASE INPUTS (Temperature) -Density of saturated liquid Propane at 300 K: 489.447375251959 kg/m^3 -Density of saturated vapor R290 at 300 K: 21.6295320184622 kg/m^3 -SINGLE PHASE CYCLE (propane) -T,D -> P,H 300,1 --> 56.0727627482929,634.733625928477 -P,H -> T,D 56.0727627482929,634.733625928477 --> 300,0.999999999999999 - -************ CHANGE UNIT SYSTEM (default is kSI) ************* - -Vapor pressure of water at 373.15 K in SI units (Pa): 101417.996659952 -Vapor pressure of water at 373.15 K in kSI units (kPa): 101.417996659952 - -************ BRINES AND SECONDARY WORKING FLUIDS ************* - -Density of 50% (mass) ethylene glycol/water at 300 K, 101.325 kPa: 1061.17930772046kg/m^3 -Viscosity of Therminol D12 at 350 K, 101.325 kPa: 0.000522884941050795Pa-s - -************ HUMID AIR PROPERTIES ************* - -Humidity ratio of 50% rel. hum. air at 300 K, 101.325 kPa: 0.0110962237500952 kg_w/kg_da -Relative humidity from last calculation: 0.5(fractional) diff --git a/Web/coolprop/examples/CSharp/example.rst b/Web/coolprop/examples/CSharp/example.rst deleted file mode 100644 index 05f4ecf0..00000000 --- a/Web/coolprop/examples/CSharp/example.rst +++ /dev/null @@ -1,11 +0,0 @@ -Example Code for C# -=================== - -Code ----- -.. literalinclude:: Example.cs - :language: c# - -Output ------- -.. literalinclude:: Output.txt \ No newline at end of file diff --git a/Web/coolprop/examples/CSharp/run_example.bat b/Web/coolprop/examples/CSharp/run_example.bat deleted file mode 100644 index 65903bad..00000000 --- a/Web/coolprop/examples/CSharp/run_example.bat +++ /dev/null @@ -1,33 +0,0 @@ -REM ******** set the variables ************ -call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" -call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" - -copy ..\..\..\wrappers\C#\Example.cs -erase *_wrap.cpp - -swig.exe -csharp -dllimport "CoolProp" -c++ -outcurrentdir ../../../CoolProp/CoolProp.i -if %errorlevel% neq 0 exit /b %errorlevel% -cl /c /I../../../CoolProp /EHsc CoolProp_wrap.cxx -if %errorlevel% neq 0 exit /b %errorlevel% - -REM ******* compile all the sources *************** -cl /c /I../../../CoolProp /EHsc ../../../CoolProp/*.cpp -if %errorlevel% neq 0 exit /b %errorlevel% -link /DLL CoolProp_wrap.obj *.obj /OUT:CoolProp.dll -if %errorlevel% neq 0 exit /b %errorlevel% - -erase *.obj -erase CoolProp_wrap.cxx -erase CoolProp.lib -erase CoolProp.exp - -call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" -csc *.cs /platform:x86 -if %errorlevel% neq 0 exit /b %errorlevel% -call Example > Output.txt - -REM cleanup -erase *.cs -erase Example.exe -erase CoolProp.dll -copy ..\..\..\wrappers\C#\Example.cs \ No newline at end of file diff --git a/Web/coolprop/examples/Java/Example.java b/Web/coolprop/examples/Java/Example.java deleted file mode 100644 index de9dce00..00000000 --- a/Web/coolprop/examples/Java/Example.java +++ /dev/null @@ -1,101 +0,0 @@ -// Example for Java -// Ian Bell, 2013 - -public class Example { - static { - System.loadLibrary("CoolProp"); - } - - public static void main(String argv[]){ - - double T, h, p, D; - int SI,KSI; - System.out.println("CoolProp version: " + CoolProp.get_global_param_string("version")); - System.out.println("CoolProp gitrevision: " + CoolProp.get_global_param_string("gitrevision")); - System.out.println("CoolProp fluids: " + CoolProp.get_global_param_string("FluidsList")); - - System.out.println(" "); - System.out.println("************ USING EOS *************"); - System.out.println(" "); - System.out.println("FLUID STATE INDEPENDENT INPUTS"); - System.out.println("Critical Density Propane: " + CoolProp.Props1("Propane", "rhocrit") + "kg/m^3"); - System.out.println("TWO PHASE INPUTS (Pressure)"); - System.out.println("Density of saturated liquid Propane at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 0, "Propane") + " kg/m^3"); - System.out.println("Density of saturated vapor R290 at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 1, "R290") + " kg/m^3"); - System.out.println("TWO PHASE INPUTS (Temperature)"); - System.out.println("Density of saturated liquid Propane at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 0, "Propane") + " kg/m^3"); - System.out.println("Density of saturated vapor R290 at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 1, "R290") + " kg/m^3"); - System.out.println("SINGLE PHASE CYCLE (propane)"); - p = CoolProp.Props("P", 'T', 300, 'D', 1, "Propane"); - h = CoolProp.Props("H", 'T', 300, 'D', 1, "Propane"); - System.out.println("T,D -> P,H " + 300 + "," + 1 + " --> " + p + ',' + h); - T = CoolProp.Props("T", 'P', p, 'H', h, "Propane"); - D = CoolProp.Props("D", 'P', p, 'H', h, "Propane"); - System.out.println("P,H -> T,D " + p + ',' + h + " --> " + T + ',' + D); - - System.out.println(" "); - System.out.println("************ USING TTSE ***************"); - System.out.println(" "); - CoolProp.enable_TTSE_LUT("Propane"); - System.out.println("TWO PHASE INPUTS (Pressure)"); - System.out.println("Density of saturated liquid Propane at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 0, "Propane") + " kg/m^3"); - System.out.println("Density of saturated vapor R290 at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 1, "R290") + " kg/m^3"); - System.out.println("TWO PHASE INPUTS (Temperature)"); - System.out.println("Density of saturated liquid Propane at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 0, "Propane") + " kg/m^3"); - System.out.println("Density of saturated vapor R290 at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 1, "R290") + " kg/m^3"); - System.out.println("SINGLE PHASE CYCLE (propane)"); - p = CoolProp.Props("P", 'T', 300, 'D', 1, "Propane"); - h = CoolProp.Props("H", 'T', 300, 'D', 1, "Propane"); - System.out.println("T,D -> P,H " + 300 + ","+ 1+ " --> " + p + ',' + h); - T = CoolProp.Props("T", 'P', p, 'H', h, "Propane"); - D = CoolProp.Props("D", 'P', p, 'H', h, "Propane"); - System.out.println("P,H -> T,D " + p + ',' + h + " --> " + T + ',' + D); - CoolProp.disable_TTSE_LUT("Propane"); - - try - { - System.out.println(" "); - System.out.println("************ USING REFPROP ***************"); - System.out.println(" "); - System.out.println("TWO PHASE INPUTS (Pressure)"); - System.out.println("Density of saturated liquid Propane at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 0, "Propane") + " kg/m^3"); - System.out.println("Density of saturated vapor R290 at 101.325 kPa: " + CoolProp.Props("D", 'P', 101.325, 'Q', 1, "R290") + " kg/m^3"); - System.out.println("TWO PHASE INPUTS (Temperature)"); - System.out.println("Density of saturated liquid Propane at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 0, "Propane") + " kg/m^3"); - System.out.println("Density of saturated vapor R290 at 300 K: " + CoolProp.Props("D", 'T', 300, 'Q', 1, "R290") + " kg/m^3"); - System.out.println("SINGLE PHASE CYCLE (propane)"); - p = CoolProp.Props("P",'T',300,'D',1,"Propane"); - h = CoolProp.Props("H",'T',300,'D',1,"Propane"); - System.out.println("T,D -> P,H " + 300 + "," + 1 + " --> " + p + ',' + h); - T = CoolProp.Props("T",'P',p,'H',h,"Propane"); - D = CoolProp.Props("D",'P',p,'H',h,"Propane"); - System.out.println("P,H -> T,D " + p + ',' + h + " --> " + T + ',' + D); - } - catch(Exception e) - { - System.out.println(" "); - System.out.println("************ CANT USE REFPROP ************"); - System.out.println(" "); - } - - System.out.println(" "); - System.out.println("************ CHANGE UNIT SYSTEM (default is kSI) *************"); - System.out.println(" "); - CoolProp.set_standard_unit_system(unit_systems.UNIT_SYSTEM_SI.swigValue()); - System.out.println("Vapor pressure of water at 373.15 K in SI units (Pa): " + CoolProp.Props("P", 'T', 373.15, 'Q', 0, "Water")); - CoolProp.set_standard_unit_system(unit_systems.UNIT_SYSTEM_KSI.swigValue()); - System.out.println("Vapor pressure of water at 373.15 K in kSI units (kPa): " + CoolProp.Props("P", 'T', 373.15, 'Q', 0, "Water")); - - System.out.println(" "); - System.out.println("************ BRINES AND SECONDARY WORKING FLUIDS *************"); - System.out.println(" "); - System.out.println("Density of 50% (mass) ethylene glycol/water at 300 K, 101.325 kPa: " + CoolProp.Props("D", 'T', 300, 'P', 101.325, "INCOMP::MEG-50%") + "kg/m^3"); - System.out.println("Viscosity of Therminol D12 at 350 K, 101.325 kPa: " + CoolProp.Props("V", 'T', 350, 'P', 101.325, "INCOMP::TD12") + "Pa-s"); - - System.out.println(" "); - System.out.println("************ HUMID AIR PROPERTIES *************"); - System.out.println(" "); - System.out.println("Humidity ratio of 50% rel. hum. air at 300 K, 101.325 kPa: " + CoolProp.HAProps("W", "T", 300, "P", 101.325, "R", 0.5) + " kg_w/kg_da"); - System.out.println("Relative humidity from last calculation: " + CoolProp.HAProps("R", "T", 300, "P", 101.325, "W", CoolProp.HAProps("W", "T", 300, "P", 101.325, "R", 0.5)) + "(fractional)"); - } -} \ No newline at end of file diff --git a/Web/coolprop/examples/Java/Output.txt b/Web/coolprop/examples/Java/Output.txt deleted file mode 100644 index be4c3626..00000000 --- a/Web/coolprop/examples/Java/Output.txt +++ /dev/null @@ -1,57 +0,0 @@ -CoolProp version: 4.1.2 -CoolProp gitrevision: 016d3219602f0ea2e5eac89f21b3ab0e54cdc941 -CoolProp fluids: Water,R134a,Helium,Oxygen,Hydrogen,ParaHydrogen,OrthoHydrogen,Argon,CarbonDioxide,Nitrogen,n-Propane,Ammonia,R1234yf,R1234ze(E),R32,R22,SES36,Ethylene,SulfurHexafluoride,Ethanol,DimethylEther,DimethylCarbonate,R143a,R23,n-Dodecane,Propylene,Cyclopentane,R236FA,R236EA,R227EA,R365MFC,R161,HFE143m,Benzene,n-Undecane,R125,CycloPropane,Neon,R124,Propyne,Fluorine,Methanol,RC318,R21,R114,R13,R14,R12,R113,R1234ze(Z),R1233zd(E),AceticAcid,R245fa,R41,CarbonMonoxide,CarbonylSulfide,n-Decane,HydrogenSulfide,Isopentane,Neopentane,Isohexane,Krypton,n-Nonane,Toluene,Xenon,R116,Acetone,NitrousOxide,SulfurDioxide,R141b,R142b,R218,Methane,Ethane,n-Butane,IsoButane,n-Pentane,n-Hexane,n-Heptane,n-Octane,CycloHexane,R152A,R123,R11,MDM,MD2M,MD3M,D6,MM,MD4M,D4,D5,1-Butene,IsoButene,cis-2-Butene,trans-2-Butene,MethylPalmitate,MethylStearate,MethylOleate,MethylLinoleate,MethylLinolenate,o-Xylene,m-Xylene,p-Xylene,EthylBenzene,Deuterium,ParaDeuterium,OrthoDeuterium,Air,R404A,R410A,R407C,R507A,R407F - -************ USING EOS ************* - -FLUID STATE INDEPENDENT INPUTS -Critical Density Propane: 220.4781kg/m^3 -TWO PHASE INPUTS (Pressure) -Density of saturated liquid Propane at 101.325 kPa: 580.8829519548196 kg/m^3 -Density of saturated vapor R290 at 101.325 kPa: 2.4161360087881647 kg/m^3 -TWO PHASE INPUTS (Temperature) -Density of saturated liquid Propane at 300 K: 489.4473752519588 kg/m^3 -Density of saturated vapor R290 at 300 K: 21.629532018462186 kg/m^3 -SINGLE PHASE CYCLE (propane) -T,D -> P,H 300,1 --> 56.07276274829289,634.7336259284773 -P,H -> T,D 56.07276274829289,634.7336259284773 --> 300.00000000000017,0.9999999999999992 - -************ USING TTSE *************** - -TWO PHASE INPUTS (Pressure) -0.171 to build both two phase tables -Density of saturated liquid Propane at 101.325 kPa: 580.882952265689 kg/m^3 -Density of saturated vapor R290 at 101.325 kPa: 2.416136006551446 kg/m^3 -TWO PHASE INPUTS (Temperature) -Density of saturated liquid Propane at 300 K: 489.44737744117043 kg/m^3 -Density of saturated vapor R290 at 300 K: 21.62953187730398 kg/m^3 -SINGLE PHASE CYCLE (propane) -T,D -> P,H 300,1 --> 56.07276440582185,634.733625854333 -P,H -> T,D 56.07276440582185,634.733625854333 --> 299.99999990675275,0.9999999797332718 - -************ USING REFPROP *************** - -TWO PHASE INPUTS (Pressure) -Density of saturated liquid Propane at 101.325 kPa: 580.8829519548196 kg/m^3 -Density of saturated vapor R290 at 101.325 kPa: 2.4161360087881647 kg/m^3 -TWO PHASE INPUTS (Temperature) -Density of saturated liquid Propane at 300 K: 489.4473752519588 kg/m^3 -Density of saturated vapor R290 at 300 K: 21.629532018462186 kg/m^3 -SINGLE PHASE CYCLE (propane) -T,D -> P,H 300,1 --> 56.07276274829289,634.7336259284773 -P,H -> T,D 56.07276274829289,634.7336259284773 --> 300.00000000000017,0.9999999999999992 - -************ CHANGE UNIT SYSTEM (default is kSI) ************* - -Vapor pressure of water at 373.15 K in SI units (Pa): 101417.9966599521 -Vapor pressure of water at 373.15 K in kSI units (kPa): 101.4179966599521 - -************ BRINES AND SECONDARY WORKING FLUIDS ************* - -Density of 50% (mass) ethylene glycol/water at 300 K, 101.325 kPa: 1061.1793077204613kg/m^3 -Viscosity of Therminol D12 at 350 K, 101.325 kPa: 5.228849410507948E-4Pa-s - -************ HUMID AIR PROPERTIES ************* - -Humidity ratio of 50% rel. hum. air at 300 K, 101.325 kPa: 0.011096223750095191 kg_w/kg_da -Relative humidity from last calculation: 0.49999999999999994(fractional) diff --git a/Web/coolprop/examples/Java/example.rst b/Web/coolprop/examples/Java/example.rst deleted file mode 100644 index bdfcccbd..00000000 --- a/Web/coolprop/examples/Java/example.rst +++ /dev/null @@ -1,11 +0,0 @@ -Example Code for Java -===================== - -Code ----- -.. literalinclude:: Example.java - :language: java - -Output ------- -.. literalinclude:: Output.txt \ No newline at end of file diff --git a/Web/coolprop/examples/Java/run_example.bat b/Web/coolprop/examples/Java/run_example.bat deleted file mode 100644 index 6476abbc..00000000 --- a/Web/coolprop/examples/Java/run_example.bat +++ /dev/null @@ -1,31 +0,0 @@ - -@echo on -copy ..\..\..\wrappers\Java\Example.java Example.java - -REM ******** set the variables ************ -call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" -call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" - -REM ******* compile all the sources *************** -swig -java -c++ -outcurrentdir ../../../CoolProp/CoolProp.i -if %errorlevel% neq 0 exit /b %errorlevel% -cl /c /I../../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc *.cxx -if %errorlevel% neq 0 exit /b %errorlevel% -cl /c /I../../../CoolProp /I"C:\Program Files\Java\jdk1.7.0_40\include" /I"C:\Program Files\Java\jdk1.7.0_40\include\win32" /EHsc ../../../CoolProp/*.cpp -if %errorlevel% neq 0 exit /b %errorlevel% -link /DLL *.obj /OUT:CoolProp.dll -if %errorlevel% neq 0 exit /b %errorlevel% -erase *.obj -erase *.exp -erase *.lib - -javac *.java -if %errorlevel% neq 0 exit /b %errorlevel% -java Example > Output.txt -if %errorlevel% neq 0 exit /b %errorlevel% - -erase *.java -erase *.class -erase CoolProp.dll -erase CoolProp_wrap.cxx -copy ..\..\..\wrappers\Java\Example.java Example.java \ No newline at end of file diff --git a/Web/coolprop/wrappers/Csharp/Example.cs b/Web/coolprop/wrappers/Csharp/Example.cs index da6bdba8..51a6c437 100644 --- a/Web/coolprop/wrappers/Csharp/Example.cs +++ b/Web/coolprop/wrappers/Csharp/Example.cs @@ -83,7 +83,7 @@ namespace ConsoleApplication1 Console.Write(" " + "\n"); Console.Write("************ BRINES AND SECONDARY WORKING FLUIDS *************" + "\n"); Console.Write(" " + "\n"); - Console.Write("Density of 50% (mass) ethylene glycol/water at 300 K, 101325 Pa: " + CoolProp.PropsSI("D", "T", 300, "P", 101325, "EG-50%") + " kg/m^3" + "\n"); + Console.Write("Density of 50% (mass) ethylene glycol/water at 300 K, 101325 Pa: " + CoolProp.PropsSI("D", "T", 300, "P", 101325, "INCOMP::MEG-50%") + " kg/m^3" + "\n"); Console.Write("Viscosity of Therminol D12 at 350 K, 101325 kPa: " + CoolProp.PropsSI("V", "T", 350, "P", 101325, "INCOMP::TD12") + " Pa-s" + "\n"); Console.Write(" " + "\n"); diff --git a/Web/coolprop/wrappers/Java/Example.java b/Web/coolprop/wrappers/Java/Example.java index 4452d36e..d984f264 100644 --- a/Web/coolprop/wrappers/Java/Example.java +++ b/Web/coolprop/wrappers/Java/Example.java @@ -60,7 +60,7 @@ public class Example { System.out.println(" "); System.out.println("************ BRINES AND SECONDARY WORKING FLUIDS *************"); System.out.println(" "); - System.out.println("Density of 50% (mass) ethylene glycol/water at 300 K, 101325 kPa: " + CoolProp.PropsSI("D", "T", 300, "P", 101325, "EG-50%") + "kg/m^3"); + System.out.println("Density of 50% (mass) ethylene glycol/water at 300 K, 101325 kPa: " + CoolProp.PropsSI("D", "T", 300, "P", 101325, "INCOMP::MEG-50%") + "kg/m^3"); System.out.println("Viscosity of Therminol D12 at 350 K, 101325 kPa: " + CoolProp.PropsSI("V", "T", 350, "P", 101325, "TD12") + "Pa-s"); //~ System.out.println(" ");