diff --git a/pom.xml b/pom.xml
index 7384997bab..10d524871b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,11 +20,6 @@
central
https://repo1.maven.org/maven2/
-
- unidata-all
- Unidata All
- https://artifacts.unidata.ucar.edu/repository/unidata-all/
-
@@ -70,11 +65,6 @@
ejml-all
0.41
-
- com.lowagie
- itext
- 1.4.8
-
gov.nist.math
jama
@@ -95,24 +85,12 @@
mtj
1.0.4
-
-
- edu.ucar
- netcdf4
- 4.6.16.1
-
org.ojalgo
ojalgo
48.4.2
provided
-
- edu.wisc.ssec
- visad
- 2.0-20130124
- provided
-
diff --git a/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/NetCdf.java b/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/NetCdf.java
deleted file mode 100644
index 4057c45236..0000000000
--- a/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/NetCdf.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * NetCdf.java
- *
- * Created on 5. august 2001, 21:52
- */
-package neqsim.dataPresentation.fileHandeling.createNetCDF;
-
-import java.io.IOException;
-import ucar.ma2.Array;
-import ucar.nc2.Dimension;
-import ucar.nc2.NetcdfFileWriteable;
-
-/**
- *
- * NetCdf class.
- *
- *
- * @author esol
- * @version $Id: $Id
- */
-@SuppressWarnings("deprecation")
-public class NetCdf implements java.io.Serializable {
- private static final long serialVersionUID = 1000;
-
- String fileName = "c:/temp/example.nc";
- double[] xvalues = new double[3];
- String xName = "xDefault", yName = "yDefault", zName = "zDefault";
- double[] yvalues = new double[4];
- double[][] zvalues = new double[4][4];
- NetcdfFileWriteable ncfile;
-
- /**
- *
- * Constructor for NetCdf.
- *
- */
- public NetCdf() {}
-
- /**
- *
- * setOutputFileName.
- *
- *
- * @param name a {@link java.lang.String} object
- */
- public void setOutputFileName(String name) {
- fileName = name;
- }
-
- /**
- *
- * Setter for the field xvalues
.
- *
- *
- * @param x an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setXvalues(double[] x, String name, String unit) {
- xvalues = x;
- xName = name;
- }
-
- /**
- *
- * Setter for the field yvalues
.
- *
- *
- * @param y an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setYvalues(double[] y, String name, String unit) {
- yvalues = y;
- yName = name;
- }
-
- /**
- *
- * Setter for the field zvalues
.
- *
- *
- * @param z an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setZvalues(double[][] z, String name, String unit) {
- zvalues = z;
- zName = name;
- }
-
- /**
- *
- * createFile.
- *
- */
- public void createFile() {
- ncfile = new NetcdfFileWriteable();
- ncfile.setName(fileName);
-
- Dimension latD = ncfile.addDimension(xName, xvalues.length);
- Dimension lonD = ncfile.addDimension(yName, yvalues.length);
-
- Dimension[] dim2 = new Dimension[2];
- dim2[0] = latD;
- dim2[1] = lonD;
-
- ncfile.addVariable("T", double.class, dim2);
- ncfile.addVariableAttribute("T", "long_name", "surface temperature");
- ncfile.addVariableAttribute("T", "units", "degC");
-
- ncfile.addVariable(latD.getName(), double.class, new Dimension[] {latD});
- ncfile.addVariableAttribute(latD.getName(), "units", "degrees_north");
-
- ncfile.addVariable(lonD.getName(), double.class, new Dimension[] {lonD});
- ncfile.addVariableAttribute(lonD.getName(), "units", "degrees_east");
-
- ncfile.addGlobalAttribute("title", "Example Data");
-
- try {
- ncfile.create();
- } catch (IOException e) {
- System.err.println("ERROR creating file");
- }
-
- try {
- ncfile.write("T", Array.factory(zvalues));
- ncfile.write(latD.getName(), Array.factory(xvalues));
- ncfile.write(lonD.getName(), Array.factory(yvalues));
- } catch (Exception e) {
- System.err.println("ERROR writing file");
- }
-
- try {
- ncfile.close();
- } catch (IOException e) {
- }
- System.out.println("created " + fileName + " successfully");
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/netCDF2D/NetCdf2D.java b/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/netCDF2D/NetCdf2D.java
deleted file mode 100644
index 5e211c2c16..0000000000
--- a/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/netCDF2D/NetCdf2D.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import ucar.ma2.Array;
-import ucar.nc2.Dimension;
-import ucar.nc2.NetcdfFileWriter;
-import ucar.nc2.Variable;
-
-/**
- *
- * NetCdf2D class.
- *
- *
- * @author esol
- * @version $Id: $Id
- */
-public class NetCdf2D {
- String fileName = "c:/temp/example.nc";
- double[] xvalues = new double[3];
- String xName = "xDefault", yName = "yDefault", zName = "zDefault";
- double[] yvalues = new double[3];
- double[][] yvalues2 = new double[1000][3];
- String[] yName2 = new String[1000];
- NetcdfFileWriter ncfile;
- int yLength = 0;
-
- /**
- *
- * Constructor for NetCdf2D.
- *
- */
- public NetCdf2D() {}
-
- /**
- *
- * setOutputFileName.
- *
- *
- * @param name a {@link java.lang.String} object
- */
- public void setOutputFileName(String name) {
- fileName = name;
- }
-
- /**
- *
- * Setter for the field xvalues
.
- *
- *
- * @param x an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setXvalues(double[] x, String name, String unit) {
- xvalues = x;
- xName = name;
- }
-
- /**
- *
- * Setter for the field yvalues
.
- *
- *
- * @param y an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setYvalues(double[] y, String name, String unit) {
- yvalues = y;
- yName = name;
-
- yvalues2[yLength] = y;
- yName2[yLength] = name;
- yLength++;
- }
-
- /**
- *
- * createFile.
- *
- */
- @SuppressWarnings("deprecation")
- public void createFile() {
- try {
- ncfile = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, fileName, null);
- } catch (IOException e) {
- System.err.println("ERROR creating file");
- }
- Dimension latD = ncfile.addDimension(null, xName, xvalues.length);
- ArrayList lonD = new ArrayList();
-
- ArrayList dim2 = new ArrayList();
- dim2.add(latD);
-
- ArrayList tempdim = new ArrayList();
- tempdim.add(latD);
-
- Variable t = ncfile.addVariable(null, latD.getName(), ucar.ma2.DataType.DOUBLE, tempdim);
- // t.addAttribute(new ucar.nc2.Attribute("units", "degrees_north"));
-
- for (int i = 0; i < yLength; i++) {
- lonD.add(ncfile.addDimension(null, yName2[i], yvalues2[i].length));
- // Variable u = ncfile.addVariable(null, lonD.get(i).getName(),
- // ucar.ma2.DataType.DOUBLE, dim2);
- // u.addAttribute(new Attribute("units", "degrees_east"));
- }
-
- // ncfile.addGroupAttribute(null, new Attribute("title", "Example Data"));
-
- try {
- ncfile.create();
- } catch (IOException e) {
- System.err.println("ERROR creating file");
- }
-
- try {
- Variable v = ncfile.findVariable(latD.getName());
- ncfile.write(v, Array.factory(xvalues));
- for (int i = 0; i < yLength; i++) {
- v = ncfile.findVariable(lonD.get(i).getName());
- ncfile.write(v, Array.factory(yvalues2[i]));
- }
- } catch (Exception e) {
- System.err.println("ERROR writing file");
- }
-
- try {
- ncfile.close();
- } catch (IOException e) {
- }
- System.out.println("created " + fileName + " successfully");
- }
-
- /**
- *
- * main.
- *
- *
- * @param args an array of {@link java.lang.String} objects
- */
- public static void main(String[] args) {
- double[] x = new double[10000];// {1,2,3};
- double[] y = new double[10000];
- NetCdf2D test = new NetCdf2D();
- test.setXvalues(x, "time", "sec");
- test.setYvalues(y, "length", "meter");
- test.createFile();
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/netCDF3D/NetCdf3D.java b/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/netCDF3D/NetCdf3D.java
deleted file mode 100644
index f814ec1f2f..0000000000
--- a/src/main/java/neqsim/dataPresentation/fileHandeling/createNetCDF/netCDF3D/NetCdf3D.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF3D;
-
-import java.io.IOException;
-import ucar.ma2.Array;
-import ucar.nc2.Dimension;
-import ucar.nc2.NetcdfFileWriteable;
-
-/**
- *
- * NetCdf3D class.
- *
- *
- * @author esol
- * @version $Id: $Id
- */
-@SuppressWarnings("deprecation")
-public class NetCdf3D {
- String fileName = "c:/temp/example.nc";
- double[] xvalues = new double[3];
- String xName = "xDefault", yName = "yDefault", zName = "zDefault";
- double[] yvalues = new double[4];
- double[][] zvalues = new double[4][4];
- double[][][] zvalues2 = new double[10][4][3];
- String[] zName2 = new String[10];
- NetcdfFileWriteable ncfile;
- int zLength = 0;
-
- /**
- *
- * Constructor for NetCdf3D.
- *
- */
- public NetCdf3D() {}
-
- /**
- *
- * setOutputFileName.
- *
- *
- * @param name a {@link java.lang.String} object
- */
- public void setOutputFileName(String name) {
- fileName = name;
- }
-
- /**
- *
- * Setter for the field xvalues
.
- *
- *
- * @param x an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setXvalues(double[] x, String name, String unit) {
- xvalues = x;
- xName = name;
- }
-
- /**
- *
- * Setter for the field yvalues
.
- *
- *
- * @param y an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setYvalues(double[] y, String name, String unit) {
- yvalues = y;
- yName = name;
- }
-
- /**
- *
- * Setter for the field zvalues
.
- *
- *
- * @param z an array of {@link double} objects
- * @param name a {@link java.lang.String} object
- * @param unit a {@link java.lang.String} object
- */
- public void setZvalues(double[][] z, String name, String unit) {
- zvalues = z;
- zName = name;
-
- zName2[zLength] = name;
- zvalues2[zLength] = z;
- zLength++;
- }
-
- /**
- *
- * createFile.
- *
- */
- public void createFile() {
- ncfile = new NetcdfFileWriteable();
- ncfile.setName(fileName);
-
- Dimension latD = ncfile.addDimension(xName, xvalues.length);
- Dimension lonD = ncfile.addDimension(yName, yvalues.length);
-
- Dimension[] dim2 = new Dimension[2];
- dim2[0] = latD;
- dim2[1] = lonD;
-
- for (int i = 0; i < zLength; i++) {
- ncfile.addVariable(zName2[i], double.class, dim2);
- ncfile.addVariableAttribute(zName2[i], "long_name", "surface temperature");
- ncfile.addVariableAttribute(zName2[i], "units", "degC");
- }
-
- ncfile.addVariable(latD.getName(), double.class, new Dimension[] {latD});
- ncfile.addVariableAttribute(latD.getName(), "units", "degrees_north");
-
- ncfile.addVariable(lonD.getName(), double.class, new Dimension[] {lonD});
- ncfile.addVariableAttribute(lonD.getName(), "units", "degrees_east");
-
- ncfile.addGlobalAttribute("title", "Example Data");
-
- try {
- ncfile.create();
- } catch (IOException e) {
- System.err.println("ERROR creating file");
- }
-
- try {
- for (int i = 0; i < zLength; i++) {
- ncfile.write(zName2[i], Array.factory(zvalues2[i]));
- }
- ncfile.write(latD.getName(), Array.factory(xvalues));
- ncfile.write(lonD.getName(), Array.factory(yvalues));
- } catch (Exception e) {
- System.err.println("ERROR writing file");
- }
-
- try {
- ncfile.close();
- } catch (IOException e) {
- }
- System.out.println("created " + fileName + " successfully");
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/iTextPDF/PdfCreator.java b/src/main/java/neqsim/dataPresentation/iTextPDF/PdfCreator.java
deleted file mode 100644
index 996c2e9545..0000000000
--- a/src/main/java/neqsim/dataPresentation/iTextPDF/PdfCreator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * PdfCreator.java
- *
- * Created on 12. juli 2004, 15:16
- */
-package neqsim.dataPresentation.iTextPDF;
-
-/**
- *
- * PdfCreator class.
- *
- *
- * @author ESOL
- * @version $Id: $Id
- */
-public class PdfCreator {
- // Rectangle pageSize = new Rectangle(144, 720);
- // Document document = new Document(pageSize);
- // Document document = new Document(PageSize.A5, 36, 72, 108, 180);
- com.lowagie.text.Document document = null;;
- String docName = "";
-
- public PdfCreator() {
- try {
- document = new com.lowagie.text.Document(com.lowagie.text.PageSize.A4);
- docName = "c:/temp/neqsimResults.pdf";
- if (System.getProperty("NeqSim.home") != null) {
- docName = System.getProperty("NeqSim.home") + "/work/neqsimResults.pdf";
- }
-
- com.lowagie.text.pdf.PdfWriter.getInstance(document,
- new java.io.FileOutputStream(docName));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- *
- * Getter for the field document
.
- *
- *
- * @return a {@link com.lowagie.text.Document} object
- */
- public com.lowagie.text.Document getDocument() {
- return document;
- }
-
- /**
- *
- * closeDocument.
- *
- */
- public void closeDocument() {
- document.close();
- }
-
- /**
- *
- * generatePDF.
- *
- *
- * @param thermoSystem a {@link neqsim.thermo.system.SystemInterface} object
- */
- public void generatePDF(neqsim.thermo.system.SystemInterface thermoSystem) {
- document.addTitle("NeqSim Simulation Report");
- // String temp = "Temperature " + Double.toString(thermoSystem.getTemperature());
- }
-
- /**
- *
- * openPDF.
- *
- */
- public void openPDF() {
- try {
- Runtime.getRuntime().exec("cmd.exe /C start acrord32 /h " + docName);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAd2D/statistical2DPlot/lineFitPlot.java b/src/main/java/neqsim/dataPresentation/visAD/visAd2D/statistical2DPlot/lineFitPlot.java
deleted file mode 100644
index b78b268db7..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAd2D/statistical2DPlot/lineFitPlot.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package neqsim.dataPresentation.visAD.visAd2D.statistical2DPlot;
-
-import java.rmi.RemoteException;
-import javax.swing.JFrame;
-import visad.ConstantMap;
-import visad.DataReferenceImpl;
-import visad.Display;
-import visad.DisplayImpl;
-import visad.FlatField;
-import visad.FunctionType;
-import visad.GraphicsModeControl;
-import visad.Integer1DSet;
-import visad.Irregular1DSet;
-import visad.RealTupleType;
-import visad.RealType;
-import visad.ScalarMap;
-import visad.Set;
-import visad.VisADException;
-import visad.java2d.DisplayImplJ2D;
-
-/**
- *
- * lineFitPlot class.
- *
- *
- * @author Even Solbraa
- * @version $Id: $Id
- */
-public class lineFitPlot {
- private RealType x, y, index;
-
- private RealTupleType x_y_tuple;
-
- private FunctionType func_i_tuple, func_line, func_i_tuple2;
-
- private Set x_set, index_set, index_set2;
-
- private FlatField line_ff, points_ff;
-
- private DataReferenceImpl points_ref, line_ref;
- boolean scatter = false;
- private DisplayImpl display;
- float maxX = 0, minX = 0;
- float maxY = 0, minY = 0;
-
- private ScalarMap xMap, yMap, xRangeMap;
- float[][] set_samples;
- float[][] xy_samples;
- float[][] x_line_samples, y_line_samples;
- float[][] xy_disc_samples;
-
- /**
- *
- * Constructor for lineFitPlot.
- *
- *
- * @param firstax a {@link java.lang.String} object
- * @param yax a {@link java.lang.String} object
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public lineFitPlot(String firstax, String yax) throws RemoteException, VisADException {
- x = RealType.getRealType("test1");
- y = RealType.getRealType("test");
-
- x_y_tuple = new RealTupleType(x, y);
- index = RealType.getRealType("index");
-
- func_i_tuple = new FunctionType(index, x_y_tuple);
- func_i_tuple2 = new FunctionType(index, x_y_tuple);
- }
-
- // public void setXYals(double[][] vals)throws RemoteException, VisADException{
- // xy_samples = vals;
- // }
-
- /**
- *
- * setXYVals.
- *
- *
- * @param xvals an array of {@link double} objects
- * @param yvals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setXYVals(double[] xvals, double[] yvals) throws RemoteException, VisADException {
- xy_samples = new float[2][xvals.length];
- minX = (float) xvals[0];
- maxX = (float) xvals[0];
- minY = (float) yvals[0];
- maxY = (float) yvals[0];
-
- for (int i = 0; i < xvals.length; i++) {
- xy_samples[0][i] = (float) xvals[i];
- xy_samples[1][i] = (float) yvals[i];
-
- minX = xy_samples[0][i] < minX ? xy_samples[0][i] : minX;
- maxX = xy_samples[0][i] > maxX ? xy_samples[0][i] : maxX;
- minY = xy_samples[1][i] < minY ? xy_samples[1][i] : minY;
- maxY = xy_samples[1][i] > maxY ? xy_samples[1][i] : maxY;
- }
- }
-
- /**
- *
- * setXYVals2.
- *
- *
- * @param xvals an array of {@link double} objects
- * @param yvals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setXYVals2(double[] xvals, double[] yvals) throws RemoteException, VisADException {
- scatter = true;
- y_line_samples = new float[1][yvals.length];
- x_line_samples = new float[1][xvals.length];
-
- for (int i = 0; i < xvals.length; i++) {
- x_line_samples[0][i] = (float) xvals[i];
- y_line_samples[0][i] = (float) yvals[i];
-
- minX = x_line_samples[0][i] < minX ? x_line_samples[0][i] : minX;
- maxX = x_line_samples[0][i] > maxX ? x_line_samples[0][i] : maxX;
- minY = y_line_samples[0][i] < minY ? y_line_samples[0][i] : minY;
- maxY = y_line_samples[0][i] > maxY ? y_line_samples[0][i] : maxY;
- }
- }
-
- /**
- *
- * setLineXYVals.
- *
- *
- * @param xvals an array of {@link double} objects
- * @param yvals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setLineXYVals(double[] xvals, double[] yvals)
- throws RemoteException, VisADException {
- y_line_samples = new float[1][yvals.length];
- x_line_samples = new float[1][xvals.length];
-
- for (int i = 0; i < xvals.length; i++) {
- x_line_samples[0][i] = (float) xvals[i];
- y_line_samples[0][i] = (float) yvals[i];
-
- minX = x_line_samples[0][i] < minX ? x_line_samples[0][i] : minX;
- maxX = x_line_samples[0][i] > maxX ? x_line_samples[0][i] : maxX;
- minY = y_line_samples[0][i] < minY ? y_line_samples[0][i] : minY;
- maxY = y_line_samples[0][i] > maxY ? y_line_samples[0][i] : maxY;
- }
- }
-
- /*
- * public void setContinousXVals(double[] vals)throws RemoteException, VisADException{
- * System.arraycopy(vals,0,xy_samples[0],0,vals.length); }
- *
- * public void setContinousYVals(double[] vals)throws RemoteException, VisADException{
- * System.arraycopy(vals,0,xy_samples[1],0,vals.length); }
- */
-
- /**
- *
- * init.
- *
- *
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void init() throws RemoteException, VisADException {
- index_set = new Integer1DSet(index, xy_samples[0].length);
- points_ff = new FlatField(func_i_tuple, index_set);
- points_ff.setSamples(xy_samples);
-
- if (!scatter) {
- func_line = new FunctionType(x, y);
- x_set = new Irregular1DSet(x, x_line_samples);
- line_ff = new FlatField(func_line, x_set);
- line_ff.setSamples(y_line_samples);
- } else {
- index_set2 = new Integer1DSet(index, xy_samples[0].length);
- line_ff = new FlatField(func_i_tuple, index_set);
- line_ff.setSamples(y_line_samples);
- }
-
- display = new DisplayImplJ2D("StatPlot");
-
- GraphicsModeControl dispGMC = display.getGraphicsModeControl();
- dispGMC.setScaleEnable(true);
-
- xMap = new ScalarMap(x, Display.XAxis);
- yMap = new ScalarMap(y, Display.YAxis);
-
- xRangeMap = new ScalarMap(x, Display.SelectRange);
-
- display.addMap(xMap);
- display.addMap(yMap);
- display.addMap(xRangeMap);
-
- xMap.setRange(minX - (maxX - minX) / 10.0, maxX + (maxX - minX) / 10.0);
- yMap.setRange(minY - (maxY - minY) / 10.0, maxY + (maxY - minY) / 10.0);
-
- points_ref = new DataReferenceImpl("points_ref");
- line_ref = new DataReferenceImpl("line_ref");
-
- points_ref.setData(points_ff);
- line_ref.setData(line_ff);
-
- ConstantMap[] pointsMap = {new ConstantMap(1.0f, Display.Red),
- new ConstantMap(0.0f, Display.Green), new ConstantMap(0.0f, Display.Blue),
- new ConstantMap(4.5f, Display.PointSize)};
-
- ConstantMap[] lineMap = {new ConstantMap(0.0f, Display.Red),
- new ConstantMap(0.0f, Display.Green), new ConstantMap(1.0f, Display.Blue),
- new ConstantMap(1.5f, Display.LineWidth)};
-
- display.addReference(points_ref, pointsMap);
- display.addReference(line_ref, lineMap);
-
- JFrame jframe = new JFrame("NeqSim 2D-plot");
- jframe.getContentPane().add(display.getComponent());
-
- // Set window size and make it visible
- jframe.setSize(700, 700);
- jframe.setVisible(true);
- }
-
- /**
- *
- * main.
- *
- *
- * @param args an array of {@link java.lang.String} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public static void main(String[] args) throws RemoteException, VisADException {
- lineFitPlot plot = new lineFitPlot("long", "alt");
-
- double[][] z = {{0, 0.5, 1, 3, 1}, {2, 6, 4, 1, 3}, {1, 3, 2, 1, 1}, {3, 2, 1, 3, 2},
- {1, 3, 2, 1, 1}};
-
- plot.setXYVals(z[0], z[1]);
- plot.setLineXYVals(z[0], z[3]);
- plot.init();
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAd2D/visAd2dBaseClass.java b/src/main/java/neqsim/dataPresentation/visAD/visAd2D/visAd2dBaseClass.java
deleted file mode 100644
index 66d56a107d..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAd2D/visAd2dBaseClass.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * visAd2dBaseClass.java
- *
- * Created on 24. mai 2001, 19:47
- */
-package neqsim.dataPresentation.visAD.visAd2D;
-
-import java.rmi.RemoteException;
-import javax.swing.JFrame;
-import neqsim.dataPresentation.visAD.visAdBaseClass;
-import visad.ConstantMap;
-import visad.DataReferenceImpl;
-import visad.Display;
-import visad.DisplayImpl;
-import visad.FlatField;
-import visad.FunctionType;
-import visad.GraphicsModeControl;
-import visad.Gridded1DSet;
-import visad.Integer1DSet;
-import visad.RealTupleType;
-import visad.RealType;
-import visad.ScalarMap;
-import visad.Set;
-import visad.VisADException;
-import visad.java2d.DisplayImplJ2D;
-
-/**
- *
- * visAd2dBaseClass class.
- *
- *
- * @author esol
- * @version $Id: $Id
- */
-public class visAd2dBaseClass extends visAdBaseClass {
- private static final long serialVersionUID = 1000;
-
- private RealType x, y, index;
-
- private RealTupleType x_y_tuple;
-
- private FunctionType func_i_tuple, func_line;
-
- private Set x_set, index_set;
-
- private FlatField line_ff, points_ff;
-
- private DataReferenceImpl points_ref, line_ref;
-
- private DisplayImpl display;
- float maxX = 0, minX = 0;
- float maxY = 0, minY = 0;
-
- private ScalarMap xMap, yMap, xRangeMap;
- float[][] set_samples;
- float[][] xy_samples;
- float[][] x_line_samples, y_line_samples;
- float[][] xy_disc_samples;
-
- /**
- *
- * Constructor for visAd2dBaseClass.
- *
- *
- * @param firstax a {@link java.lang.String} object
- * @param yax a {@link java.lang.String} object
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public visAd2dBaseClass(String firstax, String yax) throws RemoteException, VisADException {
- x = RealType.getRealType("test1");
- y = RealType.getRealType("test");
-
- x_y_tuple = new RealTupleType(x, y);
- index = RealType.getRealType("index");
-
- func_i_tuple = new FunctionType(index, x_y_tuple);
- }
-
- // public void setXYals(double[][] vals)throws RemoteException, VisADException{
- // xy_samples = vals;
- // }
-
- /**
- *
- * setXYVals.
- *
- *
- * @param xvals an array of {@link double} objects
- * @param yvals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setXYVals(double[] xvals, double[] yvals) throws RemoteException, VisADException {
- xy_samples = new float[2][xvals.length];
- minX = (float) xvals[0];
- maxX = (float) xvals[0];
- minY = (float) yvals[0];
- maxY = (float) yvals[0];
-
- for (int i = 0; i < xvals.length; i++) {
- xy_samples[0][i] = (float) xvals[i];
- xy_samples[1][i] = (float) yvals[i];
-
- minX = xy_samples[0][i] < minX ? xy_samples[0][i] : minX;
- maxX = xy_samples[0][i] > maxX ? xy_samples[0][i] : maxX;
- minY = xy_samples[1][i] < minY ? xy_samples[1][i] : minY;
- maxY = xy_samples[1][i] > maxY ? xy_samples[1][i] : maxY;
- }
- }
-
- /**
- *
- * setLineXYVals.
- *
- *
- * @param xvals an array of {@link double} objects
- * @param yvals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setLineXYVals(double[] xvals, double[] yvals) throws RemoteException, VisADException {
- y_line_samples = new float[1][yvals.length];
- x_line_samples = new float[1][xvals.length];
-
- for (int i = 0; i < xvals.length; i++) {
- x_line_samples[0][i] = (float) xvals[i];
- y_line_samples[0][i] = (float) yvals[i];
-
- minX = x_line_samples[0][i] < minX ? x_line_samples[0][i] : minX;
- maxX = x_line_samples[0][i] > maxX ? x_line_samples[0][i] : maxX;
- minY = y_line_samples[0][i] < minY ? y_line_samples[0][i] : minY;
- maxY = y_line_samples[0][i] > maxY ? y_line_samples[0][i] : maxY;
- }
- }
-
- /*
- * public void setContinousXVals(double[] vals)throws RemoteException, VisADException{
- * System.arraycopy(vals,0,xy_samples[0],0,vals.length); }
- *
- * public void setContinousYVals(double[] vals)throws RemoteException, VisADException{
- * System.arraycopy(vals,0,xy_samples[1],0,vals.length); }
- */
-
- /** {@inheritDoc} */
- @Override
- public void init() throws RemoteException, VisADException {
- index_set = new Integer1DSet(index, xy_samples[0].length);
-
- points_ff = new FlatField(func_i_tuple, index_set);
-
- points_ff.setSamples(xy_samples);
-
- func_line = new FunctionType(x, y);
-
- x_set = new Gridded1DSet(x, x_line_samples, x_line_samples[0].length);
- // x_set = new Irregular1DSet(x, x_line_samples);
-
- line_ff = new FlatField(func_line, x_set);
- line_ff.setSamples(y_line_samples);
-
- display = new DisplayImplJ2D("StatPlot");
-
- GraphicsModeControl dispGMC = display.getGraphicsModeControl();
- dispGMC.setScaleEnable(true);
-
- xMap = new ScalarMap(x, Display.XAxis);
- yMap = new ScalarMap(y, Display.YAxis);
-
- xRangeMap = new ScalarMap(x, Display.SelectRange);
-
- display.addMap(xMap);
- display.addMap(yMap);
- display.addMap(xRangeMap);
-
- xMap.setRange(minX - (maxX - minX) / 10.0, maxX + (maxX - minX) / 10.0);
- yMap.setRange(minY - (maxY - minY) / 10.0, maxY + (maxY - minY) / 10.0);
-
- points_ref = new DataReferenceImpl("points_ref");
- line_ref = new DataReferenceImpl("line_ref");
-
- points_ref.setData(points_ff);
- line_ref.setData(line_ff);
-
- /*
- * ConstantMap[] pointsMap = {new ConstantMap(1.0f, Display.Red), new ConstantMap(0.0f,
- * Display.Green), new ConstantMap(0.0f, Display.Blue), new ConstantMap(4.5f,
- * Display.PointSize)};
- */
- ConstantMap[] lineMap =
- {new ConstantMap(0.0f, Display.Red), new ConstantMap(0.0f, Display.Green),
- new ConstantMap(1.0f, Display.Blue), new ConstantMap(1.5f, Display.LineWidth)};
-
- // display.addReference(points_ref, pointsMap);
- display.addReference(line_ref, lineMap);
-
- JFrame jframe = new JFrame("NeqSim 2D-plot");
- jframe.getContentPane().add(display.getComponent());
-
- // Set window size and make it visible
- jframe.setSize(700, 700);
- jframe.setVisible(true);
- }
-
- /**
- *
- * main.
- *
- *
- * @param args an array of {@link java.lang.String} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public static void main(String[] args) throws RemoteException, VisADException {
- visAd2dBaseClass plot = new visAd2dBaseClass("long", "alt");
-
- double[][] z = {{0, 0.5, 1, 3,}, {2, 6, 4, 1,}, {1, 3, 2, 1,}, {3, 2, 1, 3,}};
-
- plot.setXYVals(z[0], z[1]);
- plot.setLineXYVals(z[0], z[3]);
- plot.init();
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAd2D/visAdContourPlot.java b/src/main/java/neqsim/dataPresentation/visAD/visAd2D/visAdContourPlot.java
deleted file mode 100644
index 215523c1e3..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAd2D/visAdContourPlot.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * visAdContourPlot.java
- *
- * Created on 7. november 2000, 17:51
- */
-package neqsim.dataPresentation.visAD.visAd2D;
-
-import java.rmi.RemoteException;
-import javax.swing.JFrame;
-import visad.DataReferenceImpl;
-import visad.Display;
-import visad.DisplayImpl;
-import visad.FlatField;
-import visad.FunctionType;
-import visad.GraphicsModeControl;
-import visad.Linear2DSet;
-import visad.RealTupleType;
-import visad.RealType;
-import visad.ScalarMap;
-import visad.Set;
-import visad.VisADException;
-import visad.java2d.DisplayImplJ2D;
-
-/**
- *
- * visAdContourPlot class.
- *
- *
- * @author Even Solbraa
- * @version $Id: $Id
- */
-public class visAdContourPlot {
- private RealType longitude, latitude, temperature;
-
- private RealTupleType domain_tuple;
- private FunctionType func_domain_range;
- private Set domain_set;
- private FlatField vals_ff;
- private DataReferenceImpl data_ref;
- private DisplayImpl display;
- private ScalarMap latMap, lonMap;
- private ScalarMap tempIsoMap, tempRGBMap;
- int NCOLS = 0, NROWS = 0;
- float[][] set_samples;
- double[][] z_samples;
-
- /**
- *
- * Constructor for visAdContourPlot.
- *
- *
- * @param firstax a {@link java.lang.String} object
- * @param secax a {@link java.lang.String} object
- * @param zax a {@link java.lang.String} object
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public visAdContourPlot(String firstax, String secax, String zax)
- throws RemoteException, VisADException {
- latitude = RealType.getRealType(firstax);
- longitude = RealType.getRealType(secax);
- domain_tuple = new RealTupleType(latitude, longitude);
- temperature = RealType.getRealType(zax);
- func_domain_range = new FunctionType(domain_tuple, temperature);
- }
-
- /**
- *
- * setXYvals.
- *
- *
- * @param xMin a double
- * @param xMax a double
- * @param Nrows a int
- * @param yMin a double
- * @param yMax a double
- * @param NCols a int
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setXYvals(double xMin, double xMax, int Nrows, double yMin, double yMax, int NCols)
- throws RemoteException, VisADException {
- NCOLS = NCols;
- NROWS = Nrows;
-
- domain_set = new Linear2DSet(domain_tuple, xMin, xMax, NROWS, yMin, yMax, NCOLS);
-
- set_samples = domain_set.getSamples(true);
- }
-
- /**
- *
- * setZvals.
- *
- *
- * @param vals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setZvals(double[][] vals) throws RemoteException, VisADException {
- z_samples = vals;
- }
-
- /**
- *
- * init.
- *
- *
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void init() throws RemoteException, VisADException {
- float[][] flat_samples = new float[1][NCOLS * NROWS];
-
- for (int c = 0; c < NCOLS; c++) {
- for (int r = 0; r < NROWS; r++) {
- flat_samples[0][c * NROWS + r] = (float) z_samples[c][r];
- }
- }
-
- vals_ff = new FlatField(func_domain_range, domain_set);
- vals_ff.setSamples(flat_samples, false);
- display = new DisplayImplJ2D("display1");
- GraphicsModeControl dispGMC = display.getGraphicsModeControl();
- dispGMC.setScaleEnable(true);
-
- latMap = new ScalarMap(latitude, Display.YAxis);
- lonMap = new ScalarMap(longitude, Display.XAxis);
-
- // This is new!
- tempIsoMap = new ScalarMap(temperature, Display.IsoContour);
-
- // this ScalarMap will color the isolines
- // don't foget to add it to the display
- tempRGBMap = new ScalarMap(temperature, Display.RGB);
-
- // Add maps to display
- display.addMap(latMap);
- display.addMap(lonMap);
-
- display.addMap(tempIsoMap);
- // display.addMap( tempRGBMap );
-
- // Create a data reference and set the FlatField as our data
- data_ref = new DataReferenceImpl("data_ref");
-
- data_ref.setData(vals_ff);
-
- // Add reference to display
- display.addReference(data_ref);
-
- // Create application window and add display to window
- JFrame jframe = new JFrame("VisAD Tutorial example 3_05");
- jframe.getContentPane().add(display.getComponent());
-
- // Set window size and make it visible
- jframe.setSize(500, 500);
- jframe.setVisible(true);
- }
-
- /**
- *
- * main.
- *
- *
- * @param args an array of {@link java.lang.String} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public static void main(String[] args) throws RemoteException, VisADException {
- visAdContourPlot test = new visAdContourPlot("long", "alt", "height");
- test.setXYvals(0, 10, 4, 0, 10, 4);
-
- double[][] z = {{3, 2, 1, 3,}, {2, 6, 4, 1,}, {1, 3, 2, 1,}, {3, 2, 1, 3,}};
-
- test.setZvals(z);
- test.init();
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAd3D/statistical3DPlot/surfaceFitPlot.java b/src/main/java/neqsim/dataPresentation/visAD/visAd3D/statistical3DPlot/surfaceFitPlot.java
deleted file mode 100644
index a5d64d358f..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAd3D/statistical3DPlot/surfaceFitPlot.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package neqsim.dataPresentation.visAD.visAd3D.statistical3DPlot;
-
-import java.rmi.RemoteException;
-import javax.swing.JFrame;
-import visad.DataReferenceImpl;
-import visad.Display;
-import visad.DisplayImpl;
-import visad.FlatField;
-import visad.FunctionType;
-import visad.GraphicsModeControl;
-import visad.Linear2DSet;
-import visad.RealTupleType;
-import visad.RealType;
-import visad.ScalarMap;
-import visad.Set;
-import visad.VisADException;
-import visad.java3d.DisplayImplJ3D;
-import visad.util.ContourWidget;
-
-/**
- *
- * surfaceFitPlot class.
- *
- *
- * @author Even Solbraa
- * @version $Id: $Id
- */
-public class surfaceFitPlot {
- private RealType longitude, latitude, temperature, isotemperature;
-
- private RealTupleType domain_tuple;
- private FunctionType func_domain_range, func_domain_iso_range;
- private Set domain_set;
- private FlatField vals_ff, iso_vals_ff;
- private DataReferenceImpl data_ref, iso_data_ref;
- private DisplayImpl display;
- private ScalarMap latMap, lonMap;
- private ScalarMap tempIsoMap, tempRGBMap, tempIsoMapIso, tempRGBMap2, tempIsoMap2;
- int NCOLS = 0, NROWS = 0;
- float[][] set_samples;
- double[][] z_samples;
- private ContourWidget contourWid;
-
- /**
- *
- * Constructor for surfaceFitPlot.
- *
- *
- * @param firstax a {@link java.lang.String} object
- * @param secax a {@link java.lang.String} object
- * @param zax a {@link java.lang.String} object
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public surfaceFitPlot(String firstax, String secax, String zax)
- throws RemoteException, VisADException {
- latitude = RealType.getRealType(firstax);
- longitude = RealType.getRealType(secax);
- domain_tuple = new RealTupleType(latitude, longitude);
- temperature = RealType.getRealType(zax);
- isotemperature = RealType.getRealType("isoTemperature");
- func_domain_range = new FunctionType(domain_tuple, temperature);
- func_domain_iso_range = new FunctionType(domain_tuple, isotemperature);
- }
-
- /**
- *
- * setXYvals.
- *
- *
- * @param xMin a double
- * @param xMax a double
- * @param Nrows a int
- * @param yMin a double
- * @param yMax a double
- * @param NCols a int
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setXYvals(double xMin, double xMax, int Nrows, double yMin, double yMax, int NCols)
- throws RemoteException, VisADException {
- NCOLS = NCols;
- NROWS = Nrows;
-
- domain_set = new Linear2DSet(domain_tuple, xMin, xMax, NROWS, yMin, yMax, NCOLS);
-
- set_samples = domain_set.getSamples(true);
- }
-
- /*
- * public void setXYals(double[] xvals, double[] yvals) throws RemoteException, VisADException{
- * domain_set = new Linear2DSet(domain_tuple, xMin, xMax, NROWS, yMin, yMax, NCOLS); set_samples
- * = domain_set.getSamples( true ); }
- */
-
- /**
- *
- * setZvals.
- *
- *
- * @param vals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setZvals(double[][] vals) throws RemoteException, VisADException {
- z_samples = vals;
- }
-
- /**
- *
- * init.
- *
- *
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void init() throws RemoteException, VisADException {
- float[][] flat_samples = new float[1][NCOLS * NROWS];
-
- for (int c = 0; c < NCOLS; c++) {
- for (int r = 0; r < NROWS; r++) {
- flat_samples[0][c * NROWS + r] = (float) z_samples[c][r];
- }
- }
-
- vals_ff = new FlatField(func_domain_range, domain_set);
- vals_ff.setSamples(flat_samples, false);
- iso_vals_ff = new FlatField(func_domain_iso_range, domain_set);
- display = new DisplayImplJ3D("display1");
- GraphicsModeControl dispGMC = display.getGraphicsModeControl();
- dispGMC.setScaleEnable(true);
-
- float[][] flat_isoVals = vals_ff.getFloats(false);
- iso_vals_ff.setSamples(flat_isoVals, false);
-
- latMap = new ScalarMap(latitude, Display.YAxis);
- lonMap = new ScalarMap(longitude, Display.XAxis);
-
- // This is new!
- tempIsoMap = new ScalarMap(temperature, Display.ZAxis);
- tempRGBMap = new ScalarMap(temperature, Display.RGB);
-
- tempIsoMap2 = new ScalarMap(isotemperature, Display.ZAxis);
- tempIsoMapIso = new ScalarMap(isotemperature, Display.IsoContour);
- // tempIsoMapIso = new ScalarMap( isotemperature, Display.IsoContour );
-
- // Add maps to display
- display.addMap(latMap);
- display.addMap(lonMap);
- display.addMap(tempIsoMap);
- display.addMap(tempRGBMap);
-
- display.addMap(tempIsoMapIso);
- display.addMap(tempIsoMap2);
-
- // tempIsoMapIso = new ScalarMap( temperature, Display.IsoContour );
- // tempRGBMap2 = new ScalarMap( temperature, Display.RGB );
-
- // display.addMap( tempIsoMapIso );
- // display.addMap( tempRGBMap2 );
- // display.addMap( tempIsoMapIso );
- // display.addMap( tempRGBMap );
-
- // ContourWidget contourWid = new ContourWidget(tempIsoMapIso);
-
- // Create a data reference and set the FlatField as our data
- data_ref = new DataReferenceImpl("data_ref");
- iso_data_ref = new DataReferenceImpl("data_ref2");
-
- data_ref.setData(vals_ff);
- iso_data_ref.setData(iso_vals_ff);
-
- // Add reference to display
- display.addReference(data_ref);
- display.addReference(iso_data_ref);
-
- // Create application window and add display to window
- JFrame jframe = new JFrame("NeqSim 3D-plot");
- jframe.getContentPane().add(display.getComponent());
-
- // Set window size and make it visible
- jframe.setSize(700, 700);
- jframe.setVisible(true);
- }
-
- /**
- *
- * main.
- *
- *
- * @param args an array of {@link java.lang.String} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public static void main(String[] args) throws RemoteException, VisADException {
- /*
- * visAd3DPlot test = new visAd3DPlot("long", "alt", "height"); test.setXYvals(0, 10, 4, 0,
- * 10, 4);
- *
- * double[][] z = { {3,2,1,3,}, {2,6,4,1,},{1,3,2,1,}, {3,2,1,3,} };
- *
- * test.setZvals(z); test.init();
- *
- */
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAd3D/visAd3DPlot.java b/src/main/java/neqsim/dataPresentation/visAD/visAd3D/visAd3DPlot.java
deleted file mode 100644
index f782751de4..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAd3D/visAd3DPlot.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package neqsim.dataPresentation.visAD.visAd3D;
-
-import java.rmi.RemoteException;
-import javax.swing.JFrame;
-import neqsim.dataPresentation.visAD.visAdBaseClass;
-import visad.DataReferenceImpl;
-import visad.Display;
-import visad.DisplayImpl;
-import visad.FlatField;
-import visad.FunctionType;
-import visad.GraphicsModeControl;
-import visad.Linear2DSet;
-import visad.RealTupleType;
-import visad.RealType;
-import visad.ScalarMap;
-import visad.Set;
-import visad.VisADException;
-import visad.java3d.DisplayImplJ3D;
-import visad.util.ContourWidget;
-
-/**
- *
- * visAd3DPlot class.
- *
- *
- * @author Even Solbraa
- * @version $Id: $Id
- */
-public class visAd3DPlot extends visAdBaseClass {
- private static final long serialVersionUID = 1000;
-
- private RealType longitude, latitude, temperature, isotemperature;
-
- private RealTupleType domain_tuple;
- JFrame jframe;
- private FunctionType func_domain_range, func_domain_iso_range;
- private Set domain_set;
- private FlatField vals_ff, iso_vals_ff;
- private DataReferenceImpl data_ref, iso_data_ref;
- private DisplayImpl display;
- private ScalarMap latMap, lonMap;
- private ScalarMap tempIsoMap, tempRGBMap, tempIsoMapIso, tempRGBMap2, tempIsoMap2;
- int NCOLS = 0, NROWS = 0;
- float[][] set_samples;
- double[][] z_samples;
- private ContourWidget contourWid;
-
- /**
- *
- * Constructor for visAd3DPlot.
- *
- *
- * @param firstax a {@link java.lang.String} object
- * @param secax a {@link java.lang.String} object
- * @param zax a {@link java.lang.String} object
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public visAd3DPlot(String firstax, String secax, String zax)
- throws RemoteException, VisADException {
- latitude = RealType.getRealType(firstax);
- longitude = RealType.getRealType(secax);
- domain_tuple = new RealTupleType(latitude, longitude);
- temperature = RealType.getRealType(zax);
- isotemperature = RealType.getRealType("isoTemperature");
- func_domain_range = new FunctionType(domain_tuple, temperature);
- func_domain_iso_range = new FunctionType(domain_tuple, isotemperature);
- }
-
- /**
- *
- * setXYvals.
- *
- *
- * @param xMin a double
- * @param xMax a double
- * @param Nrows a int
- * @param yMin a double
- * @param yMax a double
- * @param NCols a int
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setXYvals(double xMin, double xMax, int Nrows, double yMin, double yMax, int NCols)
- throws RemoteException, VisADException {
- NCOLS = NCols;
- NROWS = Nrows;
- domain_set = new Linear2DSet(domain_tuple, xMin, xMax, NROWS, yMin, yMax, NCOLS);
- set_samples = domain_set.getSamples(true);
- }
-
- /**
- *
- * setXYvals.
- *
- *
- * @param xvals an array of {@link double} objects
- * @param yvals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setXYvals(double[] xvals, double[] yvals) throws RemoteException, VisADException {
- /*
- * NCOLS = xvals.length; NROWS = yvals.length;
- *
- * float[][] numbs = new float[yvals.length][xvals.length];
- *
- * for(int i=0;i
- * setZvals.
- *
- *
- * @param vals an array of {@link double} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void setZvals(double[][] vals) throws RemoteException, VisADException {
- z_samples = vals;
- }
-
- /** {@inheritDoc} */
- @Override
- public void init() throws RemoteException, VisADException {
- float[][] flat_samples = new float[1][NCOLS * NROWS];
-
- for (int c = 0; c < NCOLS; c++) {
- for (int r = 0; r < NROWS; r++) {
- flat_samples[0][c * NROWS + r] = (float) z_samples[c][r];
- }
- }
-
- vals_ff = new FlatField(func_domain_range, domain_set);
- vals_ff.setSamples(flat_samples, false);
- iso_vals_ff = new FlatField(func_domain_iso_range, domain_set);
- display = new DisplayImplJ3D("display1");
- GraphicsModeControl dispGMC = display.getGraphicsModeControl();
- dispGMC.setScaleEnable(true);
-
- float[][] flat_isoVals = vals_ff.getFloats(false);
- iso_vals_ff.setSamples(flat_isoVals, false);
-
- latMap = new ScalarMap(latitude, Display.YAxis);
- lonMap = new ScalarMap(longitude, Display.XAxis);
- // latMap.getAxisScale().setMajorTickSpacing(0.1);
- latMap.getAxisScale().createStandardLabels(10, 0, 0, 3.1);
- // This is new!
-
- tempIsoMap = new ScalarMap(temperature, Display.ZAxis);
- tempRGBMap = new ScalarMap(temperature, Display.RGB);
-
- tempIsoMap2 = new ScalarMap(isotemperature, Display.ZAxis);
- tempIsoMapIso = new ScalarMap(isotemperature, Display.IsoContour);
- // tempIsoMapIso = new ScalarMap( isotemperature, Display.IsoContour );
-
- // Add maps to display
-
- display.addMap(latMap);
- display.addMap(lonMap);
-
- display.addMap(tempIsoMap);
- display.addMap(tempRGBMap);
-
- display.addMap(tempIsoMapIso);
- display.addMap(tempIsoMap2);
-
- // tempIsoMapIso = new ScalarMap( temperature, Display.IsoContour );
- // tempRGBMap2 = new ScalarMap( temperature, Display.RGB );
-
- // display.addMap( tempIsoMapIso );
- // display.addMap( tempRGBMap2 );
- // display.addMap( tempIsoMapIso );
- // display.addMap( tempRGBMap );
-
- // ContourWidget contourWid = new ContourWidget(tempIsoMapIso);
-
- // Create a data reference and set the FlatField as our data
-
- data_ref = new DataReferenceImpl("data_ref");
- iso_data_ref = new DataReferenceImpl("data_ref2");
-
- data_ref.setData(vals_ff);
- iso_data_ref.setData(iso_vals_ff);
-
- // Add reference to display
-
- display.addReference(data_ref);
- display.addReference(iso_data_ref);
-
- // display.getDisplayRenderer().setMajorTickSpacing(0.1);
- // display.getDisplayRenderer().getRendererControl().setBackgroundColor(0,200,100);
-
- // Create application window and add display to window
-
- jframe = new JFrame("NeqSim 3D-plot");
- jframe.getContentPane().add(display.getComponent());
-
- // Set window size and make it visible
-
- jframe.setSize(700, 700);
- jframe.setVisible(true);
- }
-
- /**
- *
- * main.
- *
- *
- * @param args an array of {@link java.lang.String} objects
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public static void main(String[] args) throws RemoteException, VisADException {
- visAd3DPlot test = new visAd3DPlot("long", "alt", "height");
- test.setXYvals(0, 10, 4, 0, 10, 4);
-
- double[][] z = {{3, 2, 1, 3,}, {2, 6, 4, 1,}, {1, 3, 2, 1,}, {3, 2, 1, 3,}};
-
- test.setZvals(z);
- test.init();
- }
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAd3D/visAd3dBaseClass.java b/src/main/java/neqsim/dataPresentation/visAD/visAd3D/visAd3dBaseClass.java
deleted file mode 100644
index 08516a8cc6..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAd3D/visAd3dBaseClass.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package neqsim.dataPresentation.visAD.visAd3D;
-
-import neqsim.dataPresentation.visAD.visAdBaseClass;
-
-/**
- *
- * visAd3dBaseClass class.
- *
- *
- * @author esol
- * @version $Id: $Id
- */
-public class visAd3dBaseClass extends visAdBaseClass {
- private static final long serialVersionUID = 1000;
-
- /**
- *
- * Constructor for visAd3dBaseClass.
- *
- */
- public visAd3dBaseClass() {}
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAdBaseClass.java b/src/main/java/neqsim/dataPresentation/visAD/visAdBaseClass.java
deleted file mode 100644
index d578d64683..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAdBaseClass.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * visAdBaseClass.java
- *
- * Created on 24. mai 2001, 19:46
- */
-package neqsim.dataPresentation.visAD;
-
-import java.rmi.RemoteException;
-import visad.VisADException;
-
-/**
- *
- * visAdBaseClass class.
- *
- *
- * @author esol
- * @version $Id: $Id
- */
-public class visAdBaseClass implements visAdInterface, java.io.Serializable {
- private static final long serialVersionUID = 1000;
-
- /**
- *
- * Constructor for visAdBaseClass.
- *
- */
- public visAdBaseClass() {}
-
- /** {@inheritDoc} */
- @Override
- public void init() throws RemoteException, VisADException {}
-}
diff --git a/src/main/java/neqsim/dataPresentation/visAD/visAdInterface.java b/src/main/java/neqsim/dataPresentation/visAD/visAdInterface.java
deleted file mode 100644
index f489e765cb..0000000000
--- a/src/main/java/neqsim/dataPresentation/visAD/visAdInterface.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * visAdInterface.java
- *
- * Created on 24. mai 2001, 19:50
- */
-package neqsim.dataPresentation.visAD;
-
-import java.rmi.RemoteException;
-import visad.*;
-
-/**
- *
- * visAdInterface interface.
- *
- *
- * @author esol
- * @version $Id: $Id
- */
-public interface visAdInterface {
- /**
- *
- * init.
- *
- *
- * @throws java.rmi.RemoteException if any.
- * @throws visad.VisADException if any.
- */
- public void init() throws RemoteException, VisADException;
-}
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 d096ff802e..ca4759d384 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
@@ -21,7 +21,6 @@ public class PipeFlowVisualization extends
public double[][][] bulkComposition;
double[] xPlace = new double[10];
double[] timeArray = new double[10];
- neqsim.dataPresentation.visAD.visAdInterface plot;
/**
*
@@ -101,7 +100,7 @@ public void calcPoints(String name) {
if (name.equals("composition")) {
points = bulkComposition[0];
}
-
+/*
try {
System.out.println("points: " + points.length);
@@ -125,6 +124,7 @@ public void calcPoints(String name) {
System.out.println(e.toString());
System.out.println("plotting failed");
}
+ */
}
/** {@inheritDoc} */
@@ -145,7 +145,7 @@ public void displayResult(String name) {
if (name.equals("composition")) {
points = bulkComposition[0];
}
-
+/*
try {
System.out.println("points: " + points.length);
@@ -170,9 +170,11 @@ public void displayResult(String name) {
System.out.println(e.toString());
System.out.println("plotting failed");
}
+ */
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {
calcPoints(name);
@@ -191,4 +193,5 @@ public void createNetCdfFile(String name) {
}
file.createFile();
}
+ */
}
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 c2bf588695..1a4ec9c527 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
@@ -1,6 +1,5 @@
package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.twoPhaseFlowVisualization.twoPhasePipeFlowVisualization;
-import neqsim.dataPresentation.visAD.visAdInterface;
import neqsim.fluidMechanics.flowSystem.FlowSystem;
import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.twoPhaseFlowNodeVisualization.TwoPhaseFlowNodeVisualization;
@@ -30,7 +29,6 @@ public class TwoPhasePipeFlowVisualization extends
public double[][][][] totalVolumetricMassTransferRate;
double[] xPlace = new double[10];
double[] timeArray = new double[10];
- visAdInterface plot;
/**
*
@@ -162,7 +160,9 @@ public void displayResult(String name) {
// file.createFile();
// }
+
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {
setPoints();
@@ -206,4 +206,5 @@ public void createNetCdfFile(String name) {
// file.setYvalues(temperaturePoint[0][0], "time","sec");
file.createFile();
}
+ */
}
diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/TestDiffusivity.java b/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/TestDiffusivity.java
index def8bc74b2..f7f7fa5d61 100644
--- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/TestDiffusivity.java
+++ b/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/TestDiffusivity.java
@@ -77,7 +77,7 @@ public static void main(String[] args) {
// do simulations
// optim.solve();
// optim.runMonteCarloSimulation();
- optim.displayGraph();
+ //optim.displayGraph();
// optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/statistics/parameterFitting/StatisticsBaseClass.java b/src/main/java/neqsim/statistics/parameterFitting/StatisticsBaseClass.java
index 52f0669af1..4447f6ad15 100644
--- a/src/main/java/neqsim/statistics/parameterFitting/StatisticsBaseClass.java
+++ b/src/main/java/neqsim/statistics/parameterFitting/StatisticsBaseClass.java
@@ -14,7 +14,6 @@
import javax.swing.JScrollPane;
import javax.swing.JTable;
import Jama.Matrix;
-import neqsim.dataPresentation.visAD.visAd2D.statistical2DPlot.lineFitPlot;
/**
*
@@ -690,42 +689,6 @@ public void calcDeviation() {
0.5 * chiSquare);
}
- /**
- *
- * displayGraph.
- *
- */
- public void displayGraph() {
- try {
- if (sampleSet.getSample(0).getDependentValues().length <= 1) {
- lineFitPlot plot = new lineFitPlot("test", "test");
- plot.setXYVals(xVal[0], calcVal);
- // plot.setXYVals2(xVal[0], calcVal);
- plot.setLineXYVals(xVal[0], expVal);
- plot.init();
- } else {
- lineFitPlot plot = new lineFitPlot("test", "test");
- plot.setXYVals(xVal[0], expVal);
- // plot.setXYVals2(xVal[0], calcVal);
- plot.setLineXYVals(xVal[0], calcVal);
- plot.init();
- }
- } catch (Exception e) {
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public void writeToCdfFile(String name) {
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file =
- new neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D();
- file.setOutputFileName(name);
- file.setXvalues(xVal[0], "x", "sec");
- file.setYvalues(expVal, "experimental", "meter");
- file.setYvalues(calcVal, "calculated", "meter");
- file.createFile();
- }
-
/** {@inheritDoc} */
@Override
public void writeToTextFile(String name) {
@@ -744,7 +707,7 @@ public void writeToTextFile(String name) {
public void displaySimple() {
calcAbsDev();
try {
- displayGraph();
+ //displayGraph();
} catch (Exception e) {
System.out.println("could not display graph");
e.printStackTrace();
@@ -768,7 +731,7 @@ public void displaySimple() {
public void displayCurveFit() {
calcAbsDev();
try {
- displayGraph();
+ //displayGraph();
} catch (Exception e) {
System.out.println("could not display graph");
e.printStackTrace();
diff --git a/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java b/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java
index ca40abed2e..ca6ac8f765 100644
--- a/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java
+++ b/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java
@@ -76,7 +76,7 @@ public interface StatisticsInterface {
*
* @param name a {@link java.lang.String} object
*/
- public void writeToCdfFile(String name);
+ //public void writeToCdfFile(String name);
/**
*
diff --git a/src/main/java/neqsim/thermo/system/SystemInterface.java b/src/main/java/neqsim/thermo/system/SystemInterface.java
index 3b0d5d4afd..866f701dba 100644
--- a/src/main/java/neqsim/thermo/system/SystemInterface.java
+++ b/src/main/java/neqsim/thermo/system/SystemInterface.java
@@ -2266,24 +2266,6 @@ public double calcBeta()
*/
public void saveToDataBase();
- /**
- *
- * generatePDF.
- *
- *
- * @return PdfCreator PdfCreator
- */
- public neqsim.dataPresentation.iTextPDF.PdfCreator generatePDF();
-
- /**
- *
- * displayPDF.
- *
- */
- public default void displayPDF() {
- generatePDF().openPDF();
- }
-
/**
*
* getMixingRule.
diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java
index d9a5eb7fe5..f1e1ab2292 100644
--- a/src/main/java/neqsim/thermo/system/SystemThermo.java
+++ b/src/main/java/neqsim/thermo/system/SystemThermo.java
@@ -4111,51 +4111,6 @@ public neqsim.standards.StandardInterface getStandard(String standardName) {
return standard;
}
- /** {@inheritDoc} */
- @Override
- public neqsim.dataPresentation.iTextPDF.PdfCreator generatePDF() {
- neqsim.dataPresentation.iTextPDF.PdfCreator pdfDocument = null;
- pdfDocument = new neqsim.dataPresentation.iTextPDF.PdfCreator();
- pdfDocument.getDocument().addTitle("NeqSim Thermo Simulation Report");
- pdfDocument.getDocument().addKeywords("Temperature ");
-
- pdfDocument.getDocument().open();
- try {
- pdfDocument.getDocument()
- .add(new com.lowagie.text.Paragraph("Properties of fluid: " + getFluidName(),
- com.lowagie.text.FontFactory.getFont(com.lowagie.text.FontFactory.TIMES_ROMAN, 12)));
-
- com.lowagie.text.List list = new com.lowagie.text.List(true, 20);
- list.add(new com.lowagie.text.ListItem("Thermodynamic model: " + getModelName()));
- list.add(new com.lowagie.text.ListItem("Mixing rule: " + getMixingRuleName()));
- list.add(new com.lowagie.text.ListItem("Number of phases: " + getNumberOfPhases()));
- list.add(new com.lowagie.text.ListItem("Status of calculation: ok"));
- pdfDocument.getDocument().add(list);
-
- com.lowagie.text.Table resTable =
- new com.lowagie.text.Table(6, getPhases()[0].getNumberOfComponents() + 30);
- String[][] tempTable = createTable(getFluidName());
- for (int i = 0; i < getPhases()[0].getNumberOfComponents() + 30; i++) {
- for (int j = 0; j < 6; j++) {
- resTable.addCell(tempTable[i][j]);
- }
- }
- pdfDocument.getDocument().add(resTable);
-
- com.lowagie.text.Anchor anchor = new com.lowagie.text.Anchor("NeqSim Website",
- com.lowagie.text.FontFactory.getFont(com.lowagie.text.FontFactory.HELVETICA, 12,
- com.lowagie.text.Font.UNDERLINE, new Color(0, 0, 255)));
- anchor.setReference("http://www.stud.ntnu.no/~solbraa/neqsim");
- anchor.setName("NeqSim Website");
-
- pdfDocument.getDocument().add(anchor);
- } catch (Exception e) {
- logger.error("error", e);
- }
- pdfDocument.getDocument().close();
- return pdfDocument;
- }
-
/**
* {@inheritDoc}
*
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java
index 4d5e586c96..6c6af6ab9f 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java
@@ -185,7 +185,7 @@ public static void main(String[] args) {
// optim.runMonteCarloSimulation();
// optim.displayResult();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityGlycolHC.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityGlycolHC.java
index acde6e90aa..9f5ec66852 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityGlycolHC.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityGlycolHC.java
@@ -133,7 +133,7 @@ public static void main(String[] args) {
// optim.runMonteCarloSimulation();
// optim.displayResult();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestParameterFittingToSolubilityDataEinar.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestParameterFittingToSolubilityDataEinar.java
index 5ea8f17f5c..373f9b843f 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestParameterFittingToSolubilityDataEinar.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestParameterFittingToSolubilityDataEinar.java
@@ -80,7 +80,7 @@ public static void main(String[] args) {
// optim.runMonteCarloSimulation();
// optim.displayResult();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestSolidAntoine.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestSolidAntoine.java
index 2f86fbb329..4cb5d76cf0 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestSolidAntoine.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestSolidAntoine.java
@@ -75,7 +75,7 @@ public static void main(String[] args) {
optim.solve();
// optim.runMonteCarloSimulation();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java
index 7b80e8e3ae..6ec81f20eb 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java
@@ -278,7 +278,7 @@ public static void main(String[] args) {
// optim.displayCurveFit();
// optim.displayGraph();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java
index 4b67429060..1c40cf4dd9 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java
@@ -154,7 +154,7 @@ public static void main(String[] args) {
// optim.displayCurveFit();
// optim.displayGraph();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java
index 7950906056..0e64b4c7b5 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java
@@ -93,7 +93,7 @@ public static void main(String[] args) {
// optim.displayCurveFit();
// optim.displayGraph();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java
index d336968553..7cdc44652e 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java
@@ -88,7 +88,7 @@ public static void main(String[] args) {
// optim.displayCurveFit();
// optim.displayGraph();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java
index 7999683cd7..d8cacfb957 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java
@@ -88,7 +88,7 @@ public static void main(String[] args) {
// optim.displayCurveFit();
// optim.displayGraph();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine.java b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine.java
index 47ebc218b5..34d5798660 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine.java
@@ -80,7 +80,7 @@ public static void main(String[] args) {
// optim.solve();
// optim.runMonteCarloSimulation();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
- optim.writeToTextFile("c:/testFit.txt");
+ //optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine_S8.java b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine_S8.java
index 9778aa152a..abf8f636f9 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine_S8.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/AntoineParameter/TestSolidAntoine_S8.java
@@ -72,7 +72,7 @@ public static void main(String[] args) {
optim.solve();
// optim.runMonteCarloSimulation();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
- optim.writeToTextFile("c:/testFit.txt");
+ //optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/furstIonicParameters/TestFurstIonicParameterFunction.java b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/furstIonicParameters/TestFurstIonicParameterFunction.java
index 8524f4788f..b7cc5c084e 100644
--- a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/furstIonicParameters/TestFurstIonicParameterFunction.java
+++ b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/furstIonicParameters/TestFurstIonicParameterFunction.java
@@ -184,7 +184,7 @@ public static void main(String[] args) {
optim.displayResult();
// optim.runMonteCarloSimulation();
optim.displayCurveFit();
- optim.writeToCdfFile("c:/testFit.nc");
+ //optim.writeToCdfFile("c:/testFit.nc");
optim.writeToTextFile("c:/testFit.txt");
}
}
diff --git a/src/main/java/neqsim/thermodynamicOperations/BaseOperation.java b/src/main/java/neqsim/thermodynamicOperations/BaseOperation.java
index 56ded9f079..918df3a77b 100644
--- a/src/main/java/neqsim/thermodynamicOperations/BaseOperation.java
+++ b/src/main/java/neqsim/thermodynamicOperations/BaseOperation.java
@@ -56,8 +56,8 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) {
public void printToFile(String name) {}
/** {@inheritDoc} */
- @Override
- public void createNetCdfFile(String name) {}
+ // @Override
+ // public void createNetCdfFile(String name) {}
/** {@inheritDoc} */
@Override
diff --git a/src/main/java/neqsim/thermodynamicOperations/OperationInterface.java b/src/main/java/neqsim/thermodynamicOperations/OperationInterface.java
index 1d6cb4d2d3..80d9f3a8ba 100644
--- a/src/main/java/neqsim/thermodynamicOperations/OperationInterface.java
+++ b/src/main/java/neqsim/thermodynamicOperations/OperationInterface.java
@@ -59,7 +59,7 @@ public interface OperationInterface extends Runnable, java.io.Serializable {
*
* @param name a {@link java.lang.String} object
*/
- public void createNetCdfFile(String name);
+ //public void createNetCdfFile(String name);
/**
*
diff --git a/src/main/java/neqsim/thermodynamicOperations/ThermodynamicOperations.java b/src/main/java/neqsim/thermodynamicOperations/ThermodynamicOperations.java
index 22a43a7449..27ed545ab0 100644
--- a/src/main/java/neqsim/thermodynamicOperations/ThermodynamicOperations.java
+++ b/src/main/java/neqsim/thermodynamicOperations/ThermodynamicOperations.java
@@ -1764,10 +1764,12 @@ public void displayResult() {
*
* @param name a {@link java.lang.String} object
*/
+ /*
public void writeNetCDF(String name) {
fileName = name;
getOperation().createNetCdfFile(name);
}
+ */
/**
*
diff --git a/src/main/java/neqsim/thermodynamicOperations/chemicalEquilibrium/ChemicalEquilibrium.java b/src/main/java/neqsim/thermodynamicOperations/chemicalEquilibrium/ChemicalEquilibrium.java
index 77e9e65dd5..00b5d4168d 100644
--- a/src/main/java/neqsim/thermodynamicOperations/chemicalEquilibrium/ChemicalEquilibrium.java
+++ b/src/main/java/neqsim/thermodynamicOperations/chemicalEquilibrium/ChemicalEquilibrium.java
@@ -84,9 +84,10 @@ public void displayResult() {
public void printToFile(String name) {}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {}
-
+*/
/** {@inheritDoc} */
@Override
public double[][] getPoints(int i) {
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java
index 4d9fab4c6b..9c035f516e 100644
--- a/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java
+++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java
@@ -456,9 +456,10 @@ public void solidPhaseFlash() {
public void printToFile(String name) {}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {}
-
+*/
/** {@inheritDoc} */
@Override
public double[][] getPoints(int i) {
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java
index f3a72e893e..99a56be45a 100644
--- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java
+++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java
@@ -109,9 +109,10 @@ public void run() {
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {}
-
+*/
/** {@inheritDoc} */
@Override
public double[][] getPoints(int i) {
diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/HPTphaseEnvelope.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/HPTphaseEnvelope.java
index a59ad23d66..9cccf27d17 100644
--- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/HPTphaseEnvelope.java
+++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/HPTphaseEnvelope.java
@@ -11,7 +11,6 @@
import javax.swing.JProgressBar;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import neqsim.dataPresentation.visAD.visAd3D.visAd3DPlot;
import neqsim.thermo.system.SystemInterface;
import neqsim.thermodynamicOperations.BaseOperation;
import neqsim.thermodynamicOperations.ThermodynamicOperations;
@@ -92,6 +91,7 @@ public void run() {
/** {@inheritDoc} */
@Override
public void displayResult() {
+ /*
try {
mainFrame.setVisible(false);
visAd3DPlot plot =
@@ -102,6 +102,7 @@ public void displayResult() {
} catch (Exception e) {
logger.error("plotting failed");
}
+ */
}
/** {@inheritDoc} */
@@ -115,9 +116,10 @@ public double[][] getPoints(int i) {
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {}
-
+*/
/** {@inheritDoc} */
@Override
public org.jfree.chart.JFreeChart getJFreeChart(String name) {
diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java
index 0d3a5d9061..3d7e7a63ed 100644
--- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java
+++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java
@@ -42,8 +42,6 @@ public class pTphaseEnvelope extends BaseOperation {
double[] cricondenBarX = new double[100];
double[] cricondenBarY = new double[100];
double phaseFraction = 1e-10;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file1;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file2;
int i, j = 0, nummer = 0, iterations = 0, maxNumberOfIterations = 10000;
double gibbsEnergy = 0, gibbsEnergyOld = 0;
double Kold, deviation = 0, g0 = 0, g1 = 0, lowPres = 1.0;
@@ -493,7 +491,7 @@ public void run() {
// double nef = 0.;
// logger.error("error", e2);
}
-
+/*
try {
if (outputToFile) {
// update this
@@ -517,6 +515,7 @@ public void run() {
// double nef = 0.;
logger.error("error", e3);
}
+ */
} catch (Exception e4) {
// double nef = 0.;
logger.error("error", e4);
@@ -724,10 +723,12 @@ public double[] get(String name) {
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {
fileName = name;
}
+ */
/**
* Getter for property bubblePointFirst.
diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java
index dace93335a..fc49ed29aa 100644
--- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java
+++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java
@@ -30,8 +30,6 @@ public class pTphaseEnvelope1 extends BaseOperation {
double[] cricondenTherm = new double[3];
double[] cricondenBar = new double[3];
double phaseFraction = 1e-10;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file1;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file2;
int i, j = 0, nummer = 0, iterations = 0, maxNumberOfIterations = 10000;
double gibbsEnergy = 0, gibbsEnergyOld = 0;
double Kold, deviation = 0, g0 = 0, g1 = 0, lowPres = 1.0;
@@ -308,7 +306,7 @@ public void run() {
}
// monitor.close();
mainFrame.setVisible(false);
-
+/*
if (outputToFile) {
String name1 = new String();
name1 = fileName + "Dew.nc";
@@ -326,6 +324,7 @@ public void run() {
file2.setYvalues(points2[1], "pres", "meter");
file2.createFile();
}
+ */
} catch (Exception e) {
logger.error("error", e);
}
@@ -449,10 +448,12 @@ public double[] get(String name) {
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {
fileName = name;
}
+ */
/**
* Getter for property bubblePointFirst.
diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java
index da70ca2adf..1724eb7e68 100644
--- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java
+++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java
@@ -33,8 +33,6 @@ public class pTphaseEnvelopeMay extends BaseOperation {
double[] cricondenTherm = new double[3];
double[] cricondenBar = new double[3];
double phaseFraction = 1e-10;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file1;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file2;
int i, j = 0, nummer = 0, iterations = 0, maxNumberOfIterations = 10000;
double gibbsEnergy = 0, gibbsEnergyOld = 0;
double Kold, deviation = 0, g0 = 0, g1 = 0, lowPres = 1.0;
@@ -457,7 +455,7 @@ public void run() {
// double nef = 0.;
logger.error("error", e2);
}
-
+/*
try {
if (outputToFile) {
// update this
@@ -481,6 +479,7 @@ public void run() {
// double nef = 0.;
logger.error("error", e3);
}
+ */
} catch (Exception e4) {
// double nef = 0.;
logger.error("error", e4);
@@ -645,10 +644,12 @@ public double[] get(String name) {
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {
fileName = name;
}
+ */
/**
* Getter for property bubblePointFirst.
diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java
index 49b90712b2..8bd63f78dc 100644
--- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java
+++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java
@@ -29,8 +29,6 @@ public class pTphaseEnvelopeNew extends BaseOperation {
double[] cricondenTherm = new double[3];
double[] cricondenBar = new double[3];
double phaseFraction = 1e-10;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file1;
- neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D file2;
int i, j = 0, nummer = 0, iterations = 0, maxNumberOfIterations = 10000;
double lowPres = 1.0;
boolean outputToFile = false;
@@ -258,7 +256,7 @@ public void run() {
}
// monitor.close();
mainFrame.setVisible(false);
-
+/*
if (outputToFile) {
String name1 = new String();
name1 = fileName + "Dew.nc";
@@ -276,6 +274,7 @@ public void run() {
file2.setYvalues(points2[1], "pres", "meter");
file2.createFile();
}
+ */
} catch (Exception e) {
logger.error("error", e);
}
@@ -399,10 +398,12 @@ public double[] get(String name) {
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {
fileName = name;
}
+ */
/** {@inheritDoc} */
@Override
diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java
index 00e94673ae..d09724c10b 100644
--- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java
+++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java
@@ -8,7 +8,6 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import neqsim.dataPresentation.JFreeChart.graph2b;
-import neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D;
import neqsim.thermo.system.SystemInterface;
import neqsim.thermodynamicOperations.OperationInterface;
@@ -148,23 +147,6 @@ public double[][] getPoints(int i) {
return points;
}
- /** {@inheritDoc} */
- @Override
- public void createNetCdfFile(String name) {
- NetCdf2D file = new NetCdf2D();
- file.setOutputFileName(name);
- file.setXvalues(points[0], "loading", "");
- file.setYvalues(points[1], "pressure", "");
- for (int k = 0; k < system.getPhases()[1].getNumberOfComponents(); k++) {
- file.setYvalues(points[k + 2],
- "mol frac " + system.getPhases()[1].getComponents()[k].getComponentName(), "");
- file.setYvalues(points[k + 2 + system.getPhases()[1].getNumberOfComponents()],
- ("activity " + system.getPhases()[1].getComponents()[k].getComponentName()),
- "");
- }
- file.createFile();
- }
-
/** {@inheritDoc} */
@Override
public double[] get(String name) {
diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java
index e1f2ff6a36..5990112903 100644
--- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java
+++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java
@@ -8,7 +8,6 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import neqsim.dataPresentation.JFreeChart.graph2b;
-import neqsim.dataPresentation.fileHandeling.createNetCDF.netCDF2D.NetCdf2D;
import neqsim.thermo.system.SystemInterface;
import neqsim.thermodynamicOperations.BaseOperation;
import neqsim.thermodynamicOperations.ThermodynamicOperations;
@@ -159,6 +158,7 @@ public double[][] getPoints(int i) {
}
/** {@inheritDoc} */
+ /*
@Override
public void createNetCdfFile(String name) {
NetCdf2D file = new NetCdf2D();
@@ -175,7 +175,7 @@ public void createNetCdfFile(String name) {
}
file.createFile();
}
-
+*/
/** {@inheritDoc} */
@Override
public double[] get(String name) {