Skip to content

Commit

Permalink
Merge pull request #11 from equinor/updates_release_1.1
Browse files Browse the repository at this point in the history
Updates release 1.1
  • Loading branch information
EvenSol authored Aug 5, 2019
2 parents 274c8b1 + 81ba4bb commit ccd3c52
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions examples/separatorMechanicalDesign.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
valve1.displayResult()
separator3.displayResult()
scrubberLP.displayResult()
scrubberLP.getLiquidOutStream().displayResult()
# scrubberLP.getLiquidOutStream().displayResult()

# Calculating mechanical design of separators
separator1.displayResult()
Expand All @@ -86,18 +86,18 @@
separator1.getMechanicalDesign().displayResults();
#recycleLP.displayResult()

separator2.displayResult()
#separator2.displayResult()
separator2.getMechanicalDesign().setMaxOperationPressure(50.0);
separator2.addSeparatorSection("tray", "");
separator2.getMechanicalDesign().calcDesign();
separator2.getMechanicalDesign().displayResults();
# separator2.getMechanicalDesign().displayResults();


separator3.displayResult()
#separator3.displayResult()
separator3.getMechanicalDesign().setMaxOperationPressure(10.0);
separator3.addSeparatorSection("tray", "");
separator3.getMechanicalDesign().calcDesign();
separator3.getMechanicalDesign().displayResults();
#separator3.getMechanicalDesign().displayResults();

valve1.getMechanicalDesign().calcDesign();
valve1.getMechanicalDesign().displayResults();
#valve1.getMechanicalDesign().displayResults();
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="neqsim",
version="0.0.1",
version="1.1.0",
author="Even Solbraa",
author_email="[email protected]",
description="NeqSim is a tool for thermodynamic and process calculations",
Expand Down
Binary file modified src/neqsim/lib/NeqSim.jar
Binary file not shown.

0 comments on commit ccd3c52

Please sign in to comment.