Stores well test and gets latest kFactor
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
79
.gradletasknamecache
Normal file
79
.gradletasknamecache
Normal file
@@ -0,0 +1,79 @@
|
||||
assemble
|
||||
build
|
||||
buildDependents
|
||||
buildNeeded
|
||||
classes
|
||||
compileJava
|
||||
processResources
|
||||
clean
|
||||
jar
|
||||
testClasses
|
||||
compileTestJava
|
||||
processTestResources
|
||||
init
|
||||
wrapper
|
||||
javadoc
|
||||
buildEnvironment
|
||||
components
|
||||
dependencies
|
||||
dependencyInsight
|
||||
help
|
||||
model
|
||||
projects
|
||||
properties
|
||||
tasks
|
||||
cleanIdea
|
||||
cleanIdeaModule
|
||||
cleanIdeaProject
|
||||
idea
|
||||
ideaModule
|
||||
ideaProject
|
||||
ideaWorkspace
|
||||
check
|
||||
test
|
||||
cleanIdeaWorkspace
|
||||
deploy
|
||||
fatJar
|
||||
install
|
||||
runRemote
|
||||
Pattern:
|
||||
Pattern:
|
||||
Pattern:
|
||||
assemble
|
||||
build
|
||||
buildDependents
|
||||
buildNeeded
|
||||
classes
|
||||
compileJava
|
||||
processResources
|
||||
clean
|
||||
jar
|
||||
testClasses
|
||||
compileTestJava
|
||||
processTestResources
|
||||
init
|
||||
wrapper
|
||||
javadoc
|
||||
buildEnvironment
|
||||
components
|
||||
dependencies
|
||||
dependencyInsight
|
||||
help
|
||||
model
|
||||
projects
|
||||
properties
|
||||
tasks
|
||||
cleanIdea
|
||||
cleanIdeaModule
|
||||
cleanIdeaProject
|
||||
idea
|
||||
ideaModule
|
||||
ideaProject
|
||||
ideaWorkspace
|
||||
check
|
||||
test
|
||||
cleanIdeaWorkspace
|
||||
deploy
|
||||
fatJar
|
||||
install
|
||||
runRemote
|
||||
795
.idea/workspace.xml
generated
795
.idea/workspace.xml
generated
@@ -2,17 +2,18 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
|
||||
<change type="DELETED" beforePath="$PROJECT_DIR$/dependency-reduced-pom.xml" afterPath="" />
|
||||
<change type="DELETED" beforePath="$PROJECT_DIR$/pom.xml" afterPath="" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Database.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Database.class" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Measurement.class" afterPath="$PROJECT_DIR$/target/classes/com/henrypump/poc/Measurement.class" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/original-poc-java-1.0-SNAPSHOT.jar" afterPath="$PROJECT_DIR$/target/original-poc-java-1.0-SNAPSHOT.jar" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/poc-java-1.0-SNAPSHOT.jar" afterPath="$PROJECT_DIR$/target/poc-java-1.0-SNAPSHOT.jar" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java" />
|
||||
<change type="DELETED" beforePath="$PROJECT_DIR$/wellSetup.json" afterPath="" />
|
||||
<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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/poc-java.iml" afterPath="$PROJECT_DIR$/poc-java.iml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" afterPath="$PROJECT_DIR$/target/maven-archiver/pom.properties" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/surefire-reports/com.henrypump.poc.AppTest.txt" afterPath="$PROJECT_DIR$/target/surefire-reports/com.henrypump.poc.AppTest.txt" />
|
||||
<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/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" />
|
||||
@@ -31,36 +32,53 @@
|
||||
<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="180">
|
||||
<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="imports" expanded="true" />
|
||||
<element signature="e#3937#3938#0" expanded="true" />
|
||||
<element signature="e#3978#3979#0" expanded="true" />
|
||||
<element signature="e#4015#4016#0" expanded="true" />
|
||||
<element signature="e#4048#4049#0" expanded="true" />
|
||||
<element signature="e#4086#4087#0" expanded="true" />
|
||||
<element signature="e#4120#4121#0" expanded="true" />
|
||||
<element signature="e#4168#4169#0" expanded="true" />
|
||||
<element signature="e#4212#4213#0" expanded="true" />
|
||||
<element signature="e#4253#4254#0" expanded="true" />
|
||||
<element signature="e#4290#4291#0" expanded="true" />
|
||||
<element signature="e#4331#4332#0" expanded="true" />
|
||||
<element signature="e#4368#4369#0" expanded="true" />
|
||||
<element signature="e#4409#4410#0" expanded="true" />
|
||||
<element signature="e#4446#4447#0" expanded="true" />
|
||||
<element signature="e#4488#4489#0" expanded="true" />
|
||||
<element signature="e#4526#4527#0" expanded="true" />
|
||||
<element signature="e#4568#4569#0" expanded="true" />
|
||||
<element signature="e#4606#4607#0" expanded="true" />
|
||||
<element signature="e#4646#4647#0" expanded="true" />
|
||||
<element signature="e#4682#4683#0" expanded="true" />
|
||||
<element signature="e#4722#4723#0" expanded="true" />
|
||||
<element signature="e#4758#4759#0" expanded="true" />
|
||||
<element signature="e#4796#4797#0" expanded="true" />
|
||||
<element signature="e#4830#4831#0" expanded="true" />
|
||||
<element signature="e#4868#4869#0" expanded="true" />
|
||||
<element signature="e#4902#4903#0" expanded="true" />
|
||||
<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>
|
||||
@@ -69,9 +87,49 @@
|
||||
<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="727">
|
||||
<caret line="159" column="0" lean-forward="false" selection-start-line="159" selection-start-column="0" selection-end-line="159" selection-end-column="0" />
|
||||
<folding />
|
||||
<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>
|
||||
</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="322">
|
||||
<caret line="28" column="27" lean-forward="true" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1279#1280#0" expanded="true" />
|
||||
<element signature="e#1311#1312#0" expanded="true" />
|
||||
<element signature="e#1345#1346#0" expanded="true" />
|
||||
<element signature="e#1377#1378#0" expanded="true" />
|
||||
<element signature="e#1417#1418#0" expanded="true" />
|
||||
<element signature="e#1453#1454#0" expanded="true" />
|
||||
<element signature="e#1490#1491#0" expanded="true" />
|
||||
<element signature="e#1523#1524#0" expanded="true" />
|
||||
<element signature="e#1562#1563#0" expanded="true" />
|
||||
<element signature="e#1597#1598#0" expanded="true" />
|
||||
<element signature="e#1634#1635#0" expanded="true" />
|
||||
<element signature="e#1667#1668#0" expanded="true" />
|
||||
<element signature="e#1701#1702#0" expanded="true" />
|
||||
<element signature="e#1731#1732#0" expanded="true" />
|
||||
<element signature="e#1766#1767#0" expanded="true" />
|
||||
<element signature="e#1797#1798#0" expanded="true" />
|
||||
<element signature="e#1834#1835#0" expanded="true" />
|
||||
<element signature="e#1867#1868#0" expanded="true" />
|
||||
<element signature="e#1905#1906#0" expanded="true" />
|
||||
<element signature="e#1939#1940#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -79,28 +137,8 @@
|
||||
<file leaf-file-name="Database.java" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="470">
|
||||
<caret line="95" column="13" lean-forward="false" selection-start-line="95" selection-start-column="13" selection-end-line="95" selection-end-column="13" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="settings.gradle" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/settings.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<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 />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/build.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="425">
|
||||
<caret line="48" column="5" lean-forward="true" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
|
||||
<state relative-caret-position="1010">
|
||||
<caret line="129" column="42" lean-forward="true" selection-start-line="129" selection-start-column="42" selection-end-line="129" selection-end-column="42" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -109,35 +147,18 @@
|
||||
<file leaf-file-name="Measurement.java" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="560">
|
||||
<caret line="102" column="45" lean-forward="false" selection-start-line="102" selection-start-column="45" selection-end-line="102" selection-end-column="45" />
|
||||
<folding>
|
||||
<element signature="e#1863#1864#0" expanded="true" />
|
||||
<element signature="e#1893#1894#0" expanded="true" />
|
||||
<element signature="e#1928#1929#0" expanded="true" />
|
||||
<element signature="e#1959#1960#0" expanded="true" />
|
||||
<element signature="e#1994#1995#0" expanded="true" />
|
||||
<element signature="e#2025#2026#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="viceroyWell.json" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/viceroyWell.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="180">
|
||||
<caret line="12" column="20" lean-forward="false" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
|
||||
<state relative-caret-position="1395">
|
||||
<caret line="109" column="35" lean-forward="false" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="POC.java" pinned="false" current-in-tab="false">
|
||||
<file leaf-file-name="POC.java" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="478">
|
||||
<caret line="94" column="51" lean-forward="false" selection-start-line="94" selection-start-column="51" selection-end-line="94" selection-end-column="51" />
|
||||
<state relative-caret-position="320">
|
||||
<caret line="131" column="76" lean-forward="false" selection-start-line="131" selection-start-column="76" selection-end-line="131" selection-end-column="76" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -157,6 +178,8 @@
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>sPositionPrevious</find>
|
||||
<find>ΩΩ</find>
|
||||
<find>private Measurement</find>
|
||||
</findStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
@@ -178,12 +201,16 @@
|
||||
<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$/src/main/java/com/henrypump/poc/POC.java" />
|
||||
<option value="$PROJECT_DIR$/viceroyWell.json" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
|
||||
<option value="$PROJECT_DIR$/poc-java.iml" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.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/WellTest.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -280,6 +307,9 @@
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="project.structure.last.edited" value="Modules" />
|
||||
<property name="project.structure.proportion" value="0.0" />
|
||||
<property name="project.structure.side.proportion" value="0.0" />
|
||||
</component>
|
||||
<component name="RunManager" selected="Application.POC">
|
||||
<configuration default="false" name="POC" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
@@ -531,37 +561,37 @@
|
||||
<servers />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="10" y="23" width="1670" height="959" extended-state="6" />
|
||||
<frame x="10" y="23" width="1670" height="959" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.11396648" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32985258" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.11396648" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32985258" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27825552" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="VcsContentAnnotationSettings">
|
||||
@@ -583,33 +613,50 @@
|
||||
<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="imports" expanded="true" />
|
||||
<element signature="e#3937#3938#0" expanded="true" />
|
||||
<element signature="e#3978#3979#0" expanded="true" />
|
||||
<element signature="e#4015#4016#0" expanded="true" />
|
||||
<element signature="e#4048#4049#0" expanded="true" />
|
||||
<element signature="e#4086#4087#0" expanded="true" />
|
||||
<element signature="e#4120#4121#0" expanded="true" />
|
||||
<element signature="e#4168#4169#0" expanded="true" />
|
||||
<element signature="e#4212#4213#0" expanded="true" />
|
||||
<element signature="e#4253#4254#0" expanded="true" />
|
||||
<element signature="e#4290#4291#0" expanded="true" />
|
||||
<element signature="e#4331#4332#0" expanded="true" />
|
||||
<element signature="e#4368#4369#0" expanded="true" />
|
||||
<element signature="e#4409#4410#0" expanded="true" />
|
||||
<element signature="e#4446#4447#0" expanded="true" />
|
||||
<element signature="e#4488#4489#0" expanded="true" />
|
||||
<element signature="e#4526#4527#0" expanded="true" />
|
||||
<element signature="e#4568#4569#0" expanded="true" />
|
||||
<element signature="e#4606#4607#0" expanded="true" />
|
||||
<element signature="e#4646#4647#0" expanded="true" />
|
||||
<element signature="e#4682#4683#0" expanded="true" />
|
||||
<element signature="e#4722#4723#0" expanded="true" />
|
||||
<element signature="e#4758#4759#0" expanded="true" />
|
||||
<element signature="e#4796#4797#0" expanded="true" />
|
||||
<element signature="e#4830#4831#0" expanded="true" />
|
||||
<element signature="e#4868#4869#0" expanded="true" />
|
||||
<element signature="e#4902#4903#0" expanded="true" />
|
||||
<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>
|
||||
@@ -618,7 +665,15 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="13125">
|
||||
<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 />
|
||||
<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>
|
||||
@@ -628,12 +683,12 @@
|
||||
<caret line="72" column="28" lean-forward="false" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="false" />
|
||||
<element signature="e#1642#1650#0" expanded="false" />
|
||||
<element signature="e#1694#1702#0" expanded="false" />
|
||||
<element signature="e#1746#1754#0" expanded="false" />
|
||||
<element signature="e#1798#1806#0" expanded="false" />
|
||||
<element signature="e#2610#2611#0" expanded="false" />
|
||||
<element signature="e#2645#2646#0" expanded="false" />
|
||||
<element signature="e#1668#1676#0" expanded="false" />
|
||||
<element signature="e#1720#1728#0" expanded="false" />
|
||||
<element signature="e#1772#1780#0" expanded="false" />
|
||||
<element signature="e#1824#1832#0" expanded="false" />
|
||||
<element signature="e#2636#2637#0" expanded="false" />
|
||||
<element signature="e#2671#2672#0" expanded="false" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -661,33 +716,50 @@
|
||||
<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="imports" expanded="true" />
|
||||
<element signature="e#3937#3938#0" expanded="true" />
|
||||
<element signature="e#3978#3979#0" expanded="true" />
|
||||
<element signature="e#4015#4016#0" expanded="true" />
|
||||
<element signature="e#4048#4049#0" expanded="true" />
|
||||
<element signature="e#4086#4087#0" expanded="true" />
|
||||
<element signature="e#4120#4121#0" expanded="true" />
|
||||
<element signature="e#4168#4169#0" expanded="true" />
|
||||
<element signature="e#4212#4213#0" expanded="true" />
|
||||
<element signature="e#4253#4254#0" expanded="true" />
|
||||
<element signature="e#4290#4291#0" expanded="true" />
|
||||
<element signature="e#4331#4332#0" expanded="true" />
|
||||
<element signature="e#4368#4369#0" expanded="true" />
|
||||
<element signature="e#4409#4410#0" expanded="true" />
|
||||
<element signature="e#4446#4447#0" expanded="true" />
|
||||
<element signature="e#4488#4489#0" expanded="true" />
|
||||
<element signature="e#4526#4527#0" expanded="true" />
|
||||
<element signature="e#4568#4569#0" expanded="true" />
|
||||
<element signature="e#4606#4607#0" expanded="true" />
|
||||
<element signature="e#4646#4647#0" expanded="true" />
|
||||
<element signature="e#4682#4683#0" expanded="true" />
|
||||
<element signature="e#4722#4723#0" expanded="true" />
|
||||
<element signature="e#4758#4759#0" expanded="true" />
|
||||
<element signature="e#4796#4797#0" expanded="true" />
|
||||
<element signature="e#4830#4831#0" expanded="true" />
|
||||
<element signature="e#4868#4869#0" expanded="true" />
|
||||
<element signature="e#4902#4903#0" expanded="true" />
|
||||
<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>
|
||||
@@ -697,33 +769,50 @@
|
||||
<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="imports" expanded="true" />
|
||||
<element signature="e#3937#3938#0" expanded="true" />
|
||||
<element signature="e#3978#3979#0" expanded="true" />
|
||||
<element signature="e#4015#4016#0" expanded="true" />
|
||||
<element signature="e#4048#4049#0" expanded="true" />
|
||||
<element signature="e#4086#4087#0" expanded="true" />
|
||||
<element signature="e#4120#4121#0" expanded="true" />
|
||||
<element signature="e#4168#4169#0" expanded="true" />
|
||||
<element signature="e#4212#4213#0" expanded="true" />
|
||||
<element signature="e#4253#4254#0" expanded="true" />
|
||||
<element signature="e#4290#4291#0" expanded="true" />
|
||||
<element signature="e#4331#4332#0" expanded="true" />
|
||||
<element signature="e#4368#4369#0" expanded="true" />
|
||||
<element signature="e#4409#4410#0" expanded="true" />
|
||||
<element signature="e#4446#4447#0" expanded="true" />
|
||||
<element signature="e#4488#4489#0" expanded="true" />
|
||||
<element signature="e#4526#4527#0" expanded="true" />
|
||||
<element signature="e#4568#4569#0" expanded="true" />
|
||||
<element signature="e#4606#4607#0" expanded="true" />
|
||||
<element signature="e#4646#4647#0" expanded="true" />
|
||||
<element signature="e#4682#4683#0" expanded="true" />
|
||||
<element signature="e#4722#4723#0" expanded="true" />
|
||||
<element signature="e#4758#4759#0" expanded="true" />
|
||||
<element signature="e#4796#4797#0" expanded="true" />
|
||||
<element signature="e#4830#4831#0" expanded="true" />
|
||||
<element signature="e#4868#4869#0" expanded="true" />
|
||||
<element signature="e#4902#4903#0" expanded="true" />
|
||||
<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>
|
||||
@@ -855,7 +944,7 @@
|
||||
<state relative-caret-position="795">
|
||||
<caret line="53" column="13" lean-forward="false" selection-start-line="41" selection-start-column="10" selection-end-line="53" selection-end-column="13" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="imports" expanded="false" />
|
||||
<marker date="1486149779000" expanded="true" signature="1279:1358" ph="(e) → {" />
|
||||
<marker date="1486149779000" expanded="true" signature="1516:1533" ph="}" />
|
||||
<marker date="1486149779000" expanded="true" signature="1578:1657" ph="(e) → {" />
|
||||
@@ -872,16 +961,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="478">
|
||||
<caret line="94" column="51" lean-forward="false" selection-start-line="94" selection-start-column="51" selection-end-line="94" selection-end-column="51" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/viceroyWell.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="180">
|
||||
@@ -890,73 +969,6 @@
|
||||
</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="727">
|
||||
<caret line="159" column="0" lean-forward="false" selection-start-line="159" selection-start-column="0" selection-end-line="159" selection-end-column="0" />
|
||||
<folding />
|
||||
</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="180">
|
||||
<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="imports" expanded="true" />
|
||||
<element signature="e#3937#3938#0" expanded="true" />
|
||||
<element signature="e#3978#3979#0" expanded="true" />
|
||||
<element signature="e#4015#4016#0" expanded="true" />
|
||||
<element signature="e#4048#4049#0" expanded="true" />
|
||||
<element signature="e#4086#4087#0" expanded="true" />
|
||||
<element signature="e#4120#4121#0" expanded="true" />
|
||||
<element signature="e#4168#4169#0" expanded="true" />
|
||||
<element signature="e#4212#4213#0" expanded="true" />
|
||||
<element signature="e#4253#4254#0" expanded="true" />
|
||||
<element signature="e#4290#4291#0" expanded="true" />
|
||||
<element signature="e#4331#4332#0" expanded="true" />
|
||||
<element signature="e#4368#4369#0" expanded="true" />
|
||||
<element signature="e#4409#4410#0" expanded="true" />
|
||||
<element signature="e#4446#4447#0" expanded="true" />
|
||||
<element signature="e#4488#4489#0" expanded="true" />
|
||||
<element signature="e#4526#4527#0" expanded="true" />
|
||||
<element signature="e#4568#4569#0" expanded="true" />
|
||||
<element signature="e#4606#4607#0" expanded="true" />
|
||||
<element signature="e#4646#4647#0" expanded="true" />
|
||||
<element signature="e#4682#4683#0" expanded="true" />
|
||||
<element signature="e#4722#4723#0" expanded="true" />
|
||||
<element signature="e#4758#4759#0" expanded="true" />
|
||||
<element signature="e#4796#4797#0" expanded="true" />
|
||||
<element signature="e#4830#4831#0" expanded="true" />
|
||||
<element signature="e#4868#4869#0" expanded="true" />
|
||||
<element signature="e#4902#4903#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="560">
|
||||
<caret line="102" column="45" lean-forward="false" selection-start-line="102" selection-start-column="45" selection-end-line="102" selection-end-column="45" />
|
||||
<folding>
|
||||
<element signature="e#1863#1864#0" expanded="true" />
|
||||
<element signature="e#1893#1894#0" expanded="true" />
|
||||
<element signature="e#1928#1929#0" expanded="true" />
|
||||
<element signature="e#1959#1960#0" expanded="true" />
|
||||
<element signature="e#1994#1995#0" expanded="true" />
|
||||
<element signature="e#2025#2026#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="470">
|
||||
<caret line="95" column="13" lean-forward="false" selection-start-line="95" selection-start-column="13" selection-end-line="95" selection-end-column="13" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/settings.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
@@ -965,13 +977,238 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/build.gradle">
|
||||
<entry file="file://$PROJECT_DIR$/poc-java.iml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="425">
|
||||
<caret line="48" column="5" lean-forward="true" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
|
||||
<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 />
|
||||
</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">
|
||||
<caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Desktop/old.pas">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/build.gradle">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="725">
|
||||
<caret line="69" column="1" lean-forward="true" selection-start-line="69" selection-start-column="1" selection-end-line="69" selection-end-column="1" />
|
||||
<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="-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/Database.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1010">
|
||||
<caret line="129" column="42" lean-forward="true" selection-start-line="129" selection-start-column="42" selection-end-line="129" selection-end-column="42" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1395">
|
||||
<caret line="109" column="35" lean-forward="false" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" />
|
||||
<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="322">
|
||||
<caret line="28" column="27" lean-forward="true" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1279#1280#0" expanded="true" />
|
||||
<element signature="e#1311#1312#0" expanded="true" />
|
||||
<element signature="e#1345#1346#0" expanded="true" />
|
||||
<element signature="e#1377#1378#0" expanded="true" />
|
||||
<element signature="e#1417#1418#0" expanded="true" />
|
||||
<element signature="e#1453#1454#0" expanded="true" />
|
||||
<element signature="e#1490#1491#0" expanded="true" />
|
||||
<element signature="e#1523#1524#0" expanded="true" />
|
||||
<element signature="e#1562#1563#0" expanded="true" />
|
||||
<element signature="e#1597#1598#0" expanded="true" />
|
||||
<element signature="e#1634#1635#0" expanded="true" />
|
||||
<element signature="e#1667#1668#0" expanded="true" />
|
||||
<element signature="e#1701#1702#0" expanded="true" />
|
||||
<element signature="e#1731#1732#0" expanded="true" />
|
||||
<element signature="e#1766#1767#0" expanded="true" />
|
||||
<element signature="e#1797#1798#0" expanded="true" />
|
||||
<element signature="e#1834#1835#0" expanded="true" />
|
||||
<element signature="e#1867#1868#0" expanded="true" />
|
||||
<element signature="e#1905#1906#0" expanded="true" />
|
||||
<element signature="e#1939#1940#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="320">
|
||||
<caret line="131" column="76" lean-forward="false" selection-start-line="131" selection-start-column="76" selection-end-line="131" selection-end-column="76" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
<state key="ArtifactsStructureConfigurable.UI">
|
||||
<settings>
|
||||
<artifact-editor />
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="FacetStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>No facets are configured</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="GlobalLibrariesConfigurable.UI">
|
||||
<settings>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="JdkListConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>1.8</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="ModuleStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>poc-java</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
<option value="0.6" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="ProjectLibrariesConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>Maven: com.googlecode.json-simple:json-simple:1.1.1</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
</states>
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,5 +1,6 @@
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'maven'
|
||||
apply plugin: 'idea'
|
||||
|
||||
|
||||
group = 'com.henrypump.poc'
|
||||
@@ -43,9 +44,9 @@ remotes {
|
||||
//create a single Jar with all dependencies
|
||||
task fatJar(type: Jar) {
|
||||
manifest {
|
||||
attributes 'Implementation-Title': 'Gradle Jar File Example',
|
||||
attributes 'Implementation-Title': 'POC Jar File',
|
||||
'Implementation-Version': version,
|
||||
'Main-Class': 'com.mkyong.DateUtils'
|
||||
'Main-Class': 'com.henrypump.poc.POC'
|
||||
}
|
||||
baseName = project.name + '-all'
|
||||
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||
@@ -63,7 +64,7 @@ task deploy << {
|
||||
task runRemote << {
|
||||
ssh.run {
|
||||
session(remotes.edison) {
|
||||
execute 'java -cp .:/usr/lib/java/*:poc-java-all-1.0-SNAPSHOT.jar com.henrypump.poc.POC viceroyWell.json card_72599_surface.csv'
|
||||
execute 'java -cp .:/usr/lib/java/*:poc-java-all-1.0-SNAPSHOT.jar com.henrypump.poc.POC kiesha7265Well.json kiesha7265_card_147_surface.csv'
|
||||
}
|
||||
}
|
||||
}
|
||||
31
kiesha7265Well.json
Normal file
31
kiesha7265Well.json
Normal file
@@ -0,0 +1,31 @@
|
||||
{
|
||||
"deltaT": 0.1,
|
||||
"pumpDiameter": 2.0,
|
||||
"fluidGradient": 0.45,
|
||||
"tubingID": 2.441,
|
||||
"tubingOD": 2.875,
|
||||
"tubingAnchorDepth": 5963.0,
|
||||
"structuralRating": 320000.0,
|
||||
"stuffingBoxFriction": 100.0,
|
||||
"tubingHeadPressure": 100.0,
|
||||
"tapers": [
|
||||
{
|
||||
"length": 4097.0,
|
||||
"diameter": 1.225,
|
||||
"material": "fiberglass",
|
||||
"dampingFactor": 0.8
|
||||
},
|
||||
{
|
||||
"length": 1550.0,
|
||||
"diameter": 1.0,
|
||||
"material": "steel",
|
||||
"dampingFactor": 0.8
|
||||
},
|
||||
{
|
||||
"length": 250.0,
|
||||
"diameter": 1.5,
|
||||
"material": "steel",
|
||||
"dampingFactor": 0.8
|
||||
}
|
||||
]
|
||||
}
|
||||
72
kiesha7265_card_147_surface.csv
Normal file
72
kiesha7265_card_147_surface.csv
Normal file
@@ -0,0 +1,72 @@
|
||||
108.61,5568.25
|
||||
105.89,5513.06
|
||||
103.39,5434.58
|
||||
100.19,5293.22
|
||||
97,5167.38
|
||||
93.23,5048.32
|
||||
89.59,4983.5
|
||||
85.37,4931.5
|
||||
81.26,4880.43
|
||||
76.69,4835.59
|
||||
71.99,4831.69
|
||||
66.99,4830.27
|
||||
61.54,4882.61
|
||||
56.15,4948.93
|
||||
50.87,5011.63
|
||||
45.22,5069.05
|
||||
39.76,5143.23
|
||||
34.34,5191.4
|
||||
29.14,5219.3
|
||||
24.14,5202.72
|
||||
19.01,5058.44
|
||||
15.06,4815.65
|
||||
11.41,4658.12
|
||||
8.19,4573.74
|
||||
5.29,4535.83
|
||||
3.33,4512.9
|
||||
2.01,4517.67
|
||||
1.43,4533.9
|
||||
1.43,4639.57
|
||||
1.82,4847.4
|
||||
2.82,5032.86
|
||||
4.93,5180.57
|
||||
7.1,5294.55
|
||||
9.51,5371.81
|
||||
12.18,5503.77
|
||||
15.85,5724.93
|
||||
19.83,5995.5
|
||||
24.05,6268.74
|
||||
28.64,6516.94
|
||||
32.95,6699.54
|
||||
37.7,6823.33
|
||||
42.63,6966.71
|
||||
48.11,7056.78
|
||||
53.1,7075.33
|
||||
58.13,6976.73
|
||||
63.06,6838.9
|
||||
68.49,6633.76
|
||||
73.6,6459.24
|
||||
78.99,6251.46
|
||||
83.75,5989.22
|
||||
88.35,5712.01
|
||||
93.03,5423.94
|
||||
97.34,5218.33
|
||||
101.14,5082.52
|
||||
104.61,4993.43
|
||||
107.9,4934.21
|
||||
110.81,4865.85
|
||||
113.08,4871.49
|
||||
114.92,4941.21
|
||||
116.56,5049.92
|
||||
117.64,5164.69
|
||||
118.34,5255.13
|
||||
118.37,5277.04
|
||||
118.42,5281.13
|
||||
118,5298.63
|
||||
117.13,5503.39
|
||||
115.98,5618.52
|
||||
114.41,5666.09
|
||||
112.48,5647.89
|
||||
110.44,5618.84
|
||||
108.28,5572.79
|
||||
108.61,5568.25
|
||||
|
71
kiesha7265_card_3_surface.csv
Normal file
71
kiesha7265_card_3_surface.csv
Normal file
@@ -0,0 +1,71 @@
|
||||
106.56,5559.16
|
||||
103.69,5476.74
|
||||
100.91,5347.85
|
||||
97.7,5202.76
|
||||
94.04,5081.64
|
||||
90.16,4969.94
|
||||
86.1,4907.14
|
||||
81.93,4857.86
|
||||
77.56,4848.6
|
||||
73.5,4836.39
|
||||
68.53,4840.4
|
||||
63.35,4882.71
|
||||
57.48,4962.65
|
||||
52.21,5048
|
||||
46.41,5112.74
|
||||
41.07,5174.13
|
||||
35.3,5239.02
|
||||
30.07,5266.9
|
||||
24.81,5229.27
|
||||
20.09,5038.89
|
||||
15.87,4771.81
|
||||
12.18,4605.68
|
||||
8.96,4507.07
|
||||
6.12,4457.05
|
||||
3.98,4431.96
|
||||
2.35,4423.11
|
||||
1.21,4416.8
|
||||
1.24,4555.69
|
||||
1.46,4774.43
|
||||
2.41,4975.61
|
||||
4.3,5141.43
|
||||
6.46,5271.44
|
||||
8.87,5371.92
|
||||
11.87,5480.33
|
||||
15.38,5622.74
|
||||
18.95,5886.1
|
||||
23.29,6185.17
|
||||
27.42,6498.76
|
||||
32.06,6699.7
|
||||
36.8,6844.66
|
||||
41.54,6979.34
|
||||
46.22,7073
|
||||
51.75,7119.29
|
||||
57.21,7094.23
|
||||
62.41,6933.75
|
||||
67.48,6728.46
|
||||
72.67,6509.91
|
||||
77.51,6254.98
|
||||
82.08,6006.73
|
||||
87.12,5749.58
|
||||
92.03,5454.61
|
||||
96.37,5194.45
|
||||
100.34,5008.54
|
||||
104.03,4899.88
|
||||
107.43,4841.2
|
||||
109.94,4824.88
|
||||
112.65,4809.43
|
||||
114.67,4838.17
|
||||
116.34,4928.36
|
||||
117.31,5077.75
|
||||
117.73,5192.38
|
||||
118.43,5257
|
||||
118.63,5265.33
|
||||
118.38,5320.02
|
||||
117.54,5469.46
|
||||
116.15,5617.94
|
||||
114.93,5682.86
|
||||
113.03,5696.01
|
||||
111.28,5676.49
|
||||
109.07,5614.65
|
||||
106.56,5559.16
|
||||
|
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
|
||||
@@ -14,6 +14,7 @@ import org.bson.Document;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.Instant;
|
||||
import java.util.Arrays;
|
||||
|
||||
import com.mongodb.client.MongoCursor;
|
||||
@@ -82,22 +83,21 @@ public class Database {
|
||||
}
|
||||
|
||||
public long newMeasurement(Measurement inpMeasurement){
|
||||
// String df = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(new Date());
|
||||
// MongoCollection<Document> collection = database.getCollection("wellData");
|
||||
// Document doc = new Document("tagname", inpMeasurement.getTagName())
|
||||
//// .append("currentValue", inpMeasurement.getCurrentValue())
|
||||
//// .append("maxDailyValue", inpMeasurement.getDailyMax())
|
||||
//// .append("minDailyValue", inpMeasurement.getDailyMin())
|
||||
//// .append("dailyAverage", inpMeasurement.getAverage())
|
||||
//// .append("dailyTotal", inpMeasurement.getTotal())
|
||||
// .append("timestamp", df);
|
||||
// collection.insertOne(doc);
|
||||
// return collection.count();
|
||||
return 1;
|
||||
String df = Date.from(Instant.now()).toString();
|
||||
MongoCollection<Document> collection = database.getCollection("wellData");
|
||||
Document doc = new Document("tagname", inpMeasurement.getTagName())
|
||||
.append("currentValue", inpMeasurement.getCurrentValue())
|
||||
.append("maxDailyValue", inpMeasurement.getDailyMax())
|
||||
.append("minDailyValue", inpMeasurement.getDailyMin())
|
||||
.append("dailyAverage", inpMeasurement.getAverage())
|
||||
.append("dailyTotal", inpMeasurement.getTotal())
|
||||
.append("timestamp", df);
|
||||
collection.insertOne(doc);
|
||||
return collection.count();
|
||||
}
|
||||
|
||||
public long newDailyTotal(Measurement inpMeasurement){
|
||||
String df = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss").format(new Date());
|
||||
String df = Date.from(Instant.now()).toString();
|
||||
MongoCollection<Document> collection = database.getCollection("gaugeOffData");
|
||||
Document doc = new Document("tagname", inpMeasurement.getTagName())
|
||||
.append("currentValue", inpMeasurement.getCurrentValue())
|
||||
@@ -111,4 +111,67 @@ public class Database {
|
||||
|
||||
}
|
||||
|
||||
public double getPreviousDailyTotal(Date inpDateTime){
|
||||
String isoInpDateTime = inpDateTime.toString();
|
||||
MongoCollection<Document> wellTestCollection = database.getCollection("gaugeOffData");
|
||||
MongoCursor<Document> cursor = wellTestCollection.find(and(eq("tagname", "Fluid Produced"), lte("timestamp", isoInpDateTime)))
|
||||
.sort(Sorts.descending("timestamp")).limit(1).iterator();
|
||||
double lastTotal = -1.0;
|
||||
try {
|
||||
while (cursor.hasNext()) {
|
||||
lastTotal = cursor.next().getDouble("dailyTotal");
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
return lastTotal;
|
||||
};
|
||||
|
||||
public long newWellTest(WellTest inp){
|
||||
String df = Date.from(Instant.now()).toString();
|
||||
MongoCollection<Document> collection = database.getCollection("wellTestData");
|
||||
Document doc = new Document("testStartTime", df)
|
||||
.append("testHours", inp.getTestHours())
|
||||
.append("testTotalBBL", inp.getTotalFluidBBL())
|
||||
.append("testOilBBL", inp.getTestOilBBL())
|
||||
.append("testWaterBBL", inp.getTestWaterBBL())
|
||||
.append("testGasMCF", inp.getTestGasMCF())
|
||||
.append("kFactor", inp.getkFactor())
|
||||
.append("oilRatio", inp.getOilRatio())
|
||||
.append("waterRatio", inp.getWaterRatio())
|
||||
.append("gasMCFRatio", inp.getGasMCFRatio());
|
||||
collection.insertOne(doc);
|
||||
return collection.count();
|
||||
}
|
||||
|
||||
public Document getPreviousWellTest(Date inpDateTime){
|
||||
String isoInpDateTime = inpDateTime.toString();
|
||||
MongoCollection<Document> wellTestCollection = database.getCollection("wellTestData");
|
||||
MongoCursor<Document> cursor = wellTestCollection.find(lte("testStartTime", isoInpDateTime))
|
||||
.sort(Sorts.descending("testStartTime")).limit(1).iterator();
|
||||
Document lastTest = new Document("kFactor", (Double) 1.0);
|
||||
try {
|
||||
while (cursor.hasNext()) {
|
||||
lastTest = cursor.next();
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
return lastTest;
|
||||
};
|
||||
|
||||
public double getLatestKFactor(){
|
||||
MongoCollection<Document> wellTestCollection = database.getCollection("wellTestData");
|
||||
MongoCursor<Document> cursor = wellTestCollection.find().sort(Sorts.descending("testStartTime")).limit(1).iterator();
|
||||
double kFactor = 1.0;
|
||||
try {
|
||||
while (cursor.hasNext()) {
|
||||
kFactor = cursor.next().getDouble("kFactor");
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
return kFactor;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,6 +7,8 @@ package com.henrypump.poc;
|
||||
*/
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.time.Instant;
|
||||
import java.util.Date;
|
||||
|
||||
public class POC implements Runnable{
|
||||
protected Well thisWell;
|
||||
@@ -91,8 +93,9 @@ public class POC implements Runnable{
|
||||
public void run(){
|
||||
int loopCounter = 0, loopLimit = simLoops, led2out, led3out, led4out,led5out;
|
||||
double pos;
|
||||
boolean newWellTest = true;
|
||||
long sleepMilliseconds = (long) (thisWell.getDt() * 1000);
|
||||
thisWell.setupFluidRatio(0.25, 0.75, 1.12);
|
||||
thisWell.setupFluidRatio(0.50, 0.50, 1.12);
|
||||
thisWell.checkSafeties();
|
||||
while (true) {
|
||||
while (loopCounter < loopLimit && (thisWell.getRunStatus() == Well.RUNSTATUS_RUNNING || thisWell.getRunStatus() == Well.RUNSTATUS_STARTING)) {
|
||||
@@ -123,6 +126,20 @@ public class POC implements Runnable{
|
||||
loopCounter++;
|
||||
}
|
||||
|
||||
if (newWellTest){
|
||||
System.out.println("Previous kFactor = " + thisWell.db.getLatestKFactor());
|
||||
Date nowDate = Date.from(Instant.now());
|
||||
thisWell.wellTest = new WellTest(nowDate, 24.0, .35, .20, .15, 1.25, thisWell);
|
||||
thisWell.db.newWellTest(thisWell.wellTest);
|
||||
System.out.println("Well Test @ " + nowDate.toString());
|
||||
System.out.println("kFactor: " + thisWell.wellTest.getkFactor());
|
||||
System.out.println("oilRatio: " + thisWell.wellTest.getOilRatio());
|
||||
System.out.println("waterRatio: " + thisWell.wellTest.getWaterRatio());
|
||||
System.out.println("gasRatio: " + thisWell.wellTest.getGasMCFRatio());
|
||||
newWellTest = false;
|
||||
System.out.println("Last kFactor = " + thisWell.db.getLatestKFactor());
|
||||
}
|
||||
|
||||
|
||||
if (startBtn.read() == 1) thisWell.start("startbutton");
|
||||
if (stopBtn.read() == 1) thisWell.stop("stopbutton");
|
||||
|
||||
@@ -18,6 +18,7 @@ import static java.lang.Math.sqrt;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* Created by patrickjmcd on 1/31/17.
|
||||
@@ -26,6 +27,7 @@ public class Well {
|
||||
private String wellName;
|
||||
protected Simulation sim;
|
||||
protected Database db;
|
||||
protected WellTest wellTest;
|
||||
|
||||
/* IO */
|
||||
AnalogIn inclinometer;
|
||||
@@ -138,25 +140,35 @@ public class Well {
|
||||
private double fluidWaterRatio; // BBL of water per 1 BBL fluid
|
||||
private double fluidGasRatio; // MCF of gas per 1 BBL fluid
|
||||
|
||||
// DATE & TIME PARAMETERS
|
||||
private LocalDate lastCheckedDate = null;
|
||||
|
||||
private boolean isNewDay(){
|
||||
LocalDate today = LocalDate.now();
|
||||
boolean ret = lastCheckedDate == null || today.isAfter(lastCheckedDate);
|
||||
lastCheckedDate = today;
|
||||
return ret;
|
||||
}
|
||||
|
||||
// Measurements
|
||||
private Measurement strokeSpeed = new Measurement("Stroke Speed", true, db, 0.5, 600);
|
||||
private Measurement downholeGrossStroke = new Measurement("Downhole Gross Stroke", true, db, 0.5, 600);
|
||||
private Measurement downholeNetStroke = new Measurement("Downhole Net Stroke", true, db, 0.5, 600);
|
||||
private Measurement fluidLevel = new Measurement("Fluid Level", true, db, 10, 600);
|
||||
private Measurement fluidLoad = new Measurement("Fluid Load", true, db, 20, 600);
|
||||
private Measurement inflowRate = new Measurement("Inflow Rate", true, db, 0.5, 600);
|
||||
private Measurement peakPolishedRodLoad = new Measurement("Peak PRL", true, db, 50, 600);
|
||||
private Measurement minPolishedRodLoad = new Measurement("Min PRL", true, db, 50, 600);
|
||||
private Measurement percentRun = new Measurement("Percent Run", true, db, 1.0, 600);
|
||||
private Measurement polishedRodHP = new Measurement("Polished Rod HP", true, db, 0.25, 600);
|
||||
private Measurement pumpHP = new Measurement("Pump HP", true, db, 0.25, 600);
|
||||
private Measurement fluidProduced = new Measurement("Fluid Produced", true, db, 1.0, 600);
|
||||
private Measurement oilProduced = new Measurement("Oil Produced", true, db, 1.0, 600);
|
||||
private Measurement waterProduced = new Measurement("Water Produced", true, db, 1.0, 600);
|
||||
private Measurement gasProduced = new Measurement("Gas Produced", true, db, 1.0, 600);
|
||||
private Measurement pumpIntakePressure = new Measurement("Pump Intake Pressure", true, db, 5.0, 600);
|
||||
private Measurement surfaceStrokeLength = new Measurement("Surface Stroke", true, db, 0.5, 1800);
|
||||
private Measurement tubingMovement = new Measurement("Tubing Movement", true, db, 0.5, 600);
|
||||
private Measurement strokeSpeed;
|
||||
private Measurement downholeGrossStroke;
|
||||
private Measurement downholeNetStroke;
|
||||
private Measurement fluidLevel;
|
||||
private Measurement fluidLoad;
|
||||
private Measurement inflowRate;
|
||||
private Measurement peakPolishedRodLoad;
|
||||
private Measurement minPolishedRodLoad;
|
||||
private Measurement percentRun;
|
||||
private Measurement polishedRodHP;
|
||||
private Measurement pumpHP;
|
||||
private Measurement fluidProduced;
|
||||
private Measurement oilProduced;
|
||||
private Measurement waterProduced;
|
||||
private Measurement gasProduced;
|
||||
private Measurement pumpIntakePressure;
|
||||
private Measurement surfaceStrokeLength;
|
||||
private Measurement tubingMovement;
|
||||
|
||||
Well(String wellName, int inclinometerChannel, int loadCellChannel, int runCommandChannel){
|
||||
this.wellName = wellName;
|
||||
@@ -166,6 +178,25 @@ public class Well {
|
||||
inclinometer = new AnalogIn(inclinometerChannel, 0, 100, 0, 100);
|
||||
loadCell = new AnalogIn(loadCellChannel, 0, 50000, 0, 50000);
|
||||
runCommand = new DigitalOut(runCommandChannel, 0);
|
||||
|
||||
strokeSpeed = new Measurement("Stroke Speed", true, db, 0.5, 600);
|
||||
downholeGrossStroke = new Measurement("Downhole Gross Stroke", true, db, 0.5, 600);
|
||||
downholeNetStroke = new Measurement("Downhole Net Stroke", true, db, 0.5, 600);
|
||||
fluidLevel = new Measurement("Fluid Level", true, db, 10, 600);
|
||||
fluidLoad = new Measurement("Fluid Load", true, db, 20, 600);
|
||||
inflowRate = new Measurement("Inflow Rate", true, db, 0.5, 600);
|
||||
peakPolishedRodLoad = new Measurement("Peak PRL", true, db, 50, 600);
|
||||
minPolishedRodLoad = new Measurement("Min PRL", true, db, 50, 600);
|
||||
percentRun = new Measurement("Percent Run", true, db, 1.0, 600);
|
||||
polishedRodHP = new Measurement("Polished Rod HP", true, db, 0.25, 600);
|
||||
pumpHP = new Measurement("Pump HP", true, db, 0.25, 600);
|
||||
fluidProduced = new Measurement("Fluid Produced", true, db, 1.0, 600);
|
||||
oilProduced = new Measurement("Oil Produced", true, db, 1.0, 600);
|
||||
waterProduced = new Measurement("Water Produced", true, db, 1.0, 600);
|
||||
gasProduced = new Measurement("Gas Produced", true, db, 1.0, 600);
|
||||
pumpIntakePressure = new Measurement("Pump Intake Pressure", true, db, 5.0, 600);
|
||||
surfaceStrokeLength = new Measurement("Surface Stroke", true, db, 0.5, 1800);
|
||||
tubingMovement = new Measurement("Tubing Movement", true, db, 0.5, 600);
|
||||
}
|
||||
|
||||
Well(String wellName, String simFileName, int inclinometerChannel, int loadCellChannel, int runCommandChannel){
|
||||
@@ -177,6 +208,25 @@ public class Well {
|
||||
inclinometer = new AnalogIn(inclinometerChannel, 0, 100, 0, 100);
|
||||
loadCell = new AnalogIn(loadCellChannel, 0, 50000, 0, 50000);
|
||||
runCommand = new DigitalOut(runCommandChannel, 0);
|
||||
|
||||
strokeSpeed = new Measurement("Stroke Speed", true, db, 0.5, 600);
|
||||
downholeGrossStroke = new Measurement("Downhole Gross Stroke", true, db, 0.5, 600);
|
||||
downholeNetStroke = new Measurement("Downhole Net Stroke", true, db, 0.5, 600);
|
||||
fluidLevel = new Measurement("Fluid Level", true, db, 10, 600);
|
||||
fluidLoad = new Measurement("Fluid Load", true, db, 20, 600);
|
||||
inflowRate = new Measurement("Inflow Rate", true, db, 0.5, 600);
|
||||
peakPolishedRodLoad = new Measurement("Peak PRL", true, db, 50, 600);
|
||||
minPolishedRodLoad = new Measurement("Min PRL", true, db, 50, 600);
|
||||
percentRun = new Measurement("Percent Run", true, db, 1.0, 600);
|
||||
polishedRodHP = new Measurement("Polished Rod HP", true, db, 0.25, 600);
|
||||
pumpHP = new Measurement("Pump HP", true, db, 0.25, 600);
|
||||
fluidProduced = new Measurement("Fluid Produced", true, db, 1.0, 600);
|
||||
oilProduced = new Measurement("Oil Produced", true, db, 1.0, 600);
|
||||
waterProduced = new Measurement("Water Produced", true, db, 1.0, 600);
|
||||
gasProduced = new Measurement("Gas Produced", true, db, 1.0, 600);
|
||||
pumpIntakePressure = new Measurement("Pump Intake Pressure", true, db, 5.0, 600);
|
||||
surfaceStrokeLength = new Measurement("Surface Stroke", true, db, 0.5, 1800);
|
||||
tubingMovement = new Measurement("Tubing Movement", true, db, 0.5, 600);
|
||||
}
|
||||
|
||||
public double getDt() {
|
||||
@@ -370,6 +420,18 @@ public class Well {
|
||||
return direction;
|
||||
}
|
||||
|
||||
public double getFluidOilRatio() {
|
||||
return fluidOilRatio;
|
||||
}
|
||||
|
||||
public double getFluidWaterRatio() {
|
||||
return fluidWaterRatio;
|
||||
}
|
||||
|
||||
public double getFluidGasRatio() {
|
||||
return fluidGasRatio;
|
||||
}
|
||||
|
||||
public void setupFluidRatio(double oilRatio, double waterRatio, double gasRatio){
|
||||
fluidOilRatio = oilRatio;
|
||||
fluidWaterRatio = waterRatio;
|
||||
@@ -571,6 +633,7 @@ public class Well {
|
||||
taperTable.addRow("Rod Depth", rodDepth[i]);
|
||||
taperTable.addRow("Rod Weight in Air", rodWeightAir[i]);
|
||||
taperTable.addRow("Rod Weight in Fluid", rodWeightFluid[i]);
|
||||
taperTable.addRule();
|
||||
rend.setTheme(V2_E_TableThemes.UTF_LIGHT.get());
|
||||
rend.setWidth(new WidthAbsoluteEven(50));
|
||||
rt = rend.render(taperTable);
|
||||
@@ -820,6 +883,66 @@ public class Well {
|
||||
return downholeValues;
|
||||
};
|
||||
|
||||
public void endOfStroke(){
|
||||
currentCard.setNumPointsUsed(pointCounter + 1);
|
||||
currentCard.calcStrokeData(150, fluidGradient,
|
||||
rodDepthTotal, tubingAnchorDepth,
|
||||
tubingCrossSectionalArea, pumpArea,
|
||||
frictionEstimate, structuralRating, fluidWaterRatio, fluidOilRatio, fluidGasRatio);
|
||||
for (int j = 98; j >= 0; j--) {
|
||||
cardStorage[j + 1] = cardStorage[j];
|
||||
}
|
||||
cardStorage[0] = currentCard;
|
||||
currentCard.printCard("csv", true);
|
||||
strokesSinceStart++;
|
||||
strokesToday++;
|
||||
strokesLifetime++;
|
||||
|
||||
strokeSpeed.update(currentCard.getStrokeSpeed());
|
||||
downholeGrossStroke.update(currentCard.getDownholeGrossStrokeLength());
|
||||
downholeNetStroke.update(currentCard.getDownholeNetStrokeLength());
|
||||
fluidLevel.update(currentCard.getFluidLevel());
|
||||
fluidLoad.update(currentCard.getFluidLoad());
|
||||
peakPolishedRodLoad.update(currentCard.getSurfaceLoadMax().getLoad());
|
||||
minPolishedRodLoad.update(currentCard.getSurfaceLoadMin().getLoad());
|
||||
polishedRodHP.update(currentCard.getPolishedRodHorsepower());
|
||||
pumpHP.update(currentCard.getPumpHorsepower());
|
||||
fluidProduced.update(currentCard.getFluidBBLMoved());
|
||||
oilProduced.update(currentCard.getOilBBLMoved());
|
||||
waterProduced.update(currentCard.getWaterBBLMoved());
|
||||
gasProduced.update(currentCard.getGasMCFMoved());
|
||||
pumpIntakePressure.update(currentCard.getPumpIntakePressure());
|
||||
surfaceStrokeLength.update(currentCard.getSurfaceStrokeLength());
|
||||
tubingMovement.update(currentCard.getTubingMovement());
|
||||
|
||||
currentCard = new Card(strokesLifetime);
|
||||
pointCounter = -1;
|
||||
if (strokesSinceStart > startupStrokes){
|
||||
runStatus = RUNSTATUS_RUNNING;
|
||||
}
|
||||
if(isNewDay()){
|
||||
strokeSpeed.endOfDay();
|
||||
downholeGrossStroke.endOfDay();
|
||||
downholeNetStroke.endOfDay();
|
||||
fluidLevel.endOfDay();
|
||||
fluidLoad.endOfDay();
|
||||
inflowRate.endOfDay();
|
||||
peakPolishedRodLoad.endOfDay();
|
||||
minPolishedRodLoad.endOfDay();
|
||||
percentRun.endOfDay();
|
||||
polishedRodHP.endOfDay();
|
||||
pumpHP.endOfDay();
|
||||
fluidProduced.endOfDay();
|
||||
oilProduced.endOfDay();
|
||||
waterProduced.endOfDay();
|
||||
gasProduced.endOfDay();
|
||||
pumpIntakePressure.endOfDay();
|
||||
surfaceStrokeLength.endOfDay();
|
||||
tubingMovement.endOfDay();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void eval(){
|
||||
checkSafeties();
|
||||
currentSurfacePosition = inclinometer.readScaled();
|
||||
@@ -853,6 +976,24 @@ public class Well {
|
||||
strokesSinceStart++;
|
||||
strokesToday++;
|
||||
strokesLifetime++;
|
||||
|
||||
strokeSpeed.update(currentCard.getStrokeSpeed());
|
||||
downholeGrossStroke.update(currentCard.getDownholeGrossStrokeLength());
|
||||
downholeNetStroke.update(currentCard.getDownholeNetStrokeLength());
|
||||
fluidLevel.update(currentCard.getFluidLevel());
|
||||
fluidLoad.update(currentCard.getFluidLoad());
|
||||
peakPolishedRodLoad.update(currentCard.getSurfaceLoadMax().getLoad());
|
||||
minPolishedRodLoad.update(currentCard.getSurfaceLoadMin().getLoad());
|
||||
polishedRodHP.update(currentCard.getPolishedRodHorsepower());
|
||||
pumpHP.update(currentCard.getPumpHorsepower());
|
||||
fluidProduced.update(currentCard.getFluidBBLMoved());
|
||||
oilProduced.update(currentCard.getOilBBLMoved());
|
||||
waterProduced.update(currentCard.getWaterBBLMoved());
|
||||
gasProduced.update(currentCard.getGasMCFMoved());
|
||||
pumpIntakePressure.update(currentCard.getPumpIntakePressure());
|
||||
surfaceStrokeLength.update(currentCard.getSurfaceStrokeLength());
|
||||
tubingMovement.update(currentCard.getTubingMovement());
|
||||
|
||||
currentCard = new Card(strokesLifetime);
|
||||
pointCounter = -1;
|
||||
if (strokesSinceStart > startupStrokes) {
|
||||
@@ -862,49 +1003,29 @@ public class Well {
|
||||
lastDirection = direction;
|
||||
pointCounter++;
|
||||
}
|
||||
if(isNewDay()){
|
||||
strokeSpeed.endOfDay();
|
||||
downholeGrossStroke.endOfDay();
|
||||
downholeNetStroke.endOfDay();
|
||||
fluidLevel.endOfDay();
|
||||
fluidLoad.endOfDay();
|
||||
inflowRate.endOfDay();
|
||||
peakPolishedRodLoad.endOfDay();
|
||||
minPolishedRodLoad.endOfDay();
|
||||
percentRun.endOfDay();
|
||||
polishedRodHP.endOfDay();
|
||||
pumpHP.endOfDay();
|
||||
fluidProduced.endOfDay();
|
||||
oilProduced.endOfDay();
|
||||
waterProduced.endOfDay();
|
||||
gasProduced.endOfDay();
|
||||
pumpIntakePressure.endOfDay();
|
||||
surfaceStrokeLength.endOfDay();
|
||||
tubingMovement.endOfDay();
|
||||
}
|
||||
}
|
||||
|
||||
public void endOfStroke(){
|
||||
currentCard.setNumPointsUsed(pointCounter + 1);
|
||||
currentCard.calcStrokeData(150, fluidGradient,
|
||||
rodDepthTotal, tubingAnchorDepth,
|
||||
tubingCrossSectionalArea, pumpArea,
|
||||
frictionEstimate, structuralRating, fluidWaterRatio, fluidOilRatio, fluidGasRatio);
|
||||
for (int j = 98; j >= 0; j--) {
|
||||
cardStorage[j + 1] = cardStorage[j];
|
||||
}
|
||||
cardStorage[0] = currentCard;
|
||||
currentCard.printCard("csv", true);
|
||||
strokesSinceStart++;
|
||||
strokesToday++;
|
||||
strokesLifetime++;
|
||||
|
||||
strokeSpeed.update(currentCard.getStrokeSpeed());
|
||||
downholeGrossStroke.update(currentCard.getDownholeGrossStrokeLength());
|
||||
downholeNetStroke.update(currentCard.getDownholeNetStrokeLength());
|
||||
fluidLevel.update(currentCard.getFluidLevel());
|
||||
fluidLoad.update(currentCard.getFluidLoad());
|
||||
peakPolishedRodLoad.update(currentCard.getSurfaceLoadMax().getLoad());
|
||||
minPolishedRodLoad.update(currentCard.getSurfaceLoadMin().getLoad());
|
||||
polishedRodHP.update(currentCard.getPolishedRodHorsepower());
|
||||
pumpHP.update(currentCard.getPumpHorsepower());
|
||||
fluidProduced.update(currentCard.getFluidBBLMoved());
|
||||
oilProduced.update(currentCard.getOilBBLMoved());
|
||||
waterProduced.update(currentCard.getWaterBBLMoved());
|
||||
gasProduced.update(currentCard.getGasMCFMoved());
|
||||
pumpIntakePressure.update(currentCard.getPumpIntakePressure());
|
||||
surfaceStrokeLength.update(currentCard.getSurfaceStrokeLength());
|
||||
tubingMovement.update(currentCard.getTubingMovement());
|
||||
|
||||
printTotals();
|
||||
|
||||
currentCard = new Card(strokesLifetime);
|
||||
pointCounter = -1;
|
||||
if (strokesSinceStart > startupStrokes){
|
||||
runStatus = RUNSTATUS_RUNNING;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void eval(int simPoint){
|
||||
checkSafeties();
|
||||
|
||||
78
src/main/java/com/henrypump/poc/WellTest.java
Normal file
78
src/main/java/com/henrypump/poc/WellTest.java
Normal file
@@ -0,0 +1,78 @@
|
||||
package com.henrypump.poc;
|
||||
|
||||
import org.bson.Document;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* Created by patrickjmcd on 2/7/17.
|
||||
*/
|
||||
public class WellTest {
|
||||
private double testHours;
|
||||
private Date testStart;
|
||||
|
||||
private double totalFluidBBL, testOilBBL, testWaterBBL, testGasMCF;
|
||||
private double kFactor, oilRatio, waterRatio, gasMCFRatio;
|
||||
|
||||
|
||||
public WellTest(Date testStart, double testHours, double totalFluidBBL, double testOilBBL, double testWaterBBL, double testGasMCF, Well well) {
|
||||
this.testStart = testStart;
|
||||
this.testHours = testHours;
|
||||
this.totalFluidBBL = totalFluidBBL;
|
||||
this.testOilBBL = testOilBBL;
|
||||
this.testWaterBBL = testWaterBBL;
|
||||
this.testGasMCF = testGasMCF;
|
||||
|
||||
this.oilRatio = this.testOilBBL / this.totalFluidBBL;
|
||||
this.waterRatio = this.testWaterBBL / this.totalFluidBBL;
|
||||
this.gasMCFRatio = this.testGasMCF / this.totalFluidBBL;
|
||||
|
||||
this.kFactor = 1.0;
|
||||
double lastProductionMeasured = well.db.getPreviousDailyTotal(this.testStart);
|
||||
if(lastProductionMeasured != -1.0){;
|
||||
this.kFactor = this.totalFluidBBL / lastProductionMeasured;
|
||||
} else {
|
||||
System.out.println("No production data in db");
|
||||
}
|
||||
}
|
||||
|
||||
public double getTestHours() {
|
||||
return testHours;
|
||||
}
|
||||
|
||||
public Date getTestStart() {
|
||||
return testStart;
|
||||
}
|
||||
|
||||
public double getTotalFluidBBL() {
|
||||
return totalFluidBBL;
|
||||
}
|
||||
|
||||
public double getTestOilBBL() {
|
||||
return testOilBBL;
|
||||
}
|
||||
|
||||
public double getTestWaterBBL() {
|
||||
return testWaterBBL;
|
||||
}
|
||||
|
||||
public double getTestGasMCF() {
|
||||
return testGasMCF;
|
||||
}
|
||||
|
||||
public double getkFactor() {
|
||||
return kFactor;
|
||||
}
|
||||
|
||||
public double getOilRatio() {
|
||||
return oilRatio;
|
||||
}
|
||||
|
||||
public double getWaterRatio() {
|
||||
return waterRatio;
|
||||
}
|
||||
|
||||
public double getGasMCFRatio() {
|
||||
return gasMCFRatio;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user