Displaying differences for changeset
 
display as  

lib/MetaModelTools.jar

 

tools/GetWEPSArchives/src/getwepsarchives/GetWEPSArchives.java

@@ -173,6 +173,7 @@
             + wepsMetaData.surface_thickness() + ", "
             + wepsMetaData.num_layers() + ", "
             + wepsMetaData.aggStability() + ", " 
+            + wepsMetaData.aggGeomDiam() + ", "
             + wepsMetaData.crustStability() + ", "
             + wepsMetaData.soilWiltPoint() + ", " 
             + wepsMetaData.surfRockFrag() + ", "

tools/MetaModelTools/src/models/WEPSModelArchive.java

@@ -200,6 +200,7 @@
         //TODO:  Do we need to measure the layers before setting these??  WEPSSoilInput already filters/sorts layers, etc...
         wepsMetaData.aggStability(ifcFile.aggregateStability[0]);
         wepsMetaData.soilWiltPoint(ifcFile.wiltingPointSWC[0]);
+    wepsMetaData.aggGeomDiam(ifcFile.aggregateMeanDiameter[0]);
 
         String biomass_avg = getOriginalResponse("average_biomass");
         if (!biomass_avg.isEmpty()) {
@@ -337,6 +338,7 @@
         private double rotWeightSoilTillIntensity;
         private double rotWeightResAddition;
         private double aggStability;
+    private double aggGeomDiam;
         private double crustStability;
         private double surfRockFrag;
         private double erosionRate;
@@ -399,6 +401,10 @@
             return aggStability;
         }
 
+    public double aggGeomDiam() {
+        return aggGeomDiam;
+    }
+
         public double crustStability() {
             return crustStability;
         }
@@ -443,6 +449,10 @@
             aggStability = value;
         }
 
+    public void aggGeomDiam(double value) {
+        aggGeomDiam = value;
+    }
+
         public void crustStability(double value) {
             crustStability = value;
         }