- * dataHandeling class. + * DataHandling class. *
* * @author Even Solbraa * @version $Id: $Id */ -public class DataHandeling { - static Logger logger = LogManager.getLogger(DataHandeling.class); +public class DataHandling { + static Logger logger = LogManager.getLogger(DataHandling.class); /** *- * Constructor for dataHandeling. + * Constructor for DataHandling. *
*/ - public DataHandeling() {} + public DataHandling() {} /** * Returns the number of items in the specified series. diff --git a/src/main/java/neqsim/datapresentation/filehandeling/createtextfile/TextFile.java b/src/main/java/neqsim/datapresentation/filehandling/TextFile.java similarity index 97% rename from src/main/java/neqsim/datapresentation/filehandeling/createtextfile/TextFile.java rename to src/main/java/neqsim/datapresentation/filehandling/TextFile.java index 51219916f..fc3d09862 100644 --- a/src/main/java/neqsim/datapresentation/filehandeling/createtextfile/TextFile.java +++ b/src/main/java/neqsim/datapresentation/filehandling/TextFile.java @@ -1,4 +1,4 @@ -package neqsim.datapresentation.filehandeling.createtextfile; +package neqsim.datapresentation.filehandling; import java.io.File; import java.io.FileWriter; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java index 10b53543f..123a4aa2d 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java @@ -756,8 +756,8 @@ public String[][] createTable(String name) { @Override public void write(String name, String filename, boolean newfile) { String[][] table = createTable(name); - neqsim.datapresentation.filehandeling.createtextfile.TextFile file = - new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); + neqsim.datapresentation.filehandling.TextFile file = + new neqsim.datapresentation.filehandling.TextFile(); if (newfile) { file.newFile(filename); } diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java index ccbdfb530..8edd78dcd 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java @@ -504,8 +504,8 @@ public void display(String name) { @Override public void write(String name, String filename, boolean newfile) { String[][] table = createTable(name); - neqsim.datapresentation.filehandeling.createtextfile.TextFile file = - new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); + neqsim.datapresentation.filehandling.TextFile file = + new neqsim.datapresentation.filehandling.TextFile(); if (newfile) { file.newFile(filename); } diff --git a/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualization.java index 44d475770..65479d763 100644 --- a/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualization.java @@ -69,12 +69,6 @@ public void setNextData(FlowSystemInterface system, double abstime) { time++; } - /* - * public void createNetCdfFile(String name) { System.out.println("ok..."); for (int j = 0; j < - * time; j++) { for (int i = 0; i < flowNodes[j].length; i++) { System.out.println("time " + time - * + " pres " + flowNodes[j][i].getPressure(0)); } } } - */ - /** {@inheritDoc} */ @Override public void setPoints() {} diff --git a/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization/PipeFlowVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization/PipeFlowVisualization.java index 85667a4fe..a2b502e84 100644 --- a/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization/PipeFlowVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization/PipeFlowVisualization.java @@ -155,8 +155,8 @@ public void displayResult(String name) { /* * public void createNetCdfFile(String name) { calcPoints(name); - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF3D.NetCdf3D file = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF3D.NetCdf3D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF3D.NetCdf3D file = new + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF3D.NetCdf3D(); * file.setOutputFileName(name); file.setXvalues(timeArray, "time", "sec"); * file.setYvalues(xPlace, "length", "meter"); file.setZvalues(temperaturePoint, * "temperature [K]", "sec"); file.setZvalues(pressurePoint, "pressure [bar]", "sec"); diff --git a/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization/TwoPhasePipeFlowVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization/TwoPhasePipeFlowVisualization.java index 2b076f802..5ea7caf1a 100644 --- a/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization/TwoPhasePipeFlowVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization/TwoPhasePipeFlowVisualization.java @@ -148,8 +148,8 @@ public void displayResult(String name) { } // public void createNetCdfFile(String name){ - // dataPresentation.fileHandeling.createNetCDF.NetCdf file = new - // dataPresentation.fileHandeling.createNetCDF.NetCdf(); + // dataPresentation.filehandling.createNetCDF.NetCdf file = new + // dataPresentation.filehandling.createNetCDF.NetCdf(); // file.setOutputFileName(name); // file.setXvalues(timeArray,"time","sec"); // file.setYvalues(xPlace, "length","meter"); @@ -159,8 +159,8 @@ public void displayResult(String name) { /* * public void createNetCdfFile(String name) { setPoints(); - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D file = new + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D(); * file.setOutputFileName(name); file.setXvalues(xPlace, "length", "meter"); * file.setYvalues(pressurePoint[0][0], "gas pressure", "sec"); * file.setYvalues(pressurePoint[1][0], "liquid pressure", "sec"); diff --git a/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java b/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java index f42b1483c..801dad610 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java +++ b/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java @@ -697,8 +697,8 @@ public String[][] reportResults() { * @param filename a {@link java.lang.String} object */ public void printLogFile(String filename) { - neqsim.datapresentation.filehandeling.createtextfile.TextFile tempFile = - new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); + neqsim.datapresentation.filehandling.TextFile tempFile = + new neqsim.datapresentation.filehandling.TextFile(); tempFile.setOutputFileName(filename); tempFile.setValues(signalDB); tempFile.createFile(); diff --git a/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java b/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java index 20a3b2274..eb058f7a2 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java +++ b/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java @@ -698,8 +698,8 @@ public void calcDeviation() { /** {@inheritDoc} */ @Override public void writeToTextFile(String name) { - neqsim.datapresentation.filehandeling.createtextfile.TextFile tempfile = - new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); + neqsim.datapresentation.filehandling.TextFile tempfile = + new neqsim.datapresentation.filehandling.TextFile(); tempfile.setOutputFileName(name); tempfile.setValues(valTable); tempfile.createFile(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java index 2d3d64da5..dfc5fb49b 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java @@ -76,8 +76,7 @@ public class PhaseElectrolyteCPA extends PhaseModifiedFurstElectrolyteEos * Constructor for PhaseElectrolyteCPA. * */ - public PhaseElectrolyteCPA() { - } + public PhaseElectrolyteCPA() {} /** {@inheritDoc} */ @Override @@ -885,8 +884,8 @@ public double calcRootVolFinder(PhaseType pt) { if (solvedBonVlow < 1e-3) { solvedBonVlow = solvedBonVHigh; } - // dataPresentation.fileHandeling.createTextFile.TextFile file = new - // dataPresentation.fileHandeling.createTextFile.TextFile(); + // dataPresentation.filehandling.TextFile file = new + // dataPresentation.filehandling.TextFile(); // file.setValues(matrix); // file.setOutputFileName("D:/temp/temp2.txt"); // file.createFile(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java index 193ae519f..9c67e2c3b 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java @@ -1055,8 +1055,8 @@ public double calcRootVolFinder(PhaseType pt) { if (solvedBonVlow < 1e-3) { solvedBonVlow = solvedBonVHigh; } - // dataPresentation.fileHandeling.createTextFile.TextFile file = new - // dataPresentation.fileHandeling.createTextFile.TextFile(); + // dataPresentation.filehandling.TextFile file = new + // dataPresentation.filehandling.TextFile(); // file.setValues(matrix); // file.setOutputFileName("D:/temp/temp2.txt"); // file.createFile(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java index 7dba0ae82..5b72792bc 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java @@ -74,8 +74,7 @@ public class PhaseSrkCPA_proceduralMatrices extends PhaseSrkEos implements Phase * Constructor for PhaseSrkCPA_proceduralMatrices. * */ - public PhaseSrkCPA_proceduralMatrices() { - } + public PhaseSrkCPA_proceduralMatrices() {} /** {@inheritDoc} */ @Override @@ -1048,8 +1047,8 @@ public double calcRootVolFinder(PhaseType pt) { if (solvedBonVlow < 1e-3) { solvedBonVlow = solvedBonVHigh; } - // dataPresentation.fileHandeling.createTextFile.TextFile file = new - // dataPresentation.fileHandeling.createTextFile.TextFile(); + // dataPresentation.filehandling.TextFile file = new + // dataPresentation.filehandling.TextFile(); // file.setValues(matrix); // file.setOutputFileName("D:/temp/temp2.txt"); // file.createFile(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java index 24cbaa70c..9fbe76787 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java @@ -1198,8 +1198,8 @@ public double calcRootVolFinder(PhaseType pt) { if (solvedBonVlow < 1e-3) { solvedBonVlow = solvedBonVHigh; } - // dataPresentation.fileHandeling.createTextFile.TextFile file = new - // dataPresentation.fileHandeling.createTextFile.TextFile(); + // dataPresentation.filehandling.TextFile file = new + // dataPresentation.filehandling.TextFile(); // file.setValues(matrix); // file.setOutputFileName("D:/temp/temp2.txt"); // file.createFile(); diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index 608b65350..1ce200318 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -5028,8 +5028,8 @@ public String write() { @Override public void write(String name, String filename, boolean newfile) { String[][] table = createTable(name); - neqsim.datapresentation.filehandeling.createtextfile.TextFile file = - new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); + neqsim.datapresentation.filehandling.TextFile file = + new neqsim.datapresentation.filehandling.TextFile(); if (newfile) { file.newFile(filename); } diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java index 28adbfd85..2923bd82f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java @@ -506,12 +506,12 @@ public void run() { /* * try { if (outputToFile) { // update this String name1 = new String(); name1 = fileName + * "Dew.nc"; file1 = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D(); * file1.setOutputFileName(name1); file1.setXvalues(points2[2], "temp", "sec"); * file1.setYvalues(points2[3], "pres", "meter"); file1.createFile(); * * String name2 = new String(); name2 = fileName + "Bub.nc"; file2 = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D(); * file2.setOutputFileName(name2); file2.setXvalues(points2[0], "temp", "sec"); * file2.setYvalues(points2[1], "pres", "meter"); file2.createFile(); } } catch (Exception e3) * { logger.error(ex.getMessage(), e3); } diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java index 701d43d3d..e58a0578f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java @@ -312,12 +312,12 @@ public void run() { mainFrame.setVisible(false); /* * if (outputToFile) { String name1 = new String(); name1 = fileName + "Dew.nc"; file1 = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D(); * file1.setOutputFileName(name1); file1.setXvalues(points2[2], "temp", "sec"); * file1.setYvalues(points2[3], "pres", "meter"); file1.createFile(); * * String name2 = new String(); name2 = fileName + "Bub.nc"; file2 = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D(); * file2.setOutputFileName(name2); file2.setXvalues(points2[0], "temp", "sec"); * file2.setYvalues(points2[1], "pres", "meter"); file2.createFile(); } */ diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java index 1887e37b7..19be4baf6 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java @@ -463,12 +463,12 @@ public void run() { /* * try { if (outputToFile) { // update this String name1 = new String(); name1 = fileName + * "Dew.nc"; file1 = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D(); * file1.setOutputFileName(name1); file1.setXvalues(points2[2], "temp", "sec"); * file1.setYvalues(points2[3], "pres", "meter"); file1.createFile(); * * String name2 = new String(); name2 = fileName + "Bub.nc"; file2 = new - * neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D(); + * neqsim.dataPresentation.filehandling.createNetCDF.netCDF2D.NetCdf2D(); * file2.setOutputFileName(name2); file2.setXvalues(points2[0], "temp", "sec"); * file2.setYvalues(points2[1], "pres", "meter"); file2.createFile(); } } catch (Exception e3) * { // double nef = 0.; logger.error(ex.getMessage(), e3); } diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java index 4765696f4..938f36d89 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java @@ -148,7 +148,7 @@ public void displayResult() { /** {@inheritDoc} */ @Override public void printToFile(String name) { - neqsim.datapresentation.DataHandeling printDat = new neqsim.datapresentation.DataHandeling(); + neqsim.datapresentation.DataHandling printDat = new neqsim.datapresentation.DataHandling(); printDat.printToFile(points, name); } diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java index 52f6ab9eb..716fd8a92 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java @@ -151,7 +151,7 @@ public void displayResult() { /** {@inheritDoc} */ @Override public void printToFile(String name) { - neqsim.datapresentation.DataHandeling printDat = new neqsim.datapresentation.DataHandeling(); + neqsim.datapresentation.DataHandling printDat = new neqsim.datapresentation.DataHandling(); printDat.printToFile(points, name); } diff --git a/src/test/java/neqsim/thermo/util/example/SolidFlash.java b/src/test/java/neqsim/thermo/util/example/SolidFlash.java index 7261ef25c..de25b6446 100644 --- a/src/test/java/neqsim/thermo/util/example/SolidFlash.java +++ b/src/test/java/neqsim/thermo/util/example/SolidFlash.java @@ -30,7 +30,7 @@ public static void main(String args[]) { // SystemInterface testSystem = new SystemSrkTwuCoonEos(273.15 - 165, 1.0); // SystemInterface testSystem = new SystemPrEos(91.617,1.1168013258); ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); - // dataHandeling output = new dataHandeling(); + // DataHandling output = new DataHandling(); // testSystem.addComponent("water", 1.0-0.1525); testSystem.addComponent("methane", 121.8); // testSystem.addComponent("ethane", 0.05);