nmelone/POC-Java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Production Calculation uses K-Factor

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-07 19:13:48 -06:00
parent 1771df0730
commit a65597d3e1
7 changed files with 92 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/3.1/taskArtifacts/cache.properties.lock
View File

Binary file not shown.

BIN
.gradle/3.1/taskArtifacts/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/3.1/taskArtifacts/fileSnapshots.bin
View File

Binary file not shown.

BIN
.gradle/3.1/taskArtifacts/taskArtifacts.bin
View File

Binary file not shown.

359
.idea/workspace.xml generated
View File

@@ -2,8 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/cache.properties.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/fileHashes.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/fileSnapshots.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/3.1/taskArtifacts/taskArtifacts.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -22,81 +26,42 @@
<file leaf-file-name="Card.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2785">
<caret line="63" column="26" lean-forward="false" selection-start-line="63" selection-start-column="26" selection-end-line="63" selection-end-column="52" />
<folding>
<element signature="e#2156#2157#0" expanded="false" />
<element signature="e#2206#2207#0" expanded="false" />
<element signature="e#2269#2270#0" expanded="false" />
<element signature="e#2320#2321#0" expanded="false" />
<element signature="e#2374#2375#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2471#2472#0" expanded="false" />
<element signature="e#2514#2515#0" expanded="false" />
<element signature="e#2559#2560#0" expanded="false" />
<element signature="e#2602#2603#0" expanded="false" />
<element signature="e#2647#2648#0" expanded="false" />
<element signature="e#2691#2692#0" expanded="false" />
<element signature="e#2731#2732#0" expanded="false" />
<element signature="e#2770#2771#0" expanded="false" />
<element signature="e#2811#2812#0" expanded="false" />
<element signature="e#2851#2852#0" expanded="false" />
<element signature="e#2896#2897#0" expanded="false" />
<element signature="e#2942#2943#0" expanded="false" />
<element signature="e#2979#2980#0" expanded="false" />
<element signature="e#3014#3015#0" expanded="false" />
<element signature="e#3060#3061#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3152#3153#0" expanded="false" />
<element signature="e#3198#3199#0" expanded="false" />
<element signature="e#3250#3251#0" expanded="false" />
<element signature="e#3298#3299#0" expanded="false" />
<element signature="e#3358#3359#0" expanded="false" />
<element signature="e#3414#3415#0" expanded="false" />
<element signature="e#3457#3458#0" expanded="false" />
<element signature="e#3496#3497#0" expanded="false" />
<element signature="e#3532#3533#0" expanded="false" />
<element signature="e#3564#3565#0" expanded="false" />
<element signature="e#3607#3608#0" expanded="false" />
<element signature="e#3646#3647#0" expanded="false" />
<element signature="e#3690#3691#0" expanded="false" />
<element signature="e#3730#3731#0" expanded="false" />
<element signature="e#3771#3772#0" expanded="false" />
<element signature="e#3808#3809#0" expanded="false" />
<element signature="e#3852#3853#0" expanded="false" />
<element signature="e#3892#3893#0" expanded="false" />
<element signature="e#4939#4940#0" expanded="false" />
<element signature="e#4975#4976#0" expanded="false" />
<element signature="e#5030#5031#0" expanded="false" />
<element signature="e#5080#5081#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Well.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2080">
<caret line="38" column="39" lean-forward="true" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
<state relative-caret-position="1295">
<caret line="352" column="81" lean-forward="false" selection-start-line="352" selection-start-column="81" selection-end-line="352" selection-end-column="81" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#14183#14184#0" expanded="true" />
<element signature="e#14219#14220#0" expanded="true" />
<element signature="e#14261#14262#0" expanded="true" />
<element signature="e#14299#14300#0" expanded="true" />
<element signature="e#14339#14340#0" expanded="true" />
<element signature="e#14375#14376#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WellTest.java" pinned="false" current-in-tab="true">
<file leaf-file-name="Well.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="485">
<caret line="895" column="55" lean-forward="true" selection-start-line="895" selection-start-column="55" selection-end-line="895" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#14217#14218#0" expanded="true" />
<element signature="e#14253#14254#0" expanded="true" />
<element signature="e#14295#14296#0" expanded="true" />
<element signature="e#14333#14334#0" expanded="true" />
<element signature="e#14373#14374#0" expanded="true" />
<element signature="e#14409#14410#0" expanded="true" />
<element signature="e#14443#14444#0" expanded="true" />
<element signature="e#14473#14474#0" expanded="true" />
<element signature="e#14519#14520#0" expanded="true" />
<element signature="e#14557#14558#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WellTest.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397">
<caret line="33" column="59" lean-forward="true" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
<state relative-caret-position="667">
<caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1189#1190#0" expanded="true" />
@@ -190,17 +155,17 @@
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/GUI.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/DailyTotal.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
<option value="$PROJECT_DIR$/viceroyWell.json" />
<option value="$PROJECT_DIR$/poc-java.iml" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
<option value="$USER_HOME$/Desktop/new.pas" />
<option value="$USER_HOME$/Desktop/old.pas" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
</list>
</option>
</component>
@@ -603,50 +568,7 @@
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#2156#2157#0" expanded="false" />
<element signature="e#2206#2207#0" expanded="false" />
<element signature="e#2269#2270#0" expanded="false" />
<element signature="e#2320#2321#0" expanded="false" />
<element signature="e#2374#2375#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2471#2472#0" expanded="false" />
<element signature="e#2514#2515#0" expanded="false" />
<element signature="e#2559#2560#0" expanded="false" />
<element signature="e#2602#2603#0" expanded="false" />
<element signature="e#2647#2648#0" expanded="false" />
<element signature="e#2691#2692#0" expanded="false" />
<element signature="e#2731#2732#0" expanded="false" />
<element signature="e#2770#2771#0" expanded="false" />
<element signature="e#2811#2812#0" expanded="false" />
<element signature="e#2851#2852#0" expanded="false" />
<element signature="e#2896#2897#0" expanded="false" />
<element signature="e#2942#2943#0" expanded="false" />
<element signature="e#2979#2980#0" expanded="false" />
<element signature="e#3014#3015#0" expanded="false" />
<element signature="e#3060#3061#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3152#3153#0" expanded="false" />
<element signature="e#3198#3199#0" expanded="false" />
<element signature="e#3250#3251#0" expanded="false" />
<element signature="e#3298#3299#0" expanded="false" />
<element signature="e#3358#3359#0" expanded="false" />
<element signature="e#3414#3415#0" expanded="false" />
<element signature="e#3457#3458#0" expanded="false" />
<element signature="e#3496#3497#0" expanded="false" />
<element signature="e#3532#3533#0" expanded="false" />
<element signature="e#3564#3565#0" expanded="false" />
<element signature="e#3607#3608#0" expanded="false" />
<element signature="e#3646#3647#0" expanded="false" />
<element signature="e#3690#3691#0" expanded="false" />
<element signature="e#3730#3731#0" expanded="false" />
<element signature="e#3771#3772#0" expanded="false" />
<element signature="e#3808#3809#0" expanded="false" />
<element signature="e#3852#3853#0" expanded="false" />
<element signature="e#3892#3893#0" expanded="false" />
<element signature="e#4939#4940#0" expanded="false" />
<element signature="e#4975#4976#0" expanded="false" />
<element signature="e#5030#5031#0" expanded="false" />
<element signature="e#5080#5081#0" expanded="false" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
@@ -657,12 +579,16 @@
<caret line="875" column="5" lean-forward="true" selection-start-line="875" selection-start-column="5" selection-end-line="875" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#14183#14184#0" expanded="true" />
<element signature="e#14219#14220#0" expanded="true" />
<element signature="e#14261#14262#0" expanded="true" />
<element signature="e#14299#14300#0" expanded="true" />
<element signature="e#14339#14340#0" expanded="true" />
<element signature="e#14375#14376#0" expanded="true" />
<element signature="e#14217#14218#0" expanded="true" />
<element signature="e#14253#14254#0" expanded="true" />
<element signature="e#14295#14296#0" expanded="true" />
<element signature="e#14333#14334#0" expanded="true" />
<element signature="e#14373#14374#0" expanded="true" />
<element signature="e#14409#14410#0" expanded="true" />
<element signature="e#14443#14444#0" expanded="true" />
<element signature="e#14473#14474#0" expanded="true" />
<element signature="e#14519#14520#0" expanded="true" />
<element signature="e#14557#14558#0" expanded="true" />
</folding>
</state>
</provider>
@@ -706,50 +632,7 @@
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#2156#2157#0" expanded="false" />
<element signature="e#2206#2207#0" expanded="false" />
<element signature="e#2269#2270#0" expanded="false" />
<element signature="e#2320#2321#0" expanded="false" />
<element signature="e#2374#2375#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2471#2472#0" expanded="false" />
<element signature="e#2514#2515#0" expanded="false" />
<element signature="e#2559#2560#0" expanded="false" />
<element signature="e#2602#2603#0" expanded="false" />
<element signature="e#2647#2648#0" expanded="false" />
<element signature="e#2691#2692#0" expanded="false" />
<element signature="e#2731#2732#0" expanded="false" />
<element signature="e#2770#2771#0" expanded="false" />
<element signature="e#2811#2812#0" expanded="false" />
<element signature="e#2851#2852#0" expanded="false" />
<element signature="e#2896#2897#0" expanded="false" />
<element signature="e#2942#2943#0" expanded="false" />
<element signature="e#2979#2980#0" expanded="false" />
<element signature="e#3014#3015#0" expanded="false" />
<element signature="e#3060#3061#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3152#3153#0" expanded="false" />
<element signature="e#3198#3199#0" expanded="false" />
<element signature="e#3250#3251#0" expanded="false" />
<element signature="e#3298#3299#0" expanded="false" />
<element signature="e#3358#3359#0" expanded="false" />
<element signature="e#3414#3415#0" expanded="false" />
<element signature="e#3457#3458#0" expanded="false" />
<element signature="e#3496#3497#0" expanded="false" />
<element signature="e#3532#3533#0" expanded="false" />
<element signature="e#3564#3565#0" expanded="false" />
<element signature="e#3607#3608#0" expanded="false" />
<element signature="e#3646#3647#0" expanded="false" />
<element signature="e#3690#3691#0" expanded="false" />
<element signature="e#3730#3731#0" expanded="false" />
<element signature="e#3771#3772#0" expanded="false" />
<element signature="e#3808#3809#0" expanded="false" />
<element signature="e#3852#3853#0" expanded="false" />
<element signature="e#3892#3893#0" expanded="false" />
<element signature="e#4939#4940#0" expanded="false" />
<element signature="e#4975#4976#0" expanded="false" />
<element signature="e#5030#5031#0" expanded="false" />
<element signature="e#5080#5081#0" expanded="false" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
@@ -759,50 +642,7 @@
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#2156#2157#0" expanded="false" />
<element signature="e#2206#2207#0" expanded="false" />
<element signature="e#2269#2270#0" expanded="false" />
<element signature="e#2320#2321#0" expanded="false" />
<element signature="e#2374#2375#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2471#2472#0" expanded="false" />
<element signature="e#2514#2515#0" expanded="false" />
<element signature="e#2559#2560#0" expanded="false" />
<element signature="e#2602#2603#0" expanded="false" />
<element signature="e#2647#2648#0" expanded="false" />
<element signature="e#2691#2692#0" expanded="false" />
<element signature="e#2731#2732#0" expanded="false" />
<element signature="e#2770#2771#0" expanded="false" />
<element signature="e#2811#2812#0" expanded="false" />
<element signature="e#2851#2852#0" expanded="false" />
<element signature="e#2896#2897#0" expanded="false" />
<element signature="e#2942#2943#0" expanded="false" />
<element signature="e#2979#2980#0" expanded="false" />
<element signature="e#3014#3015#0" expanded="false" />
<element signature="e#3060#3061#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3152#3153#0" expanded="false" />
<element signature="e#3198#3199#0" expanded="false" />
<element signature="e#3250#3251#0" expanded="false" />
<element signature="e#3298#3299#0" expanded="false" />
<element signature="e#3358#3359#0" expanded="false" />
<element signature="e#3414#3415#0" expanded="false" />
<element signature="e#3457#3458#0" expanded="false" />
<element signature="e#3496#3497#0" expanded="false" />
<element signature="e#3532#3533#0" expanded="false" />
<element signature="e#3564#3565#0" expanded="false" />
<element signature="e#3607#3608#0" expanded="false" />
<element signature="e#3646#3647#0" expanded="false" />
<element signature="e#3690#3691#0" expanded="false" />
<element signature="e#3730#3731#0" expanded="false" />
<element signature="e#3771#3772#0" expanded="false" />
<element signature="e#3808#3809#0" expanded="false" />
<element signature="e#3852#3853#0" expanded="false" />
<element signature="e#3892#3893#0" expanded="false" />
<element signature="e#4939#4940#0" expanded="false" />
<element signature="e#4975#4976#0" expanded="false" />
<element signature="e#5030#5031#0" expanded="false" />
<element signature="e#5080#5081#0" expanded="false" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
@@ -975,59 +815,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2785">
<caret line="63" column="26" lean-forward="false" selection-start-line="63" selection-start-column="26" selection-end-line="63" selection-end-column="52" />
<folding>
<element signature="e#2156#2157#0" expanded="false" />
<element signature="e#2206#2207#0" expanded="false" />
<element signature="e#2269#2270#0" expanded="false" />
<element signature="e#2320#2321#0" expanded="false" />
<element signature="e#2374#2375#0" expanded="false" />
<element signature="e#2416#2417#0" expanded="false" />
<element signature="e#2471#2472#0" expanded="false" />
<element signature="e#2514#2515#0" expanded="false" />
<element signature="e#2559#2560#0" expanded="false" />
<element signature="e#2602#2603#0" expanded="false" />
<element signature="e#2647#2648#0" expanded="false" />
<element signature="e#2691#2692#0" expanded="false" />
<element signature="e#2731#2732#0" expanded="false" />
<element signature="e#2770#2771#0" expanded="false" />
<element signature="e#2811#2812#0" expanded="false" />
<element signature="e#2851#2852#0" expanded="false" />
<element signature="e#2896#2897#0" expanded="false" />
<element signature="e#2942#2943#0" expanded="false" />
<element signature="e#2979#2980#0" expanded="false" />
<element signature="e#3014#3015#0" expanded="false" />
<element signature="e#3060#3061#0" expanded="false" />
<element signature="e#3102#3103#0" expanded="false" />
<element signature="e#3152#3153#0" expanded="false" />
<element signature="e#3198#3199#0" expanded="false" />
<element signature="e#3250#3251#0" expanded="false" />
<element signature="e#3298#3299#0" expanded="false" />
<element signature="e#3358#3359#0" expanded="false" />
<element signature="e#3414#3415#0" expanded="false" />
<element signature="e#3457#3458#0" expanded="false" />
<element signature="e#3496#3497#0" expanded="false" />
<element signature="e#3532#3533#0" expanded="false" />
<element signature="e#3564#3565#0" expanded="false" />
<element signature="e#3607#3608#0" expanded="false" />
<element signature="e#3646#3647#0" expanded="false" />
<element signature="e#3690#3691#0" expanded="false" />
<element signature="e#3730#3731#0" expanded="false" />
<element signature="e#3771#3772#0" expanded="false" />
<element signature="e#3808#3809#0" expanded="false" />
<element signature="e#3852#3853#0" expanded="false" />
<element signature="e#3892#3893#0" expanded="false" />
<element signature="e#4939#4940#0" expanded="false" />
<element signature="e#4975#4976#0" expanded="false" />
<element signature="e#5030#5031#0" expanded="false" />
<element signature="e#5080#5081#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/new.pas">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1078,26 +865,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2080">
<caret line="38" column="39" lean-forward="true" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#14183#14184#0" expanded="true" />
<element signature="e#14219#14220#0" expanded="true" />
<element signature="e#14261#14262#0" expanded="true" />
<element signature="e#14299#14300#0" expanded="true" />
<element signature="e#14339#14340#0" expanded="true" />
<element signature="e#14375#14376#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397">
<caret line="33" column="59" lean-forward="true" selection-start-line="33" selection-start-column="59" selection-end-line="33" selection-end-column="59" />
<state relative-caret-position="667">
<caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1189#1190#0" expanded="true" />
@@ -1124,6 +895,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1295">
<caret line="352" column="81" lean-forward="false" selection-start-line="352" selection-start-column="81" selection-end-line="352" selection-end-column="81" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="485">
<caret line="895" column="55" lean-forward="true" selection-start-line="895" selection-start-column="55" selection-end-line="895" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#14217#14218#0" expanded="true" />
<element signature="e#14253#14254#0" expanded="true" />
<element signature="e#14295#14296#0" expanded="true" />
<element signature="e#14333#14334#0" expanded="true" />
<element signature="e#14373#14374#0" expanded="true" />
<element signature="e#14409#14410#0" expanded="true" />
<element signature="e#14443#14444#0" expanded="true" />
<element signature="e#14473#14474#0" expanded="true" />
<element signature="e#14519#14520#0" expanded="true" />
<element signature="e#14557#14558#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

