csip-erosion Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

src/java/bin/win-x86/Rusle2_Report.json

@@ -60,7 +60,7 @@

{ "name":"SEG_SIM_DAY_LIVE_BIOMASS", "type":"REAL", "units":"pound/acre", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Live biomass" },

{ "name":"SEG_SIM_DAY_CANOPY_COVER", "type":"REAL", "units":"percent", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Canopy Cover" },

{ "name":"SEG_SIM_DAY_PERENN_VEG_LIVE_HEIGHT", "type":"REAL", "units":"feet", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Vegetation Live Height" },

-{ "name":"SLOPE_SIM_DAY_DEGRAD", "type":"REAL", "units":"ton/acre*day", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Daily soil loss"},

+{ "name":"SLOPE_SIM_DAY_DEGRAD", "type":"REAL", "units":"ton/acre/year", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Daily soil loss"},

{ "name":"SEG_SIM_DAY_NET_CANOPY_COVER", "type":"REAL", "units":"percent", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Net canopy cover" },

{ "name":"SEG_SIM_DAY_NET_SURF_COV", "type":"REAL", "units":"fraction", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Net surface cover" },

{ "name":"SEG_SIM_DAY_SOIL_LOSS_RATE", "type":"REAL", "units":"ton/acre*year", "dim": ["DAY_IN_SIM", "SEGMENT"], "description":"Comp. segment soil loss rate" },

src/java/m/rusle2/V2_0.java

 @@ -659,7 +659,21 @@
           }
           else
           {
--            // IF no array provided, could default to single later mgmt here
++            // IF no max_idx array provided, defaulting to single mgmt
++            text = "    RomeFileSetAttrSize(profile, 'MAN_LAYER', 1)\n";
++            fos.write(text.getBytes());
++            text = "    RomeFileSetAttrValue(profile, 'MAN_HORIZ', '" + length + "', 0)\n";
++            fos.write(text.getBytes());
++            LOG.info("escapeJava test=" + StringEscapeUtils.escapeJava("simple / test"));
++            LOG.info("escapeJava test=" + StringEscapeUtils.escapeJavaScript("simple / test"));
++            LOG.info("\n\n\n********************--- escapeJava man name=" + StringEscapeUtils.escapeJava(managementFormalName[0]));
++            LOG.info("********************--- escapeJavaScript man name=" + StringEscapeUtils.escapeJavaScript(managementFormalName[0]));
++            LOG.info("********************--- escapeHtml man name=" + StringEscapeUtils.escapeHtml(managementFormalName[0]));
++            LOG.info("********************--- escapeSql man name=" + StringEscapeUtils.escapeSql(managementFormalName[0]));
++            LOG.info("********************--- escapeXml man name=" + StringEscapeUtils.escapeXml(managementFormalName[0]));
++            LOG.info("********************--- raw Value is=" + managementFormalName[aManIdx.getInt(0)]);
++            text = "    RomeFileSetAttrValue(profile, 'MAN_PTR', '" + R2Run.escapeJavaNoFwdSlash(managementFormalName[0]) + "', 0)\n";
++            fos.write(text.getBytes());
           }
           // This segment implementation is currently commented out in favor of populating the

src/java/m/rusle2/V2_0_1.java

 @@ -705,6 +705,24 @@
                   fos.write(text.getBytes());
               }
           }
++        else
++        {
++            // IF no max_idx array provided, defaulting to single mgmt
++            text = "    RomeFileSetAttrSize(profile, 'MAN_LAYER', 1)\n";
++            fos.write(text.getBytes());
++            text = "    RomeFileSetAttrValue(profile, 'MAN_HORIZ', '" + length + "', 0)\n";
++            fos.write(text.getBytes());
++            LOG.info("escapeJava test=" + StringEscapeUtils.escapeJava("simple / test"));
++            LOG.info("escapeJava test=" + StringEscapeUtils.escapeJavaScript("simple / test"));
++            LOG.info("\n\n\n********************--- escapeJava man name=" + StringEscapeUtils.escapeJava(managementFormalName[0]));
++            LOG.info("********************--- escapeJavaScript man name=" + StringEscapeUtils.escapeJavaScript(managementFormalName[0]));
++            LOG.info("********************--- escapeHtml man name=" + StringEscapeUtils.escapeHtml(managementFormalName[0]));
++            LOG.info("********************--- escapeSql man name=" + StringEscapeUtils.escapeSql(managementFormalName[0]));
++            LOG.info("********************--- escapeXml man name=" + StringEscapeUtils.escapeXml(managementFormalName[0]));
++            LOG.info("********************--- raw Value is=" + managementFormalName[0]);
++            text = "    RomeFileSetAttrValue(profile, 'MAN_PTR', '" + R2Run.escapeJavaNoFwdSlash(managementFormalName[0]) + "', 0)\n";
++            fos.write(text.getBytes());
++        }
           // This segment implementation is currently commented out in favor of populating the
           // individual topo, soil, and man layers above for now...

web/META-INF/csip-conf.json

@@ -1,5 +1,5 @@

{

- "csip-erosion.version": "$version: 0.2.66 754f674216e4 2016-05-16 wlloyd@titan, built at 2016-05-17 18:58 by wlloyd$",

+ "csip-erosion.version": "$version: 0.2.67 df14d966b9da 2016-05-17 wlloyd@titan, built at 2016-05-18 17:21 by wlloyd$",

"weps.version" : "1.3.9",

"lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements",

"conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1",