src/java/m/hydraulics/channelgeometry/V1_0.java
@@ -1,11 +1,11 @@ |
package m.hydraulics.channelgeometry; |
|
+import csip.annotations.Description; |
+import csip.annotations.Name; |
+import csip.annotations.VersionInfo; |
import csip.ModelDataService; |
import hydraulics.ChannelGeometry; |
import javax.ws.rs.Path; |
-import oms3.annotations.Description; |
-import oms3.annotations.Name; |
-import oms3.annotations.VersionInfo; |
|
@Name("channelgeometry") |
@Description("channelgeometry") |
@@ -16,7 +16,7 @@ |
ChannelGeometry model = new ChannelGeometry(); |
|
@Override |
- protected String process() throws Exception { |
+ protected void doProcess() throws Exception { |
model.setDepthType(getStringParam("depthType")); |
model.setDepth(getDoubleParam("depth")); |
model.setIrregularGeometryTF(getBooleanParam("irregularGeometry")); |
@@ -28,7 +28,6 @@ |
model.setCrossSection(getStringParam("crossSection")); |
|
model.run(); |
- return EXEC_OK; |
} |
|
@Override |
src/java/m/hydraulics/effectivedischarge/V1_0.java
@@ -1,11 +1,11 @@ |
package m.hydraulics.effectivedischarge; |
|
+import csip.annotations.Description; |
+import csip.annotations.Name; |
+import csip.annotations.VersionInfo; |
import csip.ModelDataService; |
import java.io.File; |
import javax.ws.rs.Path; |
-import oms3.annotations.Description; |
-import oms3.annotations.Name; |
-import oms3.annotations.VersionInfo; |
|
@Name("effectivedischarge") |
@Description("effectivedischarge") |
@@ -16,7 +16,7 @@ |
EffectiveDischarge model = new EffectiveDischarge(); |
|
@Override |
- protected String process() throws Exception { |
+ protected void doProcess() throws Exception { |
model.setMainFolder(getWorkspaceDir().toString()); |
model.setFlowDurationCurve(getStringParam("flowDurationCurve")); |
model.setManningRoughness(getDoubleParam("manningRoughness")); |
@@ -45,7 +45,6 @@ |
model.setUScustomaryOutputUnits_TF(getBooleanParam("UScustomaryOutputUnits_TF")); |
|
model.run(); |
- return EXEC_OK; |
} |
|
|
src/java/m/hydraulics/sediment/V1_0.java
@@ -1,11 +1,11 @@ |
package m.hydraulics.sediment; |
|
+import csip.annotations.Description; |
+import csip.annotations.Name; |
+import csip.annotations.VersionInfo; |
import csip.ModelDataService; |
import hydraulics.SedimentTransport; |
import javax.ws.rs.Path; |
-import oms3.annotations.Description; |
-import oms3.annotations.Name; |
-import oms3.annotations.VersionInfo; |
|
@Name("sediment") |
@Description("sediment") |
@@ -16,7 +16,7 @@ |
SedimentTransport model = new SedimentTransport(); |
|
@Override |
- protected String process() throws Exception { |
+ protected void doProcess() throws Exception { |
model.setTransportType(getStringParam("transportType")); |
model.setWaterDensity(getDoubleParam("rho")); |
model.setWaterTemperature(getDoubleParam("waterTemp")); |
@@ -42,7 +42,6 @@ |
model.setChannelFrictionSlope(getDoubleParam("frictionSlope")); |
|
model.run(); |
- return EXEC_OK; |
} |
|
@Override |
src/java/m/hydraulics/standardstep/V1_0.java
@@ -1,12 +1,11 @@ |
package m.hydraulics.standardstep; |
|
+import csip.annotations.Description; |
+import csip.annotations.Name; |
+import csip.annotations.VersionInfo; |
import csip.ModelDataService; |
-import static csip.ModelDataService.EXEC_OK; |
import java.io.File; |
import javax.ws.rs.Path; |
-import oms3.annotations.Description; |
-import oms3.annotations.Name; |
-import oms3.annotations.VersionInfo; |
|
//@Name("standardstepmethod") |
//@Description("standardstepmethod") |
@@ -17,7 +16,7 @@ |
StandardStepMethod model = new StandardStepMethod(); |
|
@Override |
- protected String process() throws Exception { |
+ protected void doProcess() throws Exception { |
//Also requires "reaches.txt" and "crossSections" input files |
model.setMainFolder(getWorkspaceDir().toString()); |
model.setBottomWidth(getDoubleParam("bottomWidth")); |
@@ -36,7 +35,6 @@ |
model.setCreateSummaryFile(getBooleanParam("createSummaryFile")); |
|
model.run(); |
- return EXEC_OK; |
} |
|
@Override |