Merge branch 'master' of https://github.com/equinor/neqsim-matlab

Author: EvenSol

example/GasFlashProperties.m

@@ -76,7 +76,7 @@
     TPflash(fluid,0);
     fluid.init(2);
     fluid.initPhysicalProperties();
-    
+
     enthalpy_(c) = fluid.getEnthalpy();
     entropy(c) = fluid.getEntropy();
     numberOfPhases(c) = fluid.getNumberOfPhases();
@@ -90,7 +90,7 @@
     mixKappa(c) = fluid.getKappa();
     mixViscosity(c) = fluid.getViscosity("kg/msec");
     mixThermalConductivity(c) = fluid.getThermalConductivity("W/mK");
-    
+
     if (fluid.hasPhaseType("gas"))
         phaseNumber = fluid.getPhaseNumberOfPhase("gas");
         gasFractionc(c) = fluid.getMoleFraction(phaseNumber)*100;
@@ -107,7 +107,7 @@
         gasSoundSpeed(c) = fluid.getPhase(phaseNumber).getSoundSpeed();
         gasJouleThomsonCoefficient(c) = fluid.getPhase(phaseNumber).getJouleThomsonCoefficient()/1e5;
     end
-    
+
     if (fluid.hasPhaseType("oil"))
         phaseNumber = fluid.getPhaseNumberOfPhase("oil");
         oilFractionc(c) = fluid.getMoleFraction(phaseNumber)*100;
@@ -124,7 +124,7 @@
         oilSoundSpeed(c) = fluid.getPhase(phaseNumber).getSoundSpeed();
         oilJouleThomsonCoefficient(c) = fluid.getPhase(phaseNumber).getJouleThomsonCoefficient()/1e5;
     end
-    
+
     if (fluid.hasPhaseType("aqueous"))
         phaseNumber = fluid.getPhaseNumberOfPhase("aqueous");
         waterFractionc(c) = fluid.getMoleFraction(phaseNumber)*100;

example/testRestAPI.m

@@ -1,26 +1,26 @@
 data = struct('feedGasFlowRate', (117000.0+90000.0)*24.0/1.0e6, ...
-  'feedGasTemperature', 28.5, ...
-  'feedGasPressure', 42.4, ...
-  'absorberFeedGasTemperature', 30.5, ...
-  'absorberFeedGasPressure', 42.4, ...
-  'leanTEGFlowRate', 5432.0*1.1, ...
-  'leanTEGTemperature', 36.3, ...
-  'flashDrumPressure', 5.0, ...
-  'reboilerPressure', 1.23, ...
-  'condenserTemperature', 94.0, ...
-  'condenserPressure', 1.0, ...
-  'reboilerTemperature', 200.3, ...
-  'strippingGasRate', 100.0, ...
-  'strippingGasFeedTemperature', 120.0, ...
-  'regenerationGasCoolerTemperature', 35.0, ...
-  'TEGpumpIsentropicEfficiency', 0.75, ...
-  'finefilterdeltaP', 0.01, ...
-  'carbonfilterdeltaP', 0.01, ... 
-  'numberOfEquilibriumStagesTEGabsorber', 5, ...
-  'stageEfficiencyTEGabsorber', 0.55, ...
-  'stageEfficiencyStripper', 0.5, ...
-  'numberOfEquilibriumStagesStripper', 4, ...
-  'UAvalueLeanRichTEGHeatExchanger', 16100.0);
+    'feedGasTemperature', 28.5, ...
+    'feedGasPressure', 42.4, ...
+    'absorberFeedGasTemperature', 30.5, ...
+    'absorberFeedGasPressure', 42.4, ...
+    'leanTEGFlowRate', 5432.0*1.1, ...
+    'leanTEGTemperature', 36.3, ...
+    'flashDrumPressure', 5.0, ...
+    'reboilerPressure', 1.23, ...
+    'condenserTemperature', 94.0, ...
+    'condenserPressure', 1.0, ...
+    'reboilerTemperature', 200.3, ...
+    'strippingGasRate', 100.0, ...
+    'strippingGasFeedTemperature', 120.0, ...
+    'regenerationGasCoolerTemperature', 35.0, ...
+    'TEGpumpIsentropicEfficiency', 0.75, ...
+    'finefilterdeltaP', 0.01, ...
+    'carbonfilterdeltaP', 0.01, ...
+    'numberOfEquilibriumStagesTEGabsorber', 5, ...
+    'stageEfficiencyTEGabsorber', 0.55, ...
+    'stageEfficiencyStripper', 0.5, ...
+    'numberOfEquilibriumStagesStripper', 4, ...
+    'UAvalueLeanRichTEGHeatExchanger', 16100.0);
 
 % Ocp-Apim-Subscription-Key available from: https://api-test.portal.equinor.com/products/neqsim-live
 options = weboptions('KeyName','Ocp-Apim-Subscription-Key','KeyValue','xxxxxx');

