Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pkg name #1137

Merged
merged 2 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,26 @@
import java.io.File;
import java.io.FileOutputStream;
import java.text.DecimalFormat;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

/**
* <p>
* dataHandeling class.
* DataHandling class.
* </p>
*
* @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);

/**
* <p>
* Constructor for dataHandeling.
* Constructor for DataHandling.
* </p>
*/
public DataHandeling() {}
public DataHandling() {}

/**
* Returns the number of items in the specified series.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.datapresentation.filehandeling.createtextfile;
package neqsim.datapresentation.filehandling;

import java.io.File;
import java.io.FileWriter;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.chungMethod;
package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.chungmethod;

import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.chungMethod;
package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.chungmethod;

import java.sql.ResultSet;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ public class PhaseElectrolyteCPA extends PhaseModifiedFurstElectrolyteEos
* Constructor for PhaseElectrolyteCPA.
* </p>
*/
public PhaseElectrolyteCPA() {
}
public PhaseElectrolyteCPA() {}

/** {@inheritDoc} */
@Override
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ public class PhaseSrkCPA_proceduralMatrices extends PhaseSrkEos implements Phase
* Constructor for PhaseSrkCPA_proceduralMatrices.
* </p>
*/
public PhaseSrkCPA_proceduralMatrices() {
}
public PhaseSrkCPA_proceduralMatrices() {}

/** {@inheritDoc} */
@Override
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/neqsim/thermo/system/SystemThermo.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(); }
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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); }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/neqsim/thermo/util/example/SolidFlash.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down