4
src/main/java/com/henrypump/poc/Card.java
View File

@@ -274,7 +274,7 @@ public class Card {
void calcStrokeData(int numSlices, double fluidGradient, double rodDepth, double anchorDepth, double tubingCSA,
double pumpArea, double frictionEstimate, double structuralRating,
double waterBBLRatio, double oilBBLRatio, double gasMCFRatio)
double kFactor, double waterBBLRatio, double oilBBLRatio, double gasMCFRatio)
{
calculateSPM();
surfacePositionMax = positionMax(surfacePosition, surfaceLoad, numPointsUsed);
@@ -350,7 +350,7 @@ public class Card {
downholeNetStrokeLength = bottomCorner.getPosition() - downholePositionMin.getPosition();
fillageCalculated = (downholeNetStrokeLength / downholeAdjustedGrossStrokeLength) * 100.0;
fillageEstimated =(downholeNetStrokeLength / downholeGrossStrokeLength) * 100.0;
fluidBBLMoved = downholeNetStrokeLength * pumpArea * 0.00010307;
fluidBBLMoved = downholeNetStrokeLength * pumpArea * 0.00010307 * kFactor;
oilBBLMoved = fluidBBLMoved * oilBBLRatio;
waterBBLMoved = fluidBBLMoved * waterBBLRatio;
gasMCFMoved = fluidBBLMoved * gasMCFRatio;

11
src/main/java/com/henrypump/poc/Well.java
View File

@@ -139,6 +139,7 @@ public class Well {
private double fluidOilRatio; // BBL of oil per 1 BBL fluid
private double fluidWaterRatio; // BBL of water per 1 BBL fluid
private double fluidGasRatio; // MCF of gas per 1 BBL fluid
private double kFactor = 1.0;
// DATE & TIME PARAMETERS
private LocalDate lastCheckedDate = null;
@@ -432,6 +433,14 @@ public class Well {
return fluidGasRatio;
}
public double getkFactor() {
return kFactor;
}
public void setkFactor(double kFactor) {
this.kFactor = kFactor;
}
public void setupFluidRatio(double oilRatio, double waterRatio, double gasRatio){
fluidOilRatio = oilRatio;
fluidWaterRatio = waterRatio;
@@ -888,7 +897,7 @@ public class Well {
currentCard.calcStrokeData(150, fluidGradient,
rodDepthTotal, tubingAnchorDepth,
tubingCrossSectionalArea, pumpArea,
frictionEstimate, structuralRating, fluidWaterRatio, fluidOilRatio, fluidGasRatio);
frictionEstimate, structuralRating, kFactor, fluidWaterRatio, fluidOilRatio, fluidGasRatio);
for (int j = 98; j >= 0; j--) {
cardStorage[j + 1] = cardStorage[j];
}