Displaying differences for changeset
 
display as  

src/java/m/sq/sci/SCICalculator.java

@@ -28,12 +28,12 @@
                                         double wind_erosion_rate,double wind_om, double wind_fo){
         double water_sci;
         double wind_sci;
-        double part1;
+        double er_factor;
 
-        part1 = ((2.54-(wind_erosion_rate + water_erosion_rate))/2.54) * 0.2;
+        er_factor = ((2.54-(wind_erosion_rate + water_erosion_rate))/2.54) * 0.2;
         
-        water_sci = part1 + (water_om * 0.4) + (water_fo * 0.4);
-        wind_sci = part1 + (wind_om * 0.4) + (wind_fo * 0.4);
+        water_sci = er_factor + (water_om * 0.4) + (water_fo * 0.4);
+        wind_sci = er_factor + (wind_om * 0.4) + (wind_fo * 0.4);
 
         return calculateSCI(water_sci,wind_sci);
     }

src/java/m/sq/sci/V1_0.java

@@ -6,9 +6,8 @@
 
 import csip.ModelDataService;
 import csip.ServiceException;
+import csip.annotations.*;
 import javax.ws.rs.Path;
-import oms3.annotations.Description;
-import oms3.annotations.Name;
 import static m.sq.Constants.*;
 
 /**

src/java/m/sq/sci/V2_0.java

@@ -6,9 +6,8 @@
 
 import csip.ModelDataService;
 import csip.ServiceException;
+import csip.annotations.*;
 import javax.ws.rs.Path;
-import oms3.annotations.Description;
-import oms3.annotations.Name;
 import static m.sq.Constants.*;
 
 /**

src/java/m/sq/sci/V2_1.java

@@ -6,9 +6,8 @@
 
 import csip.ModelDataService;
 import csip.ServiceException;
+import csip.annotations.*;
 import javax.ws.rs.Path;
-import oms3.annotations.Description;
-import oms3.annotations.Name;
 import static m.sq.Constants.*;
 
 /**

src/java/m/sq/sci/V2_1.json

@@ -10,12 +10,28 @@
       "value": 0.668327783165379
     },
     {
+        "name":"water_om",
+        "value": 0.1299
+    },
+    {
+        "name": "water_fo",
+        "value": 0.246
+    },
+    {
       "name": "erosion_wind",
       "value": 0
     },
     {
       "name": "sci_wind",
       "value": 0.298
+    },
+    {
+        "name":"wind_om",
+        "value": 0.1299
+    },
+    {
+        "name": "wind_fo",
+        "value": 0.246
     }
   ]
 }
\ No newline at end of file

src/java/m/sq/stir/V1_0.java

@@ -5,9 +5,8 @@
 package m.sq.stir;
 
 import csip.ModelDataService;
+import csip.annotations.*;
 import javax.ws.rs.Path;
-import oms3.annotations.Description;
-import oms3.annotations.Name;
 import static m.sq.Constants.*;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;