example/threephaseseparation.m

@@ -76,7 +76,7 @@
     pressureAfterTemperatureReduction = separatedGasStream.getFluid().getPressure('bara');
     %separatedGasStream.getFluid()
     %separatedOilStream.getFluid()
-    
+
     %Calculate change in fluid density
     changeInDensityGas(cdeltaT) = (gasDensityAfterTemperatureReduction - gasDensityAtSeparatorConditions)/gasDensityAtSeparatorConditions*100;
     changeInDensityOil(cdeltaT) = (oilDensityAfterTemperatureReduction - oilDensityAtSeparatorConditions)/oilDensityAtSeparatorConditions*100;

lib/compressor.m

@@ -14,7 +14,7 @@
 %
 % DESCRIPTION:
 % Create processequipment compressor
-% 
+%
 % EXAMPLE:
 % cmp = compressor(stream1,p,name)
 

lib/dynvisc.m

@@ -23,7 +23,7 @@
 
 % Even Solbraa, 2001.
 
-if nargin > 2 
+if nargin > 2
     thermoSystem.setPressure(p);
 end
 if nargin > 1

lib/show.m

@@ -39,6 +39,7 @@
     if any(fnames == "getResultTable")
         C = toCell2D(obj.getResultTable());
     end
+
 catch ME
     lastErr = ME;
 end

lib/thermo.m

@@ -46,9 +46,9 @@ case upper('srk-mc')
     case upper('umr')
         thermoSystem = neqsim.thermo.system.SystemUMRPRUMCEos(t,p);
     case upper('GERG2004')
-        thermoSystem = neqsim.thermo.system.SystemGERG2004Eos(t,p); 
+        thermoSystem = neqsim.thermo.system.SystemGERG2004Eos(t,p);
     case upper('GERGwater')
-        thermoSystem = neqsim.thermo.system.SystemGERGwaterEos(t,p); 
+        thermoSystem = neqsim.thermo.system.SystemGERGwaterEos(t,p);
     case upper('ScSrk')
         thermoSystem = neqsim.thermo.system.SystemSrkSchwartzentruberEos(t,p);
     case upper('electrolyte')

pathNeqSim.m

@@ -6,16 +6,16 @@ function pathNeqSim()
 % DESCRIPTION:
 % Add neqsim jar file to dynamic classpath and matlab neqsim lib functions
 % to matlab path.
-% Initialize processOperations object 
+% Initialize processOperations object
 
 global processOperations
 
 appDataName = 'NeqSimLoaded';
 if ~isappdata(0,appDataName) || ~getappdata(0,appDataName)
     baseFol = fileparts(mfilename('fullpath'));
-    
+
     addpath(fullfile(fileparts(mfilename('fullpath')),'lib'));
-    
+
     librarypath = fullfile(baseFol,'ext');
 
     jarFiles = cellstr(ls(fullfile(librarypath,'*.jar')));
@@ -29,11 +29,11 @@ function pathNeqSim()
             javaclasspath(currJar);
         end
     end
-    
+
     % neqsim.util.database.NeqSimDataBase.setDataBaseType("Derby");
     % neqsim.util.database.NeqSimDataBase.setConnectionString("jdbc:derby:classpath:data/neqsimthermodatabase");
     setappdata(0,appDataName,true);
-    
+
     resetProcessOperations();
 end