Index: ../trunk-jpl/src/java/Changelog_1.0.0.txt
===================================================================
--- ../trunk-jpl/src/java/Changelog_1.0.0.txt	(revision 18297)
+++ ../trunk-jpl/src/java/Changelog_1.0.0.txt	(revision 18298)
@@ -1,29 +0,0 @@
-This is the changelog for Inishell release 1.0.0
-	*editing existing ini file:
-		+populate the GUI according to the values in an existing ini file
-		+show progress bar while loading
-		+Comments are preserved, nested template parameters properly handled, unknown keys are preserved
-
-	*usability improvements:
-		+the file dialogs remember the last path they pointed to
-		+add ".ini" extension when saving to a config file if necessary
-		+new icons, hoping to make their meaning clearer
-		+reset button on the GUI to revert to defaults
-
-	*layout improvements:
-		+fixed help text horizontal alignements issues
-		+the help text is now verticaly aligned with the top of the widget
-		+Notion of hierarchy for an easier handling of layout issues
-		+layout now consistent between Linux and Windows, still some small spacing differences with osX
-		+possibility to group parameters in a frame with a frame title
-
-	*bug fixes:
-		+default value in comboBox is honored
-		+mandatory comboBox properly handled on osX
-		+better help text handling
-
-	*others:
-		+keys are printed in the order they appear on the GUI
-		+code cleanup and optimizations
-		+add version information in MANIFEST and title bar
-		+clean up and reorganization in build.xml, add help and pack targets
Index: ../trunk-jpl/src/java/dist/inishell.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/doc/examples/min_example.xml
===================================================================
--- ../trunk-jpl/src/java/doc/examples/min_example.xml	(revision 18297)
+++ ../trunk-jpl/src/java/doc/examples/min_example.xml	(revision 18298)
@@ -1,40 +0,0 @@
-<inishell_config>
-	<parameter key="SOME_PARAMETER" type="string">
-		<section name="section1" />
-		<section name="section2" />
-		<help>
-			This is a parameter that asks for a string value and that is present in
-			both the section "section1" and "section2".
-		</help>
-	</parameter>
-	
-	<parameter key="NESTED_PARAMETERS" type="alternative" optional="false">
-		<section name="section1" />
-		<option value="NONE" type="string" />
-		<option value="ONE" type="string">
-			<parameter key="SOME_INTEGER" type="integer" 
-				minimum="-1" maximum="10" default="2">
-				<help>
-					The value for this parameter may be an integer between -1 and 10.
-					The default value is 2.
-					The user may use the + and - buttons to increment/decrement 
-					the number or type the number into the text field.</help>
-				</parameter>
-		</option>
-		<option value="TWO" type="string">
-			<reference name="a_group_that_can_be_referenced" />
-			<help>Here is a reference to two parameters.</help>
-		</option>
-		<help>
-			This parameter belongs to section1. 
-			When the "null" option is selected, the dropdown menu appears
-			red because this parameter is non-optional.
-			When the value "ONE" is selected a nested parameter "SOME_INTEGER" appears. 
-		</help>
-	</parameter>
-	
-	<parametergroup name="a_group_that_can_be_referenced">
-		<parameter key="SOME_FILE" type="file" />
-		<parameter key="A_PATH" type="path" />
-	</parametergroup>
-</inishell_config>
\ No newline at end of file
Index: ../trunk-jpl/src/java/doc/examples/io.ini
===================================================================
--- ../trunk-jpl/src/java/doc/examples/io.ini	(revision 18297)
+++ ../trunk-jpl/src/java/doc/examples/io.ini	(revision 18298)
@@ -1,180 +0,0 @@
-[General]
-PLUGINPATH	= ../../lib/plugins ;super
-BUFF_CHUNK_SIZE = 30
-BUFF_BEFORE	= 1.5
-
-[Input]
-COORDSYS	= CH1903
-TIME_ZONE	= 1
-; COORDSYS	= PROJ4
-; COORDPARAM	= 21781
-
-#reading ARC dem
-DEM		= ARC
-DEMFILE  	= ./input/surface-grids/Switzerland_1000m.asc
-
-#reading ARPS dem
-; DEM		= ARPS
-; DEMFILE 	= ./wgrt10r2_vw4.asc
-; ARPS_X 	= 653400
-; ARPS_Y 	= 112204
-
-#reading PGM image as dem
-; DEM		= PGM
-; DEMFILE	= ./Switzerland.pgm
-; PGM_XCOORD	= 479500.
-; PGM_YCOORD	= 73500.
-; PGM_CELLSIZE	= 1000.
-; PGM_MIN	= 193.
-; PGM_MAX	= 4204.
-
-; LANDUSE	= ARC
-; LANDUSEFILE	= ch_as97.asc
-
-#Alpine3D traditional inputs -> A3D plugin
-; METEO		= A3D
-; METEOPATH	= ./input/meteo
-
-#Borma
-; METEO		= BORMA
-; METEOPATH	= ./input/xml
-; NROFSTATIONS	= 1
-; STATION1	= 00.00.00.2
-
-#Snowpack input
-; METEO		= SNOWPACK
-; METEOPATH	= input
-; METAFILE	= IMIS_Extracted_Info.txt ;metadata for all stations
-; STATION1  	= MST96_RR.inp
-
-#SMET meteorological file format
-METEO		= SMET
-METEOPATH	= ./input/meteo
-STATION1	= FLU2.smet
-STATION2	= FIR2.smet
-STATION3	= FRA2.smet
-STATION4	= GLA2.smet
-STATION5	= ILI2.smet
-STATION6	= OTT2.smet
-STATION7	= TUJ3.smet
-
-#IMIS network database input -> IMIS plugin
-; METEO		= IMIS
-; DBNAME		= sdbo
-; DBUSER		= XXX
-; DBPASS		= XXX
-; NROFSTATIONS	= 4
-; STATION1	= MORN2
-; STATION2	= DAV3
-; STATION3	= KLO2
-; STATION4	= *SAM0
-
-#GEOtop traditional inputs -> GEOTOP plugin
-; METEO		 = GEOTOP
-; METEOPATH       = meteo/
-; METEOPREFIX     = _meteo
-
-#GSN direct input -> GSN plugin
-; METEO		= GSN
-; ENDPOINT	= http://montblanc.slf.ch:22001/services/A3DWebService
-; STATION1	= wan_sen14_2008
-; STATION2	= wan2
-
-[Output]
-COORDSYS	= CH1903
-TIME_ZONE 	= 1
-
-GRID2D		= ARC
-GRID2DPATH	= ./
-
-; GRID2D		= PNG
-; GRID2DPATH	= ./
-; PNG_MIN_SIZE	= 800x600
-; PNG_WORLD_FILE	= true
-; PNG_AUTOSCALE	= false
-; PNG_SCALING	= nearest
-
-METEO		= SMET
-METEOPATH	= ./
-
-[Filters]
-TA::filter1	= min_max
-TA::arg1	= 240 320
-
-RH::filter1	= min_max
-RH::arg1 	= 0.01 1.2
-RH::filter2	= min_max
-RH::arg2	= soft 0.05 1.0
-
-HNW::filter1	= min
-HNW::arg1	= -0.1
-HNW::filter2	= min
-HNW::arg2	= soft 0.
-
-ISWR::filter1	= min_max
-ISWR::arg1	= -10. 1500.
-ISWR::filter2	= min
-ISWR::arg2	= soft 0.
-
-RSWR::filter1	= min_max
-RSWR::arg1 	= -10 1500
-RSWR::filter2	= min
-RSWR::arg2	= soft 0
-
-#for TA between 240 and 320 K
-ILWR::filter1	= min_max
-ILWR::arg1	= 188 600
-ILWR::filter2	= min_max
-ILWR::arg2	= soft 200 400
-
-#we need to consider time with no snow -> TSS>0
-#min(TSS) in db since 1998: -50C
-TSS::filter1	= min_max
-TSS::arg1	= 200 320
-
-#idem
-TSG::filter1	= min_max
-TSG::arg1	= 200 320
-
-HS::filter1	= min
-HS::arg1	= soft 0.0
-HS::filter2	= rate
-HS::arg2	= 5.55e-5 ;0.20 m/h
-
-VW::filter1	= min_max
-VW::arg1	= -2 70
-VW::filter2	= min_max
-VW::arg2	= soft 0.2 50.0
-
-[Interpolations1D]
-WINDOW_SIZE	= 86400
-
-TA::resample	= linear
-
-RH::resample	= linear
-
-HS::resample	= linear
-
-VW::resample	= nearest_neighbour
-VW::args	= extrapolate
-
-HNW::resample	= linear
-
-[Interpolations2D]
-TA::algorithms	= IDW_LAPSE CST_LAPSE
-TA::cst_lapse	= -0.008
-TA::idw_lapse	= -0.008 soft
-
-RH::algorithms	= RH IDW_LAPSE CST
-
-HNW::algorithms	= IDW_LAPSE CST_LAPSE CST
-HNW::cst_lapse	= 0.0005 frac
-
-VW::algorithms	= IDW_LAPSE CST
-
-P::algorithms	= STD_PRESS
-
-ILWR::algorithms = CST_LAPSE
-ILWR::cst_lapse = -0.03125
-
-RSWR::algorithms = IDW CST
Index: ../trunk-jpl/src/java/doc/examples/meteoio_config.xml
===================================================================
--- ../trunk-jpl/src/java/doc/examples/meteoio_config.xml	(revision 18297)
+++ ../trunk-jpl/src/java/doc/examples/meteoio_config.xml	(revision 18298)
@@ -1,919 +0,0 @@
-<inishell_config application="Meteo IO">
-
-	<!-- General Parameters -->
-	<parameter key="BUFF_CHUNK_SIZE" type="integer" default="30">
-		<section name="general" />
-		<help>Size in days of a chunk of data to read at once.</help>
-	</parameter>
-
-	<parameter key="BUFF_BEFORE" type="decimal" default="1.5">
-		<section name="general" />
-		<help>Alternate way of buffer centering: When rebuffering, the new date will be located BUFF_BEFORE days from the
-		beginning of the buffer (therefore, it takes a value in days).</help>
-	</parameter>
-
-	<!-- Coordinate systems, time zones -->
-	<parameter key="COORDSYS" type="alternative" optional="false">
-		<section name="input" />
-		<section name="output" />
-		<option value="CH1903" type="string" default="true">
-			<help>coordinates in the Swiss Grid &lt;a href="http://geomatics.ladetto.ch/ch1903_wgs84_de.pdf"&gt;http://geomatics.ladetto.ch/ch1903_wgs84_de.pdf&lt;/a&gt;</help>
-		</option>
-		<option value="UTM" type="string">
-			<parameter key="COORDPARAM" type="string">
-				<help>specify the zone with the zone letter (for example, 32T)</help>
-			</parameter>
-			<help>UTM coordinates, see &lt;a href="http://www.oc.nps.edu/oc2902w/maps/utmups.pdf"&gt;http://www.oc.nps.edu/oc2902w/maps/utmups.pdf&lt;/a&gt;</help>
-		</option>
-		<option value="UPS" type="string">
-			<parameter key="COORDPARAM" type="string">
-				<help>specify the hemisphere (either N or S)</help>
-			</parameter>
-			<help>Universal Polar Stereographic coordinates, see &lt;a href="https://en.wikipedia.org/wiki/Universal_Polar_Stereographic_coordinate_system"&gt;https://en.wikipedia.org/wiki/Universal_Polar_Stereographic_coordinate_system&lt;/a&gt;</help>
-		</option>
-		<option value="PROJ4" type="string">
-			<parameter key="COORDPARAM" type="string" optional="false" />
-			<help>external library: see &lt;a href="http://trac.osgeo.org/proj/"&gt;http://trac.osgeo.org/proj/&lt;/a&gt;</help>
-		</option>
-		<option value="LOCAL"  type="string">
-			<help>uses the horizontal and vertical distance from a reference point</help>
-		</option>
-		<help>coordinate system</help>
-	</parameter>
-
-	<parameter key="TIME_ZONE" type="integer+" default="+1" maximum="14" minimum="-12" optional="false">
-		<section name="input" />
-		<section name="output" />
-	</parameter>
-
-	<!-- Datatypes: special pts -->
-	<parameter key="SPECIALPTS" type="alternative">
-		<section name="input" />
-		<option value="A3D" type="string">
-			<parameter key="SPECIALPTSFILE" type="file" optional="false">
-				<help>a path+file name to the a file containing grid coordinates of special points of interest (for special outputs)</help>
-			</parameter>
-		</option>
-		<option value="SMET" type="string">
-			<parameter key="SPECIALPTSFILE" type="file" optional="false">
-				<help>a path+file name to the a file containing grid coordinates of special points of interest (for special outputs)</help>
-			</parameter>
-		</option>
-	</parameter>
-
-	<!-- Datatypes: Meteo Data -->
-	<parameter key="METEO" type="alternative">
-		<section name="input" />
-		<section name="output" />
-
-		<option value="A3D" type="string">
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string containing the path to the meteorological files</help>
-			</parameter>
-		</option>
-		<option value="BORMA" type="string">
-			<section name="input" />
-			<reference name="BORMA" />
-		</option>
-		<option value="COSMO" type="string">
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string containing the path to the meteorological files</help>
-			</parameter>
-		</option>
-		<option value="GEOTOP" type="string">
-			<section name="input" />
-			<reference name="GEOTOP_IN" />
-		</option>
-		<option value="GEOTOP" type="string">
-			<section name="output" />
-			<reference name="GEOTOP_OUT" />
-		</option>
-		<option value="GRIB" type="string">
-			<section name="input" />
-			<reference name="GRIB_METEO" />
-		</option>
-		<option value="GSN" type="string">
-			<section name="input" />
-			<reference name="GSN" />
-		</option>
-		<option value="IMIS" type="string">
-			<section name="input" />
-			<reference name="IMIS" />
-		</option>
-		<option value="SMET" type="string">
-			<section name="input" />
-			<reference name="SMET_IN" />
-		</option>
-		<option value="SMET" type="string">
-			<section name="output" />
-			<reference name="SMET_OUT" />
-		</option>
-		<option value="SNOWPACK" type="string">
-			<section name="input" />
-			<reference name="SNIO_IN" />
-		</option>
-		<option value="SNOWPACK" type="string">
-			<section name="output" />
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string representing path where SNOWPACK files should be saved</help>
-			</parameter>
-		</option>
-
-		<help>plugin for METEO data </help>
-	</parameter>
-
-	<parameter key="Add Meteo parameter copy" type="selector">
-		<section name="input"/>
-		<parameter key="COPY::%" type="string" optional="false" template="true">
-		  <help>The name of the parameter to copy (e.g. TA, RH, VW, ISWR, etc)</help>
-		</parameter>
-	</parameter>
-
-	<!-- Datatypes: DEM -->
-	<frame key="dem_frame" label="Digital Elevation Model">
-	<section name="input"/>
-		<parameter key="DEM" type="alternative">
-			<section name="input" />
-			<option value="ARC" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-			</option>
-			<option value="ARPS" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-				<parameter key="ARPS_XCOORD" type="decimal" optional="false">
-					<help>x coordinate of the lower left corner of the grids</help>
-				</parameter>
-				<parameter key="ARPS_YCOORD" type="decimal" optional="false">
-					<help>y coordinate of the lower left corner of the grids</help>
-				</parameter>
-			</option>
-			<option value="GRASS" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-			</option>
-			<option value="GRIB" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-				<parameter key="GRIB_DEM_UPDATE" type="alternative" optional="true">
-					<option value="TRUE" type="string" />
-					<option value="FALSE" type="string" />
-					<help>recompute slope/azimuth from the elevations when reading a DEM (default=false, that is we use the slope and azimuth included in the GRIB file)</help>
-				</parameter>
-			</option>
-			<option value="PGM" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-				<reference name="PGM_IN" />
-			</option>
-
-			<help>plugin for Digital Elevation Model data </help>
-		</parameter>
-	</frame>
-
-	<!-- Datatypes: Landuse -->
-	<parameter key="LANDUSE" type="alternative">
-		<section name="input" />
-		<option value="ARC" type="string">
-			<parameter key="LANDUSEFILE" type="file" optional="false">
-				<help>File containing a grid of landuse codes</help>
-			</parameter>
-		</option>
-
-		<help>plugin for land cover data </help>
-	</parameter>
-
-	<!-- Datatypes: Grids -->
-	<parameter key="GRID2D" type="alternative">
-		<section name="input" />
-		<section name="output" />
-		<option value="ARC" type="string">
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="ARC" />
-		</option>
-		<option value="ARPS" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="ARPS" />
-		</option>
-		<option value="GRASS" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-		</option>
-		<option value="GRIB" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="GRIB_GRIDS" />
-		</option>
-		<option value="PGM" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="PGM_IN" />
-		</option>
-		<option value="PGM" type="string">
-			<section name="output" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-		</option>
-		<option value="PNG" type="string">
-			<section name="output" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="PNG" />
-		</option>
-		<help>plugin for 2D gridded data </help>
-	</parameter>
-
-	<!--Parameter group for list of stations -->
-	<parametergroup name="stationgroup_files">
-		<parameter key="STATION#" type="file" counter="1" optional="false">
-			<help>filename for station number # </help>
-		</parameter>
-	</parametergroup>
-	<parametergroup name="stationgroup_names">
-		<parameter key="STATION#" type="string" counter="1" optional="false">
-			<help>station id for the given station number # </help>
-		</parameter>
-	</parametergroup>
-	<parametergroup name="stationgroup_pos">
-		<parameter key="STATION#" type="string" counter="1">
-			<help>Coordinates are given as "lat lon" or "xcoord ycoord epsg_code"</help>
-		</parameter>
-	</parametergroup>
-
-	<!-- Plugins for Meteo Data-->
-	<parametergroup name="BORMA">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the xml files</help>
-		</parameter>
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="IMIS">
-		<parameter key="DBNAME" type="string" optional="false">
-			<help>database name, as provided by your database administrator</help>
-		</parameter>
-		<parameter key="DBUSER" type="string" optional="false">
-			<help>database user name</help>
-		</parameter>
-		<parameter key="DBPASS" type="string" optional="false">
-			<help>database password associated with the user name</help>
-		</parameter>
-		<parameter key="USEANETZ" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: use ANETZ stations to provide precipitations for normal IMIS stations.
-		  Each IMIS station is associated with one or two ANETZ stations and does a weighted
-		  average to get what should be its local precipitations</help>
-		</parameter>
-		<parameter key="USE_IMIS_HNW" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: if set to false (default), all IMIS precipitation will be deleted (since IMIS stations don't have heated rain gauges, their precipitation measurements are not good in winter conditions). If set to true, it is strongly advised to use a FilterHNWMelt filter to detect snow melting in the rain gauge and perform winter conditions detection in the application.</help>
-		</parameter>
-		<parameter key="USE_SNOWPACK_HNW" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>if set to true, the SNOWPACK simulated Snow Water Equivalent from the database will be used to compute HNW. Data gaps greater than 3 hours on SWE will lead to unchanged hnw while all data that can properly be computed will overwrite hnw. (default=false)</help>
-		</parameter>
-
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="GRIB_METEO">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the grib files</help>
-		</parameter>
-		<parameter key="METEOEXT" type="string" optional="true">
-			<help>grib file extension, or none for no file extension (default: .grb)</help>
-		</parameter>
-
-		<reference name="stationgroup_pos" />
-	</parametergroup>
-
-	<parametergroup name="GEOTOP_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the data files</help>
-		</parameter>
-		<parameter key="METAFILE" type="file" optional="false">
-			<help>absolute filename of the geotop.inpts file</help>
-		</parameter>
-		<parameter key="METEOPREFIX" type="string" optional="true">
-			<help>prefix to append when generating a file name for reading</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="GEOTOP_OUT">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the data files</help>
-		</parameter>
-		<parameter key="METEOSEQ" type="string" optional="false">
-			<help>specifiy in which order the columns should be printed out</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="GSN">
-		<parameter key="ENDPOINT" type="string" optional="false">
-			<help>webserver running GSN with its port number and full path. For example:
-			http://montblanc.slf.ch:22001/services/A3DWebService</help>
-		</parameter>
-		<parameter key="PROXY" type="string" optional="true">
-			<help>Should the connection go through a proxy? This is useful for servers
-			filtering on domains but usually not necessary.</help>
-		</parameter>
-		<parameter key="PROXYPORT" type="string" optional="true" />
-		<parameter key="PROXYUSER" type="string" optional="true" />
-		<parameter key="PROXYPASS" type="string" optional="true" />
-
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="SMET_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the smet files</help>
-		</parameter>
-		<reference name="stationgroup_files" />
-	</parametergroup>
-
-	<parametergroup name="SMET_OUT">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string representing path where SMET files should be saved</help>
-		</parameter>
-		<parameter key="METEOPARAM" type="alternative">
-		  <option value="ASCII" type="string" default="true">
-		    <help>Write ASCII SMET files</help>
-		  </option>
-		  <option value="BINARY" type="string">
-		    <help>Write BINARY SMET files</help>
-		  </option>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="SNIO_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the SNOWPACK files</help>
-		</parameter>
-		<parameter key="METAFILE" type="file" optional="true">
-			<help>filename of the meta data file (in METEOPATH)</help>
-		</parameter>
-
-		<parameter key="NUMBER_MEAS_TEMPERATURES" type="integer+" minimum="0" default="0">
-		  <help>the number of measured snow temperatures provided</help>
-		</parameter>
-
-		<parameter key="NUMBER_OF_SOLUTES" type="integer+" minimum="0" default="0">
-		  <help>the number of solutes for which input data are provided</help>
-		</parameter>
-
-		<parameter key="RSWR_INP" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		</parameter>
-		<parameter key="ISWR_INP" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		</parameter>
-		<parameter key="VW_DRIFT" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: wind velocity to use for blowing and drifting snow is provided</help>
-		</parameter>
-		<parameter key="RHO_HN" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: measured new snow density is provided</help>
-		</parameter>
-
-		<reference name="stationgroup_files" />
-	</parametergroup>
-
-	<!-- Plugins for Gridded Data-->
-	<parametergroup name="ARC">
-		<parameter key="A3D_VIEW" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate names compatible with Alpine3D's grid viewer?</help>
-		</parameter>
-		<parameter key="GRID2DEXT" type="string" optional="true">
-			<help>grid file extension, or none for no file extension (default: .asc)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="ARPS">
-		<parameter key="ARPS_XCOORD" type="decimal" optional="false">
-			<help>x coordinate of the lower left corner of the grids</help>
-		</parameter>
-		<parameter key="ARPS_YCOORD" type="decimal" optional="false">
-			<help>y coordinate of the lower left corner of the grids</help>
-		</parameter>
-		<parameter key="GRID2DEXT" type="string" optional="true">
-			<help>grid file extension, or none for no file extension (default: .asc)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="GRIB_GRIDS">
-		<parameter key="GRID2DPREFIX" type="string" optional="true">
-			<help>prefix to append when generating a file name for reading (ie: something like "laf" for Cosmo-Analysis-full domain)</help>
-		</parameter>
-		<parameter key="GRID2DEXT" type="string" optional="true">
-			<help>grib file extension, or none for no file extension (default: .grb)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="PNG">
-		<parameter key="PNG_WORLD_FILE" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate a world file for each output file? This file contains the geolocalization information</help>
-		</parameter>
-		<parameter key="PNG_LEGEND" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate a legend?</help>
-		</parameter>
-		<parameter key="PNG_AUTOSCALE" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>autoscale color scale?</help>
-		</parameter>
-		<parameter key="PNG_SCALING" type="alternative" optional="true">
-			<option value="nearest" type="string" />
-			<option value="bilinear" type="string" />
-			<help>scaling algorithm (default=bilinear)</help>
-		</parameter>
-		<parameter key="PNG_MIN_SIZE" type="string" optional="false">
-			<help>minimum dimensions of the PNG, like 640x480</help>
-		</parameter>
-		<parameter key="PNG_MAX_SIZE" type="string" optional="false">
-			<help>maximum dimensions of the PNG, like 1024x768</help>
-		</parameter>
-		<parameter key="PNG_INDEXED" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate a color indexed file (default=true)</help>
-		</parameter>
-		<parameter key="PNG_SPEED_OPTIMIZE" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>optimize for speed (default=false)</help>
-		</parameter>
-		<parameter key="PNG_NR_LEVELS" type="integer+" default="+30" maximum="255" minimum="6" optional="true">
-			<help>number of colors in the palette (default=30)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="PGM_IN">
-		<parameter key="PGM_XCOORD" type="decimal" optional="false">
-			<help>lower left x coordinate</help>
-		</parameter>
-		<parameter key="PGM_YCOORD" type="decimal" optional="false">
-			<help>lower left y coordinate</help>
-		</parameter>
-		<parameter key="PGM_CELLSIZE" type="decimal" optional="false">
-			<help>cellsize in meters</help>
-		</parameter>
-		<parameter key="PGM_MIN" type="decimal" optional="false">
-			<help>minimum value in real world coordinates to match with the minimum value read out of the PGM file (such minimum being greater than 0 because 0 is NODATA)</help>
-		</parameter>
-		<parameter key="PGM_MAX" type="decimal" optional="false">
-			<help>maximum value in real world coordinates to match with the maximum value read out of the PGM file</help>
-		</parameter>
-	</parametergroup>
-
-	<!-- Meteo Parameters for Filters, resampling, spatial interpolations-->
-	<parametergroup name="METEOIOPARAMETERS">
-		<option value="TA"/>
-		<option value="RH"/>
-		<option value="VW"/>
-		<option value="DW"/>
-		<option value="VW_MAX"/>
-		<option value="ISWR"/>
-		<option value="RSWR"/>
-		<option value="ILWR"/>
-		<option value="HS"/>
-		<option value="HNW"/>
-		<option value="TSG"/>
-		<option value="TSS"/>
-		<option value="P"/>
-	</parametergroup>
-
-	<!-- Filters -->
-	<parameter key="Add/Remove Filter" type="selector">
-		<section name="filters" />
-
-		<parameter key="%::filter#" type="alternative" counter="1" template="true">
-			<section name="filters" />
-
-			<option label="MeanAvg" value="mean_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Mean average processing. The mean average filter returns the mean value of all values within a user given time window.</help>
-			</option>
-
-			<option label="MedianAvg" value="median_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="decimal" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Median average processing. The median average filter returns the median value of all values within a user given time window.</help>
-			</option>
-
-			<option label="Std Deviation Filter" value="std_dev" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Standard deviation filter. Values outside of mean ± 2 std_dev are rejected.</help>
-			</option>
-
-			<option label="MAD" value="mad" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Median Absolute Deviation. Values outside of median ± 3 σ_MAD are rejected. &lt;br&gt;
-			  See http://en.wikipedia.org/wiki/Median_absolute_deviation for more information.</help>
-			</option>
-
-			<option label="Tukey 53H Filter" value="Tukey" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      The keyword "soft" maybe added, if the window position is allowed to be adjusted to the data present.
-			      The two arguments may be preceded by the keywords "left", "center" or "right", indicating the window position.
-			    </help>
-			  </parameter>
-			  <help>Tukey 53H method A smooth time sequence is generated from the median, substracted from the original signal and
-			  compared with the standard deviation. see "Despiking Acoustic Doppler Velocimeter Data", Derek G. Goring and Vladimir
-			  L. Nikora, Journal of Hydraulic Engineering, 128, 1, 2002 The deviation factor coeffecient is currently hard-coded as k=1.5. </help>
-			</option>
-
-			<option label="Wind Averaging Filter" value="wind_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Wind vector averaging. This calculates the vector average over a user given time period. Each wind vector
-			  within this period is added and the final sum is normalized by the number of vectors that have been added. </help>
-			</option>
-
-			<option label="Exponential Smoothing" value="exp_smoothing" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <option label="alpha:" value="0.8" type="decimal" minimum="0" maximum="1"/>
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			      Alpha needs to be provided as last argument. Please note that the standard filter works with a left window!
-			    </help>
-			  </parameter>
-			  <help>Exponential smooting processing, exponential moving average s_0 = x_0 s_n = alpha*x_(t-1) + (1-alpha)*s_t-1</help>
-			</option>
-
-			<option label="Weighted Moving Average Smoothing" value="wma_smoothing" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			      Please note that the standard filter works with a left window!
-			    </help>
-			  </parameter>
-			  <help>Weighted moving average smoothing such as: WMA = (1*X1 + 2*X2 + ... + n*Xn) / sum_of_weights</help>
-			</option>
-
-			<option label="Min Range Filter" value="min" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Min:" value="" type="decimal" />
-			    <option label="Adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data smaller than the min would be
-			    assigned the minimum permissible value or another value given as an extra argument</help>
-			  </parameter>
-			  <help>Min range filter. Reject all values smaller than the min.</help>
-			</option>
-
-			<option label="Max Range Filter" value="max" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Max:" value="" type="decimal" />
-			    <option label="Adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data greater than the max would be
-			    assigned the maximum permissible value or another value given as an extra argument</help>
-			  </parameter>
-			  <help>Max range filter. Reject all values greater than the max.</help>
-			</option>
-
-			<option label="MinMax (2 or 4 arguments)" value="min_max" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Min:" value="" type="decimal" />
-			    <option label="Max:" value="" type="decimal" />
-			    <option label="Min adjust to:" value="" type="decimal" />
-			    <option label="Max adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data greater than the max would be assigned
-			    the maximum permissible value and all data smaller than the min would be assigned the minimum
-			    permissible value or an optional extra set of two user provided values</help>
-			  </parameter>
-			  <help>Reject all values greater than the max or smaller than the min. &lt;br&gt;</help>
-			</option>
-
-			<option label="Rate Filter (1 argument)" value="rate" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="Max:" value="1.0" type="decimal" minimum="0" maximum="1" />
-			    <help>the absolute value of the maximum permissible rate of change (per seconds)</help>
-			  </parameter>
-			  <help>Rate of change filter. Calculate the change rate (ie: slope) between two points, if it is above a user given value, reject the point.</help>
-			</option>
-
-			<option label="Rate Filter (2 arguments)" value="rate" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="Min:" value="0.0" type="decimal" minimum="0" maximum="1" />
-			    <option label="Max:" value="1.0" type="decimal" minimum="0" maximum="1" />
-			    <help>the minimum and maximum permissible rate of change (per second)</help>
-			  </parameter>
-			  <help>Rate of change filter. Calculate the change rate (ie: slope) between two points, if it is above a user given value, reject the point.</help>
-			</option>
-
-			<option label="Unheated Rain Gauge Filter" value="Unheated_RainGauge" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="RH threshold:" value="0.5" type="decimal" minimum="0" maximum="1" />
-			    <option label="Delta_T threshold:" value="3.0" type="decimal" minimum="0" maximum="20" />
-			  </parameter>
-			  <help>Filters out snow melting in an unheated rain gauge. This filter can ONLY be applied to precipitation. Non-zero measurements are accepted only if they take place when the relative humidity is greater than RH_threshold and (TA-TSS) smaller than Delta_T_threshold, otherwise they get reset to 0. If none of these conditions could be tested (for lack of data), then the precipitation is reset to nodata (or left unchanged if "soft" has been selected).</help>
-			</option>
-
-			<option label="WMO Undercatch Filter" value="undercatch_wmo" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option value="Gage type" type="dropdown">
-					<option value="Nipher" type="string" />
-					<option value="Tretyakov" type="string" />
-					<option value="US8sh" type="string" />
-					<option value="US8unsh" type="string" />
-					<option value="Hellmann" type="string" />
-					<option value="Hellmannsh" type="string" />
-				</option>
-			  </parameter>
-			  <help>This implements the standard methods for precipitation correction as described in "WMO Solid Precipitation Measurement Intercomparison", B. Goodison, P. Louie and D. Yang, 872, 1998 as well as the overview given by "Literature Study on the Correction of Precipitation Measurements", Annette Wagner, 2009. The correction parameters for the shielded Hellmann gauge (German version) are from "Wind-induced Precipitation Undercatch of the Hellmann Gauges", Daqing Yang et al, Nordic Hydrology, 30, 1999, pp 57-80.</help>
-			</option>
-
-			<option label="WMO Undercatch Filter - simplified" value="undercatch_wmo" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option value="Kind" type="dropdown">
-					<option value="Cst" type="string" />
-				</option>
-				<option label="Snow factor:" value="1.3" type="decimal" minimum="0" maximum="5" />
-				<option label="Mixed prec factor:" value="1.1" type="decimal" minimum="0" maximum="5" />
-			  </parameter>
-			  <help>This applies a constant correction factor to the precipitation, one for pure snow and one for mixed precipitation. The following thresholds are used: pure snow below -2 C; mixed precipitation between -2 and +2 C; pure rain above 2 C. These threshold can be changed (see online documentation).</help>
-			</option>
-
-			<option label="Unventillated temperature sensor" value="Unventilated_T" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="albedo:" value="0.23" type="decimal" />
-			    <option value="soft" type="choice" />
-			    <help>If the "soft" option is given, the albedo has a value different according to snow (or no snow) on the ground</help>
-			  </parameter>
-			  <help>This implements the correction described in (Reina Nakamura, 2005) with an albedo dependency as introduced in (Huwald, 2009)</help>
-			</option>
-
-			<option label="Add an offset" value="add" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option label="offset:" value="0." type="decimal" />
-			  </parameter>
-			  <help>This adds a given offset to the data.</help>
-			</option>
-
-			<option label="Multiply by a factor" value="mult" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option label="factor:" value="1." type="decimal" />
-			  </parameter>
-			  <help>This multiplies the data by a given factor.</help>
-			</option>
-
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-
-	<!-- 1D Interpolation -->
-	<parameter key="WINDOW_SIZE" type="integer+" minimum="1" default="43200">
-		<section name="Interpolations1D" />
-		<help>Affects resampling: expresses (in seconds) how far a valid point can be
-		searched for when re-interpolating a missing value</help>
-	</parameter>
-
-	<parameter key="Add/Remove 1D Interpolation" type="selector">
-		<section name="Interpolations1D" />
-
-		<parameter key="%::resample" type="alternative" template="true">
-			<section name="Interpolations1D" />
-			<option label="No Interpolation" value="none" type="string" />
-			<option label="Nearest Neighbour" value="nearest_neighbour" type="string" />
-			<option label="Linear" value="linear" type="string">
-			  <parameter key="%::args" type="combination">
-			    <option value="extrapolate" type="choice" />
-			    <help>
-			      If "extrapolate" is added, then data *outside* of the original date range can be interpolated.
-			      Otherwise, a data point will only be calculated between the original date range.
-			    </help>
-			  </parameter>
-			  <help>Mean average processing. The mean average filter returns the mean value of all values within a user given time window.</help>
-			</option>
-			<option label="Accumulate" value="accumulate" type="string">
-			  <parameter key="%::args" type="combination">
-			    <option value="strict" type="choice" />
-			    <option label="Seconds:" value="900" type="integer" minimum="1" />
-			    <help>Accumulation period (in seconds). This must usually match the model time step. if enabling "strict", nodatas will propagate (ie. a single nodata in the input will force the re-accumulated value to be nodata). Otherwise, all valid values are aggregated and only pure nodata intervals produce a nodata in the output.</help>
-			  </parameter>
-			  <help>Accumulation over a user given period (filter argument, in seconds -
-			  should coincide with your calculation step!).</help>
-			</option>
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-
-	<!-- 2D Interpolation -->
-	<parameter key="Add/Remove 2D Interpolation" type="selector">
-		<section name="Interpolations2D" />
-
-		<parameter key="%::algorithms" type="choice" template="true">
-			<section name="Interpolations2D" />
-			<option value="STD_PRESS" type="choice">
-				<help>Generate a standard atmosphere pressure as a function of the cell's elevation</help>
-			</option>
-			<option value="CST" type="choice">
-				<help>Fill the grid with the average over all the stations</help>
-			</option>
-			<option value="CST_LAPSE" type="choice">
-			  <parameter key="%::cst_lapse" type="combination">
-			    <option label="Lapse Rate:" value="0.008" type="decimal" optional="false" />
-			    <option value="" type="dropdown">
-			      <option value="" type="string" />
-			      <option value="soft" type="string" />
-			      <option value="frac" type="string" />
-			    </option>
-			  </parameter>
-			  <help>Detrend the measured data, fill the grid with the average over all the stations, reapply the elevation trend</help>
-			</option>
-			<option value="IDW" type="choice">
-				<help>Inverse Distance Weighted average</help>
-			</option>
-			<option value="IDW_LAPSE" type="choice">
-			  <parameter key="%::idw_lapse" type="combination">
-			    <option label="Lapse Rate:" value="0.008" type="decimal" optional="false" />
-			    <option value="" type="dropdown">
-			      <option value="" type="string" />
-			      <option value="soft" type="string" />
-			      <option value="frac" type="string" />
-			    </option>
-			  </parameter>
-			  <help>Detrend the measured data, apply Inverse Distance Weighted average, reapply elevation trend</help>
-			</option>
-			<option value="LIDW_LAPSE" type="choice">
-			  <parameter key="%::lidw_lapse" type="combination">
-			    <option label="Lapse Rate:" value="0.008" type="decimal" optional="false" />
-			    <option value="" type="dropdown">
-			      <option value="" type="string" />
-			      <option value="soft" type="string" />
-			      <option value="frac" type="string" />
-			    </option>
-			  </parameter>
-			  <help>Same as IDW_LAPSE, but only considering a given number of neighboring stations</help>
-			</option>
-			<option value="RH" type="choice">
-				<help>Computes the dew point temperature, distribute it with IDW_LAPSE, recompute RH at each pixel</help>
-			</option>
-			<option value="ILWR" type="choice">
-				<help>Compute emissivity, distribute it with IDW_LAPSE, recompute ILWR at each pixel</help>
-			</option>
-			<option value="WIND_CURV" type="choice">
-				<help>Distribute wind velocity with IDW_LAPSE, then apply correction factors as a function of local slope and curvature</help>
-			</option>
-			<option value="HNW_SNOW" type="choice">
-				<parameter key="%::hnw_snow" type="combination">
-				<option value="IDW_LAPSE" type="dropdown">
-					<option value="CST" type="string" />
-					<option value="CST_LAPSE" type="string" />
-					<option value="IDW" type="string" />
-					<option value="IDW_LAPSE" type="string" />
-					<option value="ODKRIG" type="string" />
-				</option>
-				<help>Base algorithm (do not forget to add the options for the base algorithm)</help>
-				</parameter>
-				<help>Distribute precipitation with a base algorithm (IDW_LAPSE by default), then reduce/remove precipitation on
-				steep slopes and correct with the local curvature. This is to simulate snow redistribution processes.</help>
-			</option>
-			<option value="USER" type="choice">
-			  <parameter key="%::user" type="path" optional="false"/>
-			  <help>User provided grids, named as {numeric date}_{capitalized meteo parameter}.asc</help>
-			</option>
-			<option value="ODKRIG" type="choice">
-			  <parameter key="%::odkrig" type="combination">
-			  	<option value="" type="dropdown">
-					<option value="LINVARIO" type="string" />
-					<option value="EXPVARIO" type="string" />
-					<option value="SPHERICVARIO" type="string" />
-					<option value="RATQUADVARIO" type="string" />
-				</option>
-				<help>Variogram model</help>
-			  </parameter>
-			  <help>Ordinary kriging (EXPERIMENTAL)</help>
-			</option>
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-</inishell_config>
\ No newline at end of file
Index: ../trunk-jpl/src/java/doc/examples/snowpack_config.xml
===================================================================
--- ../trunk-jpl/src/java/doc/examples/snowpack_config.xml	(revision 18297)
+++ ../trunk-jpl/src/java/doc/examples/snowpack_config.xml	(revision 18298)
@@ -1,1084 +0,0 @@
-<inishell_config application="SNOWPACK">
-	<!-- <include path="doc/examples/meteoio_config.xml" /> -->
-
-	<!-- General Parameters -->
-	<parameter key="BUFF_CHUNK_SIZE" type="integer" default="30">
-		<section name="general" />
-		<help>Size in days of a chunk of data to read at once.</help>
-	</parameter>
-
-	<parameter key="BUFF_BEFORE" type="decimal" default="1.5">
-		<section name="general" />
-		<help>Alternate way of buffer centering: When rebuffering, the new date will be located BUFF_BEFORE days from the
-		beginning of the buffer (therefore, it takes a value in days).</help>
-	</parameter>
-
-	<!-- Coordinate systems, time zones -->
-	<parameter key="COORDSYS" type="alternative" optional="false">
-		<section name="input" />
-		<section name="output" />
-		<option value="CH1903" type="string">
-			<help>coordinates in the Swiss Grid &lt;a href="http://geomatics.ladetto.ch/ch1903_wgs84_de.pdf"&gt;http://geomatics.ladetto.ch/ch1903_wgs84_de.pdf&lt;/a&gt;</help>
-		</option>
-		<option value="UTM" type="string">
-			<parameter key="COORDPARAM" type="string">
-				<help>specify the zone with the zone letter (for example, 32T)</help>
-			</parameter>
-			<help>UTM coordinates, see &lt;a href="http://www.oc.nps.edu/oc2902w/maps/utmups.pdf"&gt;http://www.oc.nps.edu/oc2902w/maps/utmups.pdf&lt;/a&gt;</help>
-		</option>
-		<option value="UPS" type="string">
-			<parameter key="COORDPARAM" type="string">
-				<help>specify the hemisphere (either N or S)</help>
-			</parameter>
-			<help>Universal Polar Stereographic coordinates, see &lt;a href="https://en.wikipedia.org/wiki/Universal_Polar_Stereographic_coordinate_system"&gt;https://en.wikipedia.org/wiki/Universal_Polar_Stereographic_coordinate_system&lt;/a&gt;</help>
-		</option>
-		<option value="PROJ4" type="string">
-			<parameter key="COORDPARAM" type="string" optional="false" />
-			<help>external library: see &lt;a href="http://trac.osgeo.org/proj/"&gt;http://trac.osgeo.org/proj/&lt;/a&gt;</help>
-		</option>
-		<option value="LOCAL"  type="string">
-			<help>uses the horizontal and vertical distance from a reference point</help>
-		</option>
-		<help>coordinate system</help>
-	</parameter>
-
-	<parameter key="TIME_ZONE" type="integer+" default="+1" maximum="14" minimum="-12" optional="false">
-		<section name="input" />
-		<section name="output" />
-	</parameter>
-
-	<!-- Datatypes: Meteo Data -->
-	<frame key="meteo_frame" label="Meteorological Data">
-	<section name="input"/>
-	<parameter key="METEO" type="alternative" optional="false">
-		<section name="input" />
-
-		<option value="A3D" type="string">
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string containing the path to the meteorological files</help>
-			</parameter>
-		</option>
-		<option value="BORMA" type="string">
-			<section name="input" />
-			<reference name="BORMA" />
-		</option>
-		<option value="COSMO" type="string">
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string containing the path to the meteorological files</help>
-			</parameter>
-		</option>
-		<option value="GEOTOP" type="string">
-			<section name="input" />
-			<reference name="GEOTOP_IN" />
-		</option>
-		<option value="GRIB" type="string">
-			<section name="input" />
-			<reference name="GRIB_METEO" />
-		</option>
-		<option value="GSN" type="string">
-			<section name="input" />
-			<reference name="GSN" />
-		</option>
-		<option value="IMIS" type="string">
-			<section name="input" />
-			<reference name="IMIS" />
-		</option>
-		<option value="SMET" type="string">
-			<section name="input" />
-			<reference name="SMET_IN" />
-		</option>
-		<option value="SNOWPACK" type="string">
-			<section name="input" />
-			<reference name="SNIO_IN" />
-		</option>
-
-		<help>plugin for METEO data </help>
-	</parameter>
-	<parameter key="Add Meteo parameter copy" type="selector">
-		<section name="input"/>
-		<parameter key="COPY::%" type="string" optional="false" template="true">
-			<help>The name of the parameter to copy (e.g. TA, RH, VW, ISWR, etc)</help>
-		</parameter>
-		<help>Copy a meteo parameter into a new one (you should not need this)</help>
-	</parameter>
-	</frame>
-
-	<!-- Extra Input Parameters -->
-	<frame key="snow_frame" label="Initial Snow Profiles">
-	<section name="input"/>
-	<parameter key="SNOWPATH" type="path" default="./current_snow">
-		<section name="input" />
-		<help>Path to the land surface and snow input parameters</help>
-	</parameter>
-	<parameter key="SNOW" type="alternative" default="SMET" optional="true">
-		<section name="input" />
-		<option value="SNOWPACK" type="string" />
-		<option value="SMET" type="string" />
-		<help>Plugin to use for reading SNO data</help>
-	</parameter>
-	<parameter key="SNOWFILE#" type="file" counter="1" optional="false">
-		<section name="input" />
-		<help>file name for the initial profile for station number #</help>
-	</parameter>
-	<!-- <parameter key="NUMBER_OF_SOLUTES" type="integer" default="0" minimum="0" maximum="0">
-		<section name="input" />
-		<help>SNOWPACK can transport an arbitrary number of trace components in its snow and water phases [special use]</help>
-	</parameter> -->
-	</frame>
-
-	<!-- Output Parameters -->
-	<parameter key="METEOPATH" type="path" default="./output">
-		<section name="output" />
-		<help>Path to the outputs (this path MUST exist, it won't be created)</help>
-	</parameter>
-	<parameter key="EXPERIMENT" type="string" optional="false">
-		<section name="output" />
-		<help>Option to give an additional simulation specific output name to the run in addition to "STATION_NAME")</help>
-	</parameter>
-	<frame key="TS_frame" label="Time Series">
-	<section name="output"/>
-	<parameter key="TS_WRITE" type="alternative" optional="false">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write meteo data out?</help>
-	</parameter>
-	<parameter key="TS_START" type="decimal" default="0" minimum="0" maximum="360">
-		<section name="output" />
-		<help>When to start writing meteo data out (offset, in days)</help>
-	</parameter>
-	<parameter key="TS_DAYS_BETWEEN" type="decimal" default="4.1666e-2" minimum="0" maximum="360">
-		<section name="output" />
-		<help>How often to write meteo data out (in days: 3 hours=.125, 1 hour=4.1666e-2)</help>
-	</parameter>
-	<parameter key="AVGSUM_TIME_SERIES" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>If AVGSUM_TIME_SERIES is set, mean fluxes and cumulated masses since last dump are written, else current energy fluxes, cumulated masses over last COMPUTATION_STEP_LENGTH (recommended setting in operational mode).</help>
-	</parameter>
-	<parameter key="CUMSUM_MASS" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>If CUMSUM_MASS is set, current value of cumulated masses since begin of run are dumped. Precipitations (rain and snow, rain) are always dumped as rates (kg m-2 h-1).</help>
-	</parameter>
-	<parameter key="PRECIP_RATES" type="alternative" optional="true" default="TRUE">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write precipitation as rates (kg m-2 h-1, default) or as sums over the output time step. Please note that the units label in the output file and in SN_GUI &lt;b&gt;will remain kg m-2 h-1&lt;/b&gt; and will therefore not match sums.</help>
-	</parameter>
-	</frame>
-	<frame key="profiles_frame" label="Snow Profiles">
-	<section name="output"/>
-	<parameter key="PROFILE" type="alternative" default="ASCII" optional="false">
-		<section name="output" />
-		<option value="ASCII" type="string" />
-		<option value="IMIS" type="string" />
-		<option value="ASCII IMIS" type="string" />
-		<help>How to write the profiles (default: ASCII)</help>
-	</parameter>
-	<parameter key="PROF_WRITE" type="alternative" optional="false">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write profile data out?</help>
-	</parameter>
-	<parameter key="PROF_START" type="decimal" default="0" minimum="0" maximum="360">
-		<section name="output" />
-		<help>When to start writing profile data out (offset, in days)</help>
-	</parameter>
-	<parameter key="PROF_DAYS_BETWEEN" type="decimal" default="4.1666e-2" minimum="0" maximum="360">
-		<section name="output" />
-		<help>How often to write profile data out (in days: 3 hours=.125, 1 hour=4.1666e-2)</help>
-	</parameter>
-	<parameter key="HARDNESS_IN_NEWTON" type="alternative" default="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write the hand hardness in newtons (default) or as index</help>
-	</parameter>
-	<parameter key="CLASSIFY_PROFILE" type="alternative" default="false">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Classify the profile (default=false)? This is according to Schweizer, J. and M. Luetschg, &lt;i&gt;Characteristics of human-triggered avalanches&lt;/i&gt;, 2001, Cold Reg. Sci. Technol. &lt;b&gt;33&lt;/b&gt;(2-3)</help>
-	</parameter>
-	</frame>
-	<frame key="sno_frame" label="Status files">
-	<section name="output"/>
-	<parameter key="SNOW" type="alternative" default="SMET" optional="true">
-		<section name="output" />
-		<option value="SNOWPACK" type="string" />
-		<option value="SMET" type="string" />
-		<help>Plugin to use for reading SNO data</help>
-	</parameter>
-	<parameter key="BACKUP_DAYS_BETWEEN" type="decimal" default="365" minimum="0">
-		<section name="output" />
-		<help>Dump snow files every BACKUP_DAYS_BETWEEN days</help>
-	</parameter>
-	<parameter key="FIRST_BACKUP" type="decimal" default="400" minimum="0">
-		<section name="output" />
-		<help>First dump of sno files happens at end of run or after FIRST_BACKUP days, whichever happens first</help>
-	</parameter>
-	</frame>
-
-	<frame key="switch_frame" label="Outputs Selection">
-	<section name="output"/>
-	<parameter key="OUT_CANOPY" type="alternative" default="FALSE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write canopy data out? To be set to TRUE only if CANOPY=TRUE</help>
-	</parameter>
-	<parameter key="OUT_HAZ" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write hazard data out? This must be FALSE for Alpine3D</help>
-	</parameter>
-	<parameter key="OUT_HEAT" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write turbulent fluxes out?</help>
-	</parameter>
-	<parameter key="OUT_T" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write snow/soil temperatures out?</help>
-	</parameter>
-	<!-- <parameter key="OUT_LOAD" type="alternative" default="FALSE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write solutes load data out?</help>
-	</parameter> -->
-	<parameter key="OUT_LW" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write long wave radiation out?</help>
-	</parameter>
-	<parameter key="OUT_SW" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write short wave radiation out?</help>
-	</parameter>
-	<parameter key="OUT_MASS" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write mass balance terms out?</help>
-	</parameter>
-	<parameter key="OUT_METEO" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write meteo parameters out?</help>
-	</parameter>
-	<parameter key="OUT_STAB" type="alternative" default="TRUE" optional="true">
-		<section name="output" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Write stability parameters out?</help>
-	</parameter>
-	</frame>
-
-
-	<!-- Snowpack Parameters -->
-	<frame key="sn_parameters_frame" label="Model Parameters">
-	<section name="Snowpack"/>
-	<parameter key="CALCULATION_STEP_LENGTH" type="decimal" default="15" minimum="5" maximum="180">
-		<section name="Snowpack" />
-		<help>Internal time step (in minutes) used for model simulation. Please note that this MUST be the same as HNW::accumulate (the latter being in seconds) if re-acumulating precipitation, otherwise it would lead to wrong results.</help>
-	</parameter>
-	<parameter key="ROUGHNESS_LENGTH" type="decimal" default="0.002">
-		<section name="Snowpack" />
-		<help>Aerodynamic roughness length as a parameter for the Monin-Obukhov bulk formulation; A typical value for complex terrain is 0.01 m and for snow covered flat sites 0.001 m.</help>
-	</parameter>
-	<parameter key="HEIGHT_OF_METEO_VALUES" type="decimal" default="5.0">
-		<section name="Snowpack" />
-		<help>The instrument height (or model layer height) for meteorological input data except for wind, which may be at a different height; note that height is above ground for a standard SNOWPACK application but above surface (snow or ground) for Alpine3D applications.</help>
-	</parameter>
-	<parameter key="HEIGHT_OF_WIND_VALUE" type="decimal" default="5.0">
-		<section name="Snowpack" />
-		<help>The instrument height (or model layer height) for wind input data; note that height is above ground for a standard SNOWPACK application but above surface (snow or ground) for Alpine3D applications</help>
-	</parameter>
-	</frame>
-	<frame key="sn_switch_frame" label="Models Selection">
-	<section name="Snowpack"/>
-	<parameter key="ENFORCE_MEASURED_SNOW_HEIGHTS" type="alternative" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Input mode by which a measurement of snow depth is used to drive the snow cover mass balance</help>
-	</parameter>
-	<parameter key="SW_MODE" type="integer" default="0" minimum="0" maximum="2" optional="false">
-		<section name="Snowpack" />
-		<help>Define the shortwave radiation input: &lt;ol&gt; &lt;li value="0"&gt;Incoming shortwave radiation is measured and albedo estimated by the model;&lt;/li&gt; &lt;li&gt;Reflected shortwave radiation is available as input and albedo is estimated by the model (IMIS standard);&lt;/li&gt; &lt;li&gt;Incoming and reflected shortwave radiation are both measured and the albedo is estimated from both measurements subject to plausibility checks.&lt;/li&gt; &lt;/ol&gt;</help>
-	</parameter>
-	<parameter key="NEUTRAL" type="integer" default="1" minimum="-1" maximum="1" optional="false">
-		<section name="Snowpack" />
-		<help>Select the atmospheric stability correction model:&lt;ol&gt; &lt;li value="-1"&gt; use a simplified Richardson number stability correction;&lt;/li&gt; &lt;li&gt;assume standard Monin-Obukhov bulk formulation for surface exchange iteration with Paulson, Stearns and Weidner (can be used with BC_CHANGE=0); &lt;/li&gt; &lt;li&gt; force Monin-Obukhov formulation to assume neutral conditions regardless of the actual stratification; it has been shown to work well in complex terrain settings. It should be used with BC_CHANGE=1, i.e., Dirichlet bc but also is recommended with Neumann b.c., i.e., BC_CHANGE=0.&lt;/li&gt; &lt;/ol&gt;</help>
-	</parameter>
-	<parameter key="CANOPY" type="alternative" default="FALSE" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Switch to tell the model that canopy is present (note that Canopy parameters should then be provided in the *.sno file)</help>
-	</parameter>
-	<parameter key="MEAS_TSS" type="alternative" default="TRUE" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>A measured surface temperature is available and can be reliably used for various consistency tests (it needs to be set to true if enabling CHANGE_BC).</help>
-	</parameter>
-	<parameter key="CHANGE_BC" type="alternative" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Use measured surface temperature as Dirichlet temperature BC for sub-freezing snowpacks and switch to Neumann only for melting snowpacks. If set to false, assumes Neumann boundary conditions.</help>
-	</parameter>
-	<parameter key="THRESH_CHANGE_BC" type="decimal" default="-1.3">
-		<section name="Snowpack" />
-		<help>Threshold value (small number below freezing), which switches from Dirichlet to Neumann BCs if CHANGE_BC is selected</help>
-	</parameter>
-	</frame>
-	<frame key="sn_slopes_frame" label="Virtual slopes">
-	<section name="Snowpack"/>
-	<parameter key="NUMBER_SLOPES" type="alternative" default="1" optional="false">
-		<section name="Snowpack" />
-		<option value="1" type="string" />
-		<option value="5" type="string" />
-		<option value="3" type="string" />
-		<option value="9" type="string" />
-		<help>Based on meteorological input from a (flat field) automatic station or numerical weather model, up to 8 expositions can be calculated in addition to the flat field if the corresponding *.sno files are provided. For example, if you provide a flat field *.snow file (mandatory), which is named KLO3.sno and you want 4 slopes to be calculated the corresponding slope files should be named KLO21.sno, …,KLO24.sno</help>
-	</parameter>
-	<parameter key="INCOMING_LONGWAVE" type="alternative" default="FALSE" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Use the provided incoming long wave on the virtual slopes?</help>
-	</parameter>
-	<parameter key="SNOW_REDISTRIBUTION" type="alternative" default="FALSE" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Specifies if redistribution of snow is allowed from (upwind) expositions to lee slopes. In case just the flat field is calculated, snow erosion is enabled but only for "ENFORCE_MEASURED_SNOW_HEIGHTS".</help>
-	</parameter>
-	</frame>
-	<frame key="soil_frame" label="Soil Modeling">
-	<section name="Snowpack"/>
-	<parameter key="SNP_SOIL" type="alternative" default="TRUE" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Soil layers as defined by the *.sno files are included in the simulation</help>
-	</parameter>
-	<parameter key="SOIL_FLUX" type="alternative" default="FALSE" optional="false">
-		<section name="Snowpack" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Assume that the lower temperature boundary condition is given by GEO_HEAT (Neumann) and not by a measured temperature</help>
-	</parameter>
-	<parameter key="GEO_HEAT" type="decimal" default="0.06">
-		<section name="Snowpack" />
-		<help>Constant geothermal heat flux at great) depth W m-2): Lower flux boundary condition for temperature equation if BC is Neumann</help>
-	</parameter>
-	</frame>
-
-
-	<!-- SnowpackAdvanced Parameters -->
-	<parameter key="ASSUME_RESPONSIBILITY" type="alternative" default="AGREE">
-		<section name="SnowpackAdvanced" />
-		<option value="AGREE" type="string" />
-		<help>&lt;font color="FF0000"&gt;The keys in this section deeply affect the operation of the SNOWPACK model. This could lead to unexpected behavior or surprising results. If you are not an experienced Snowpack user, please do NOT change any keys below!&lt;/font&gt;</help>
-	</parameter>
-	<parameter key="VARIANT" type="alternative">
-		<section name="SnowpackAdvanced" />
-		<option value="DEFAULT" type="string" />
-		<option value="JAPAN" type="string" />
-		<option value="ANTARTICA" type="string" />
-		<!-- <option value="CALIBRATION" type="string" /> -->
-		<help>variant selection (includes a choice of specific models)</help>
-	</parameter>
-	<!-- <parameter key="RESEARCH" type="alternative" optional="true" default="TRUE">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>research_mode</help>
-	</parameter> -->
-	<!-- <parameter key="NUMBER_FIXED_RATES" type="integer" default="0">
-		<section name="SnowpackAdvanced" />
-		<help>number_fixed_rates</help>
-	</parameter> -->
-	<parameter key="PERP_TO_SLOPE" type="alternative" optional="true" default="FALSE">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>perp_to_slope</help>
-	</parameter>
-	<frame key="wind_frame" label="Wind Handling">
-	<section name="SnowpackAdvanced"/>
-	<parameter key="PREVAILING_WIND_DIR" type="decimal" default="0">
-		<section name="SnowpackAdvanced" />
-		<help>Shifts the origin of the wind rose for snow redistribution and slope simulations: e.g. choose 45° to have NE/SE/SW/NW</help>
-	</parameter>
-	<parameter key="WIND_SCALING_FACTOR" type="decimal" default="1.0" minimum="0" maximum="2">
-		<section name="SnowpackAdvanced" />
-		<help>Scaling factor to apply to wind values in case of drifting snow</help>
-	</parameter>
-	</frame>
-	<frame key="hnw_frame" label="Precipitation Handling">
-	<section name="SnowpackAdvanced"/>
-	<parameter key="FORCE_RH_WATER" type="alternative" optional="true">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Tell the model that relative humidity values are with respect to water regardless of the temperature</help>
-	</parameter>
-	<parameter key="THRESH_RAIN" type="decimal" default="1.2">
-		<section name="SnowpackAdvanced" />
-		<help>Temperature threshold for rain/snow transition</help>
-	</parameter>
-	<parameter key="THRESH_RH" type="decimal" default="0.5">
-		<section name="SnowpackAdvanced" />
-		<help>If ENFORCE_MEASURED_SNOW_HEIGHTS, relative humidity threshold for precipitation to occur</help>
-	</parameter>
-	<parameter key="THRESH_DT_AIR_SNOW" type="decimal" default="3.0">
-		<section name="SnowpackAdvanced" />
-		<help>If ENFORCE_MEASURED_SNOW_HEIGHTS, (TA-TSS) threshold for precipitation to occur</help>
-	</parameter>
-	</frame>
-	<frame key="hoar_frame" label="Hoar Handling">
-	<section name="SnowpackAdvanced"/>
-	<parameter key="HOAR_THRESH_RH" type="decimal" default="0.97">
-		<section name="SnowpackAdvanced" />
-		<help>Relative humidity threshold above which no surface hoar is allowed to form (because at very high humidity, typically no hoar crystals can form)</help>
-	</parameter>
-	<parameter key="HOAR_THRESH_VW" type="decimal" default="3.5">
-		<section name="SnowpackAdvanced" />
-		<help>Wind speed threshold above which no surface hoar is allowed to form (because it will drift away)</help>
-	</parameter>
-	<parameter key="HOAR_DENSITY_BURIED" type="decimal" default="125.0">
-		<section name="SnowpackAdvanced" />
-		<help>Define the initial density for surface hoar at the time it gets buried by new snow</help>
-	</parameter>
-	<parameter key="HOAR_MIN_SIZE_BURIED" type="decimal" default="2.0">
-		<section name="SnowpackAdvanced" />
-		<help>Define a threshold below which any traces of surface hoar will not be given a separate hoar layer when buried.</help>
-	</parameter>
-	<parameter key="HOAR_DENSITY_SURF" type="decimal" default="100.0">
-		<section name="SnowpackAdvanced" />
-		<help>Assumed density of surface hoar while exposed at the surface and not buried</help>
-	</parameter>
-	</frame>
-	<frame key="temps_frame" label="Temperatures Handling">
-	<section name="SnowpackAdvanced"/>
-	<parameter key="FIXED_POSITIONS" type="string" default="">
-		<section name="SnowpackAdvanced" />
-		<help>positions of temperatur sensors in snow or soil: positive values refer to heigths measured from the ground surface (snow only), negative values refer to depths measured from either the ground surface or the snow surface in case no soil layers are present. A sensor must at least be covered by MIN_DEPTH_SUBSURF (m) snow for its temperature to be output.</help>
-	</parameter>
-	<!-- <parameter key="MAX_NUMBER_MEAS_TEMPERATURES" type="integer" default="5">
-		<section name="SnowpackAdvanced" />
-		<help></help>
-	</parameter> -->
-	<parameter key="MIN_DEPTH_SUBSURF" type="decimal" default="0.07">
-		<section name="SnowpackAdvanced" />
-		<help>Minimum snow depth above a temperature sensor to accept the measurement</help>
-	</parameter>
-	<parameter key="T_CRAZY_MIN" type="decimal" default="210.">
-		<section name="SnowpackAdvanced" />
-		<help>If you go to Antarctica or the tropics you may expect different reasonable temperatures</help>
-	</parameter>
-	<parameter key="T_CRAZY_MAX" type="decimal" default="340.">
-		<section name="SnowpackAdvanced" />
-		<help>If you go to Antarctica or the tropics you may expect different reasonable temperatures</help>
-	</parameter>
-	</frame>
-	<frame key="sn_models_frame" label="Models Selection">
-	<section name="SnowpackAdvanced"/>
-	<parameter key="HN_DENSITY_MODEL" type="alternative" default="LEHNING_NEW">
-		<section name="SnowpackAdvanced" />
-		<option value="LEHNING_NEW" type="string" />
-		<option value="ZWART" type="string" />
-		<option value="BELLAIRE" type="string" />
-		<option value="LEHNING_OLD" type="string" />
-		<option value="PAHAUT" type="string" />
-		<help>Choice of new snow density model (diverse statistical models)</help>
-	</parameter>
-	<parameter key="HN_DENSITY" type="string" default="PARAMETERIZED">
-		<section name="SnowpackAdvanced" />
-		<help>Fixed value to be used as new snow density if a constant density model is chosen, otherwise the choices are "PARAMETERIZED" "EVENT" "MEASURED"</help>
-	</parameter>
-	<parameter key="METAMORPHISM_MODEL" type="alternative">
-		<section name="SnowpackAdvanced" />
-		<option value="DEFAULT" type="string" />
-		<option value="NIED" type="string" />
-		<help>metamorphism_model</help>
-	</parameter>
-	<parameter key="NEW_SNOW_GRAIN_RAD" type="decimal" default="0.15">
-		<section name="SnowpackAdvanced" />
-		<help>new_snow_grain_rad</help>
-	</parameter>
-	<parameter key="STRENGTH_MODEL" type="alternative">
-		<section name="SnowpackAdvanced" />
-		<option value="DEFAULT" type="string" />
-		<option value="NIED" type="string" />
-		<help>strength_model</help>
-	</parameter>
-	<parameter key="VISCOSITY_MODEL" type="alternative">
-		<section name="SnowpackAdvanced" />
-		<option value="DEFAULT" type="string" />
-		<option value="NIED" type="string" />
-		<help>viscosity_model</help>
-	</parameter>
-	<parameter key="HARDNESS_MODEL" type="alternative">
-		<section name="SnowpackAdvanced" />
-		<option value="MONTI" type="string" />
-		<option value="BELLAIRE" type="string" />
-		<option value="ASARC" type="string" />
-		<help>hardness_model</help>
-	</parameter>
-	<parameter key="DOORSCHOT" type="alternative" optional="true" default="FALSE">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Choose the Doorschot saltation model over the simple Sorenson parameterization</help>
-	</parameter>
-	<parameter key="MULTISTREAM" type="alternative" optional="true">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Select a multi stream model for shortwave radiation penetration into the snow cover</help>
-	</parameter>
-	<parameter key="FIXED_ALBEDO" type="alternative" optional="true">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Force the model to work with a fixed albedo</help>
-	</parameter>
-	<!-- <parameter key="SURFACECODE" type="alternative" optional="true">
-		<section name="SnowpackAdvanced" />
-		<option value="NEUMANN_BC" type="string" />
-		<option value="DIRICHLET_BC" type="string" />
-		<help>Select the boundary conditions to use</help>
-	</parameter> -->
-	</frame>
-	<frame key="sn_extra_frame" label="Extra Models Selection">
-	<section name="SnowpackAdvanced"/>
-	<parameter key="DETECT_GRASS" type="alternative" optional="true" default="TRUE">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Identify grass growing under the snow height sensor. This usually works well but might sometimes lead to problems</help>
-	</parameter>
-	<parameter key="PLASTIC" type="alternative" optional="true" default="FALSE">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Switch to tell the model that a impermeable layer should be simulated on top of some snow or ice: this requires that the *.sno file contains this layer, which is characterized via the soil parameters; the option has successfully been used to simulate snow and ice protection using geo-textiles and saw dust.</help>
-	</parameter>
-	<parameter key="JAM" type="alternative" optional="true" default="FALSE">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>If switched on, you can also simulate ponding on impermeable ice surfaces below the snow cover</help>
-	</parameter>
-	<parameter key="WATER_LAYER" type="alternative" optional="true" default="FALSE">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Assuming an impermeable surface such as on a road or on geo-textiles (e.g. for snow farming), a liquid water layer is allowed to form on this surface</help>
-	</parameter>
-	</frame>
-	<frame key="elements_frame" label="Elements Handling">
-	<section name="SnowpackAdvanced"/>
-	<parameter key="HEIGHT_NEW_ELEM" type="decimal" default="0.02">
-		<section name="SnowpackAdvanced" />
-		<help>Standard size of a new element added to the stack of elements (layers) during snowfall events</help>
-	</parameter>
-	<parameter key="MINIMUM_L_ELEMENT" type="decimal" default="0">
-		<section name="SnowpackAdvanced" />
-		<help>Threshold value for enforcing the layer to be merged with the layer above or below</help>
-	</parameter>
-	<parameter key="COMBINE_ELEMENTS" type="alternative" optional="true">
-		<section name="SnowpackAdvanced" />
-		<option value="TRUE" type="string" />
-		<option value="FALSE" type="string" />
-		<help>Combine neighboring elements based on a set of similarity conditions which are hard-coded</help>
-	</parameter>
-	</frame>
-
-	<!--Parameter group for list of stations -->
-	<parametergroup name="stationgroup_files">
-		<parameter key="STATION#" type="file" counter="1" optional="false">
-			<help>filename for station number # </help>
-		</parameter>
-	</parametergroup>
-	<parametergroup name="stationgroup_names">
-		<parameter key="STATION#" type="string" counter="1" optional="false">
-			<help>station id for the given station number # </help>
-		</parameter>
-	</parametergroup>
-	<parametergroup name="stationgroup_pos">
-		<parameter key="STATION#" type="string" counter="1">
-			<help>Coordinates are given as "lat lon" or "xcoord ycoord epsg_code"</help>
-		</parameter>
-	</parametergroup>
-
-	<!-- Plugins for Meteo Data-->
-	<parametergroup name="BORMA">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the xml files</help>
-		</parameter>
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="IMIS">
-		<parameter key="DBNAME" type="string" optional="false">
-			<help>database name, as provided by your database administrator</help>
-		</parameter>
-		<parameter key="DBUSER" type="string" optional="false">
-			<help>database user name</help>
-		</parameter>
-		<parameter key="DBPASS" type="string" optional="false">
-			<help>database password associated with the user name</help>
-		</parameter>
-		<parameter key="USEANETZ" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: use ANETZ stations to provide precipitations for normal IMIS stations.
-		  Each IMIS station is associated with one or two ANETZ stations and does a weighted
-		  average to get what should be its local precipitations</help>
-		</parameter>
-		<parameter key="USE_IMIS_HNW" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: if set to false (default), all IMIS precipitation will be deleted (since IMIS stations don't have heated rain gauges, their precipitation measurements are not good in winter conditions). If set to true, it is strongly advised to use a FilterHNWMelt filter to detect snow melting in the rain gauge and perform winter conditions detection in the application.</help>
-		</parameter>
-		<parameter key="USE_SNOWPACK_HNW" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>if set to true, the SNOWPACK simulated Snow Water Equivalent from the database will be used to compute HNW. Data gaps greater than 3 hours on SWE will lead to unchanged hnw while all data that can properly be computed will overwrite hnw. (default=false)</help>
-		</parameter>
-
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="GRIB_METEO">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the grib files</help>
-		</parameter>
-		<parameter key="METEOEXT" type="string" optional="true">
-			<help>grib file extension, or none for no file extension (default: .grb)</help>
-		</parameter>
-
-		<reference name="stationgroup_pos" />
-	</parametergroup>
-
-	<parametergroup name="GEOTOP_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the data files</help>
-		</parameter>
-		<parameter key="METAFILE" type="file" optional="false">
-			<help>absolute filename of the geotop.inpts file</help>
-		</parameter>
-		<parameter key="METEOPREFIX" type="string" optional="true">
-			<help>prefix to append when generating a file name for reading</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="GSN">
-		<parameter key="ENDPOINT" type="string" optional="false">
-			<help>webserver running GSN with its port number and full path. For example:
-			http://montblanc.slf.ch:22001/services/A3DWebService</help>
-		</parameter>
-		<parameter key="PROXY" type="string" optional="true">
-			<help>Should the connection go through a proxy? This is useful for servers
-			filtering on domains but usually not necessary.</help>
-		</parameter>
-		<parameter key="PROXYPORT" type="string" optional="true" />
-		<parameter key="PROXYUSER" type="string" optional="true" />
-		<parameter key="PROXYPASS" type="string" optional="true" />
-
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="SMET_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the smet files</help>
-		</parameter>
-		<reference name="stationgroup_files" />
-	</parametergroup>
-
-	<parametergroup name="SNIO_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the SNOWPACK files</help>
-		</parameter>
-		<parameter key="METAFILE" type="file" optional="true">
-			<help>filename of the meta data file (in METEOPATH)</help>
-		</parameter>
-		<parameter key="NUMBER_MEAS_TEMPERATURES" type="integer+" minimum="0" default="0">
-		  <help>the number of measured snow temperatures that are provided</help>
-		</parameter>
-		<parameter key="NUMBER_OF_SOLUTES" type="integer+" minimum="0" default="0">
-		  <help>the number of solutes for which input data are provided</help>
-		</parameter>
-
-		<parameter key="RSWR_INP" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		</parameter>
-		<parameter key="ISWR_INP" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		</parameter>
-		<parameter key="VW_DRIFT" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: wind velocity to use for blowing and drifting snow is provided</help>
-		</parameter>
-		<parameter key="RHO_HN" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: measured new snow density is provided</help>
-		</parameter>
-
-		<reference name="stationgroup_files" />
-	</parametergroup>
-
-	<!-- Meteo Parameters for Filters, resampling, spatial interpolations-->
-	<parametergroup name="METEOIOPARAMETERS">
-		<option value="TA"/>
-		<option value="RH"/>
-		<option value="VW"/>
-		<option value="DW"/>
-		<option value="VW_MAX"/>
-		<option value="ISWR"/>
-		<option value="RSWR"/>
-		<option value="ILWR"/>
-		<option value="HS"/>
-		<option value="HNW"/>
-		<option value="TSG"/>
-		<option value="TSS"/>
-		<option value="P"/>
-	</parametergroup>
-
-	<!-- Filters -->
-	<parameter key="Add/Remove Filter" type="selector">
-		<section name="filters" />
-
-		<parameter key="%::filter#" type="alternative" counter="1" template="true">
-			<section name="filters" />
-
-			<option label="MeanAvg" value="mean_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Mean average processing. The mean average filter returns the mean value of all values within a user given time window.</help>
-			</option>
-
-
-			<option label="MedianAvg" value="median_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="decimal" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Median average processing. The median average filter returns the median value of all values within a user given time window.</help>
-			</option>
-
-			<option label="Std Deviation Filter" value="std_dev" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Standard deviation filter. Values outside of mean ± 2 std_dev are rejected.</help>
-			</option>
-
-			<option label="MAD" value="mad" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Median Absolute Deviation. Values outside of median ± 3 σ_MAD are rejected. &lt;br&gt;
-			  See http://en.wikipedia.org/wiki/Median_absolute_deviation for more information.</help>
-			</option>
-
-			<option label="Tukey 53H Filter" value="Tukey" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      The keyword "soft" maybe added, if the window position is allowed to be adjusted to the data present.
-			      The two arguments may be preceded by the keywords "left", "center" or "right", indicating the window position.
-			    </help>
-			  </parameter>
-			  <help>Tukey 53H method A smooth time sequence is generated from the median, substracted from the original signal and
-			  compared with the standard deviation. see "Despiking Acoustic Doppler Velocimeter Data", Derek G. Goring and Vladimir
-			  L. Nikora, Journal of Hydraulic Engineering, 128, 1, 2002 The deviation factor coeffecient is currently hard-coded as k=1.5. </help>
-			</option>
-
-			<option label="Wind Averaging Filter" value="wind_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Wind vector averaging. This calculates the vector average over a user given time period. Each wind vector
-			  within this period is added and the final sum is normalized by the number of vectors that have been added. </help>
-			</option>
-
-			<option label="Exponential Smoothing" value="exp_smoothing" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <option label="alpha:" value="0.8" type="decimal" minimum="0" maximum="1"/>
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			      Alpha needs to be provided as last argument. Please note that the standard filter works with a left window!
-			    </help>
-			  </parameter>
-			  <help>Exponential smooting processing, exponential moving average s_0 = x_0 s_n = alpha*x_(t-1) + (1-alpha)*s_t-1</help>
-			</option>
-
-			<option label="Weighted Moving Average Smoothing" value="wma_smoothing" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			      Please note that the standard filter works with a left window!
-			    </help>
-			  </parameter>
-			  <help>Weighted moving average smoothing such as: WMA = (1*X1 + 2*X2 + ... + n*Xn) / sum_of_weights</help>
-			</option>
-
-			<option label="Min Range Filter" value="min" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Min:" value="" type="decimal" />
-			    <option label="Adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data smaller than the min would be
-			    assigned the minimum permissible value or another value given as an extra argument</help>
-			  </parameter>
-			  <help>Min range filter. Reject all values smaller than the min.</help>
-			</option>
-
-			<option label="Max Range Filter" value="max" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Max:" value="" type="decimal" />
-			    <option label="Adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data greater than the max would be
-			    assigned the maximum permissible value or another value given as an extra argument</help>
-			  </parameter>
-			  <help>Max range filter. Reject all values greater than the max.</help>
-			</option>
-
-			<option label="MinMax (2 or 4 arguments)" value="min_max" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Min:" value="" type="decimal" />
-			    <option label="Max:" value="" type="decimal" />
-			    <option label="Min adjust to:" value="" type="decimal" />
-			    <option label="Max adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data greater than the max would be assigned
-			    the maximum permissible value and all data smaller than the min would be assigned the minimum
-			    permissible value or an optional extra set of two user provided values</help>
-			  </parameter>
-			  <help>Reject all values greater than the max or smaller than the min. &lt;br&gt;</help>
-			</option>
-
-			<option label="Rate Filter (1 argument)" value="rate" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="Max:" value="1.0" type="decimal" minimum="0" maximum="1" />
-			    <help>the absolute value of the maximum permissible rate of change (per seconds)</help>
-			  </parameter>
-			  <help>Rate of change filter. Calculate the change rate (ie: slope) between two points, if it is above a user given value, reject the point.</help>
-			</option>
-
-			<option label="Rate Filter (2 arguments)" value="rate" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="Min:" value="0.0" type="decimal" minimum="0" maximum="1" />
-			    <option label="Max:" value="1.0" type="decimal" minimum="0" maximum="1" />
-			    <help>the minimum and maximum permissible rate of change (per second)</help>
-			  </parameter>
-			  <help>Rate of change filter. Calculate the change rate (ie: slope) between two points, if it is above a user given value, reject the point.</help>
-			</option>
-
-			<option label="Unheated Rain Gauge Filter" value="Unheated_RainGauge" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="RH threshold:" value="0.5" type="decimal" minimum="0" maximum="1" />
-			    <option label="Delta_T threshold:" value="3.0" type="decimal" minimum="0" maximum="20" />
-			  </parameter>
-			  <help>Filters out snow melting in an unheated rain gauge. This filter can ONLY be applied to precipitation. Non-zero measurements are accepted only if they take place when the relative humidity is greater than RH_threshold and (TA-TSS) smaller than Delta_T_threshold, otherwise they get reset to 0. If none of these conditions could be tested (for lack of data), then the precipitation is reset to nodata (or left unchanged if "soft" has been selected).</help>
-			</option>
-
-			<option label="WMO Undercatch Filter" value="undercatch_wmo" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option value="Gage type" type="dropdown">
-					<option value="Nipher" type="string" />
-					<option value="Tretyakov" type="string" />
-					<option value="US8sh" type="string" />
-					<option value="US8unsh" type="string" />
-					<option value="Hellmann" type="string" />
-					<option value="Hellmannsh" type="string" />
-				</option>
-			  </parameter>
-			  <help>This implements the standard methods for precipitation correction as described in "WMO Solid Precipitation Measurement Intercomparison", B. Goodison, P. Louie and D. Yang, 872, 1998 as well as the overview given by "Literature Study on the Correction of Precipitation Measurements", Annette Wagner, 2009. The correction parameters for the shielded Hellmann gauge (German version) are from "Wind-induced Precipitation Undercatch of the Hellmann Gauges", Daqing Yang et al, Nordic Hydrology, 30, 1999, pp 57-80.</help>
-			</option>
-
-			<option label="WMO Undercatch Filter - simplified" value="undercatch_wmo" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option value="Kind" type="dropdown">
-					<option value="Cst" type="string" />
-				</option>
-				<option label="Snow factor:" value="1.3" type="decimal" minimum="0" maximum="5" />
-				<option label="Mixed precipitation factor:" value="1.1" type="decimal" minimum="0" maximum="5" />
-			  </parameter>
-			  <help>This applies a constant correction factor to the precipitation, one for pure snow and one for mixed precipitation. The following thresholds are used: pure snow below -2 C; mixed precipitation between -2 and +2 C; pure rain above 2 C. These threshold can be changed (see online documentation).</help>
-			</option>
-
-			<option label="Unventillated temperature sensor" value="Unventilated_T" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="albedo:" value="0.23" type="decimal" />
-			    <option value="soft" type="choice" />
-			    <help>If the "soft" option is given, the albedo has a value different according to snow (or no snow) on the ground</help>
-			  </parameter>
-			  <help>This implements the correction described in (Reina Nakamura, 2005) with an albedo dependency as introduced in (Huwald, 2009)</help>
-			</option>
-
-			<option label="Add an offset" value="add" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option label="offset:" value="0." type="decimal" />
-			  </parameter>
-			  <help>This adds a given offset to the data.</help>
-			</option>
-
-			<option label="Multiply by a factor" value="mult" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option label="factor:" value="1." type="decimal" />
-			  </parameter>
-			  <help>This multiplies the data by a given factor.</help>
-			</option>
-
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-
-	<!-- 1D Interpolation -->
-	<parameter key="WINDOW_SIZE" type="integer+" minimum="1" default="43200">
-		<section name="Interpolations1D" />
-		<help>Affects resampling: expresses (in seconds) how far a valid point can be
-		searched for when re-interpolating a missing value</help>
-	</parameter>
-
-	<parameter key="Add/Remove 1D Interpolation" type="selector">
-		<section name="Interpolations1D" />
-
-		<parameter key="%::resample" type="alternative" template="true">
-			<section name="Interpolations1D" />
-			<option label="No Interpolation" value="none" type="string" />
-			<option label="Nearest Neighbour" value="nearest_neighbour" type="string" />
-			<option label="Linear" value="linear" type="string">
-			  <parameter key="%::args" type="combination">
-			    <option value="extrapolate" type="choice" />
-			    <help>
-			      If "extrapolate" is added, then data *outside* of the original date range can be interpolated.
-			      Otherwise, a data point will only be calculated between the original date range.
-			    </help>
-			  </parameter>
-			  <help>Mean average processing. The mean average filter returns the mean value of all values within a user given time window.</help>
-			</option>
-			<option label="Accumulate" value="accumulate" type="string">
-			  <parameter key="%::args" type="combination">
-			    <option value="strict" type="choice" />
-			    <option label="Seconds:" value="900" type="integer" minimum="1" />
-			    <help>Accumulation period (in seconds). This must usually match the model time step. if enabling "strict", nodatas will propagate (ie. a single nodata in the input will force the re-accumulated value to be nodata). Otherwise, all valid values are aggregated and only pure nodata intervals produce a nodata in the output.</help>
-			  </parameter>
-			  <help>Accumulation over a user given period (filter argument, in seconds -
-			  should coincide with your calculation step!).</help>
-			</option>
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-
-</inishell_config>
\ No newline at end of file
Index: ../trunk-jpl/src/java/doc/examples/issm.xml
===================================================================
--- ../trunk-jpl/src/java/doc/examples/issm.xml	(revision 18297)
+++ ../trunk-jpl/src/java/doc/examples/issm.xml	(revision 18298)
@@ -1,1284 +0,0 @@
-<inishell_config application="ISSM prototype">
-
-<!-- mesh -->
-<parameter key ="Dimension" type="alternative" optional="false">
-     <section name="mesh" />
-     <option value="0" type="string" default="true">
-        <help> dimension is 0 </help>
-     </option>
-     <option value="3" type="string">
-        <help> dimension is 3 </help>
-       <!-- Elements and vertices of the original 2d mesh -->
-          <parameter key ="x2d" type="double" default="N/A">
-              <help> vertices x coordinate [m] </help>
-          </parameter>
-          <parameter key ="y2d" type="double" default="N/A">
-              <help> vertices y coordinate [m] </help>
-          </parameter>
-          <parameter key ="elements2d" type="double" default="N/A">
-              <help> vertex indices of the mesh elements </help>
-          </parameter>
-          <parameter key ="numberofvertices2d" type="double" default="0">
-              <help> number of vertices </help>
-          </parameter>
-          <parameter key ="numberofelements2d" type="double" default="0">
-              <help> number of elements </help>
-          </parameter>
-     </option>
-     <help> select a mesh dimension 0(default) or 3 </help>
-</parameter>
-<frame key="1" label="Elements and vertices">
-<section name="mesh" />
-  <parameter key ="numberofelements" type="double" default="0">
-     <section name="mesh" />
-     <help> number of elements </help>
-  </parameter>
-  <parameter key ="numberofvertices" type="double" default="0">
-     <section name="mesh" />
-     <help> number of verticies </help>
-  </parameter>
-  <parameter key ="elements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertex indices of the mesh elements </help>
-  </parameter>
-  <parameter key ="x" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices x coordinate [m] </help>
-  </parameter>
-  <parameter key ="y" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices y coordinate [m] </help>
-  </parameter>
-  <parameter key ="z" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices z coordinate [m] </help>
-  </parameter>
-  <parameter key ="edges" type="double" default="N/A">
-     <section name="mesh" />
-     <help> edges of the 2d mesh (vertex1 vertex2 element1 element2) </help>
-  </parameter>
-  <parameter key ="numberofedges" type="double" default="0">
-     <section name="mesh" />
-     <help> number of edges of the 2d mesh </help>
-  </parameter>
-</frame>
-<frame key="2" label="Properties">
-<section name="mesh" />
-  <parameter key ="selected dimension" type="double" default="0">
-     <section name="mesh" />
-     <help> mesh dimension </help>
-  </parameter>
-  <parameter key ="numberoflayers" type="double" default="0">
-     <section name="mesh" />
-     <help> number of extrusion layers </help>
-  </parameter>
-  <parameter key ="vertexonbed" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower vertices flags list </help>
-  </parameter>
-  <parameter key ="elementonbed" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower elements flags list </help>
-  </parameter>
-  <parameter key ="vertexonsurface" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper vertices flags list </help>
-  </parameter>
-  <parameter key ="elementonsurface" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper element flag list </help>
-  </parameter>
-  <parameter key ="uppervertex" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper vertex list (NaN for vertex on the upper surface) </help>
-  </parameter>
-  <parameter key ="upperelements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper element list (NaN for element on the upper layer) </help>
-  </parameter>
-  <parameter key ="lowervertex" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower vertex list (NaN for vertex on the lower surface) </help>
-  </parameter>
-  <parameter key ="lowerelements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower element list (NaN for element on the lower layer </help>
-  </parameter>
-  <parameter key ="vertexonboundary" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices on the boundary of the domain flag list </help>
-  </parameter>
-  <parameter key ="segments" type="double" default="N/A">
-     <section name="mesh" />
-     <help> edges on domain boundary (vertex1 vertex2 element) </help>
-  </parameter>
-  <parameter key ="segmentmarkers" type="double" default="N/A">
-     <section name="mesh" />
-     <help> number associated to each segment </help>
-  </parameter>
-  <parameter key ="vertexconnectivity" type="double" default="N/A">
-     <section name="mesh" />
-     <help> list of vertices connected to vertex_i </help>
-  </parameter>
-  <parameter key ="elementconnectivity" type="double" default="N/A">
-     <section name="mesh" />
-     <help> list of vertices connected to element_i </help>
-  </parameter>
-  <parameter key ="average_vertex_connectivity" type="double" default="25">
-     <section name="mesh" />
-     <help> average number of vertices connected to one vertex </help>
-  </parameter>
-</frame>
-<frame key="3" label="Extracted Model">
-<section name="mesh" />
-  <parameter key ="extractedvertices" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices extracted from the model </help>
-  </parameter>
-  <parameter key ="extractedelements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> elements extracted from the model </help>
-  </parameter>
-</frame>
-<frame key="4" label="Projection">
-<section name="mesh" />
-  <parameter key ="lat" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices latitude [degrees] </help>
-  </parameter>
-  <parameter key ="long" type="double" default="N/A">
-     <section name="mesh" />
-     <help> verticies longitude [degrees] </help>
-  </parameter>
-  <parameter key ="hemisphere" type="double" default="N/A">
-     <section name="mesh" />
-     <help> Indicate hemisphere 'n' or 's' </help>
-  </parameter></frame>
-
-
-<!-- mask -->
-<parameter key ="groundedice_levelset" type="double" default="NaN">
-     <section name="mask" />
-     <help> is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if &amp;lt; 0 </help>
-</parameter>
-<parameter key ="ice_levelset" type="double" default="NaN">
-     <section name="mask" />
-     <help> presence of ice if > 0, icefront position if = 0, no ice if &amp;lt; 0 </help>
-</parameter>
-
-<!-- geometry -->
-<frame key="1" label="Geometry parameters">
-<section name="geometry" />
-<parameter key ="surface" type="path" optional="false">
-     <section name="geometry" />
-     <help> surface elevation [m] </help>
-</parameter>
-<parameter key ="thickness" type="path" optional="false">
-     <section name="geometry" />
-     <help> ice thickness [m] </help>
-</parameter>
-<parameter key ="bed" type="path" optional="false">
-     <section name="geometry" />
-     <help> bed elevation [m] </help>
-</parameter>
-<parameter key ="bathymetry" type="double" default="N/A">
-     <section name="geometry" />
-     <help> bathymetry elevation [m] </help>
-</parameter>
-<parameter key ="hydrostatic_ratio" type="double" default="N/A">
-     <section name="geometry" />
-     <help> coefficient for ice shelves; thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro </help>
-</parameter></frame>
-
-
-<!-- constants -->
-<parameter key ="g" type="double" default="9.81">
-     <section name="constants" />
-     <help> gravitational acceleration [m/s^2] </help>
-</parameter>
-<parameter key ="yts" type="double" default="31536000">
-     <section name="constants" />
-     <help> number of seconds in a year [s/yr] </help>
-</parameter>
-<parameter key ="referencetemperature" type="double" default="223.15">
-     <section name="constants" />
-     <help> reference temperature used in the enthalpy model [K] </help>
-</parameter>
-
-<!-- surfaceforcings(SMB) -->
-<parameter key ="mass_balance" type="double" default="NaN">
-     <section name="surfaceforcings(SMB)" />
-     <help> surface mass balance [m/yr ice eq] </help>
-</parameter>
-
-<!-- basalforcings -->
-<parameter key ="melting_rate" type="double" default="NaN">
-     <section name="basalforcings" />
-     <help> basal melting rate (positive if melting) [m/yr] </help>
-</parameter>
-<parameter key ="melting_rate_correction" type="double" default="NaN">
-     <section name="basalforcings" />
-     <help> additional melting applied to compensate for dh/dt [m/yr] </help>
-</parameter>
-<parameter key ="geothermalflux" type="double" default="NaN">
-     <section name="basalforcings" />
-     <help> geothermal heat flux [W/m^2] </help>
-</parameter>
-
-<!-- materials -->
-<parameter key ="rho_ice" type="double" default="917">
-     <section name="materials" />
-     <help> ice density [kg/m^3] </help>
-</parameter>
-<parameter key ="rho_water" type="double" default="1023">
-     <section name="materials" />
-     <help> ocean water density [kg/m^3] </help>
-</parameter>
-<parameter key ="rho_freshwater" type="double" default="1000">
-     <section name="materials" />
-     <help> fresh water density [kg/m^3] </help>
-</parameter>
-<parameter key ="mu_water" type="double" default="0.001787">
-     <section name="materials" />
-     <help> water viscosity [N s/m^2] </help>
-</parameter>
-<parameter key ="heatcapacity" type="double" default="2093">
-     <section name="materials" />
-     <help> heat capacity [J/kg/K] </help>
-</parameter>
-<parameter key ="latentheat" type="double" default="334000">
-     <section name="materials" />
-     <help> latent heat of fusion [J/kg] </help>
-</parameter>
-<parameter key ="thermalconductivity" type="double" default="2.4">
-     <section name="materials" />
-     <help> ice thermal conductivity [W/m/K] </help>
-</parameter>
-<parameter key ="temperateiceconductivity" type="double" default="0.24">
-     <section name="materials" />
-     <help> temperate ice thermal conductivity [W/m/K] </help>
-</parameter>
-<parameter key ="meltingpoint" type="double" default="273.15">
-     <section name="materials" />
-     <help> melting point of ice at 1atm in K </help>
-</parameter>
-<parameter key ="beta" type="double" default="9.8e-08">
-     <section name="materials" />
-     <help> rate of change of melting point with pressure [K/Pa] </help>
-</parameter>
-<parameter key ="mixed_layer_capacity" type="double" default="3974">
-     <section name="materials" />
-     <help> mixed layer capacity [W/kg/K] </help>
-</parameter>
-<parameter key ="thermal_exchange_velocity" type="double" default="0.0001">
-     <section name="materials" />
-     <help> thermal exchange velocity [m/s] </help>
-</parameter>
-<parameter key ="rheology_B" type="double" default="N/A">
-     <section name="materials" />
-     <help> flow law parameter [Pa/s^(1/n)] </help>
-</parameter>
-<parameter key ="rheology_n" type="double" default="N/A">
-     <section name="materials" />
-     <help> Glens flow law exponent </help>
-</parameter>
-<parameter key ="rheology_law" type="char" default="'Paterson'">
-     <section name="materials" />
-     <help> law for the temperature dependance of the rheology: "None", "Paterson",  "Arrhenius" or "LliboutryDuval" </help>
-</parameter>
-<parameter key ="lithosphere_shear_modulus" type="double" default="67000000000">
-     <section name="materials" />
-     <help> Lithosphere shear modulus [Pa] </help>
-</parameter>
-<parameter key ="lithosphere_density" type="double" default="3.32">
-     <section name="materials" />
-     <help> Lithosphere density [g/cm^-3] </help>
-</parameter>
-<parameter key ="mantle_shear_modulus" type="double" default="145000000000">
-     <section name="materials" />
-     <help> Mantle shear modulus [Pa] </help>
-</parameter>
-<parameter key ="mantle_density" type="double" default="3.34">
-     <section name="materials" />
-     <help> Mantle density [g/cm^-3] </help>
-</parameter>
-
-
-<!-- damage -->
-<!-- Note: this class depends on different input of law -->
-<parameter key ="law" type="alternative" optional="false">
-	<section name="damage" />
-	<option value="undamage" type="string" default="true">
-		<help> law = undamage </help>
-	</option>
-	<option value="pralong" type="string" default="false">
-		<help> law = pralong </help>
-		<parameter key ="stress_threshold" type="double" default="0">
-			<help> damage stress threshold [Pa] </help>
-		</parameter>
-		<parameter key ="c1" type="double" default="0">
-			<help> damage parameter 1 </help>
-		</parameter>
-		<parameter key ="c2" type="double" default="0">
-			<help> damage parameter 2 </help>
-		</parameter>
-		<parameter key ="c3" type="double" default="0">
-			<help> damage parameter 3 [W/m^2] </help>
-		</parameter>
-		<parameter key ="c4" type="double" default="0">
-			<help> damage parameter 4 </help>
-		</parameter>
-		<parameter key ="healing" type="double" default="0">
-			<help> damage healing parameter 1 </help>
-		</parameter>
-		<parameter key ="equiv_stress" type="double" default="0">
-			<help> 0: von Mises </help>
-		</parameter>
-		<parameter key ="requested_outputs" type="cell" default="{'default'}">
-			<help> additional outputs requested </help>
-		</parameter>
-	</option>
-	<help> damage law (string) from {"undamaged","pralong"} </help>
-</parameter>
-<parameter key ="D" type="double" default="0">
-     <section name="damage" />
-     <help> damage tensor (scalar) </help>
-</parameter>
-<parameter key ="law" type="char" default="undamaged">
-     <section name="damage" />
-     <help> damage law (string) from {"undamaged","pralong"} </help>
-</parameter>
-<parameter key ="spcdamage" type="double" default="NaN">
-     <section name="damage" />
-     <help> damage constraints (NaN means no constraint) </help>
-</parameter>
-<parameter key ="max_damage" type="double" default="0.99999">
-     <section name="damage" />
-     <help> maximum possible damage (0&amp;lt;=max_damage&amp;lt;1) </help>
-</parameter>
-<parameter key ="stabilization" type="double" default="2">
-     <section name="damage" />
-     <help> 0: no, 1: artificial_diffusivity, 2: SUPG </help>
-</parameter>
-<parameter key ="maxiter" type="double" default="100">
-     <section name="damage" />
-     <help> maximum number of non linear iterations </help>
-</parameter>
-<parameter key ="penalty_lock" type="double" default="0">
-     <section name="damage" />
-     <help> stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization) </help>
-</parameter>
-<parameter key ="penalty_threshold" type="double" default="0">
-     <section name="damage" />
-     <help> threshold to declare convergence of damage evolution solution (default is 0) </help>
-</parameter>
-<parameter key ="penalty_factor" type="double" default="3">
-     <section name="damage" />
-     <help> scaling exponent (default is 3) </help>
-</parameter>
-
-
-<!-- Friction: Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p -->
-<frame key="1" label="Friction: Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p">
-<section name="friction" />
-<parameter key ="coefficient" type="double" default="N/A">
-     <section name="friction" />
-     <help> friction coefficient [SI] </help>
-</parameter>
-<parameter key ="p" type="double" default="N/A">
-     <section name="friction" />
-     <help> p exponent </help>
-</parameter>
-<parameter key ="q" type="double" default="N/A">
-     <section name="friction" />
-     <help> q exponent </help>
-</parameter></frame>
-
-
-<!-- flowequation -->
-<frame key="1" label="Flow equation parameters">
-<section name="flowequation" />
-<parameter key ="isSIA" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the Shallow Ice Approximation (SIA) used ? </help>
-</parameter>
-<parameter key ="isSSA" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the Shelfy-Stream Approximation (SSA) used ? </help>
-</parameter>
-<parameter key ="isL1L2" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the L1L2 approximation used ? </help>
-</parameter>
-<parameter key ="isHO" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the Higher-Order (HO) approximation used ? </help>
-</parameter>
-<parameter key ="isFS" type="double" default="0">
-     <section name="flowequation" />
-     <help> are the Full-FS (FS) equations used ? </help>
-</parameter>
-<parameter key ="fe_SSA" type="char" default="'P1'">
-     <section name="flowequation" />
-     <help> Finite Element for SSA  "P1", "P1bubble" "P1bubblecondensed" "P2" </help>
-</parameter>
-<parameter key ="fe_HO" type="char" default="'P1'">
-     <section name="flowequation" />
-     <help> Finite Element for HO   "P1" "P1bubble" "P1bubblecondensed" "P1xP2" "P2xP1" "P2" </help>
-</parameter>
-<parameter key ="fe_FS" type="char" default="'MINIcondensed'">
-     <section name="flowequation" />
-     <help> Finite Element for FS   "P1P1" (debugging only) "P1P1GLS" "MINIcondensed" "MINI" "TaylorHood" </help>
-</parameter>
-<parameter key ="vertex_equation" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> flow equation for each vertex </help>
-</parameter>
-<parameter key ="element_equation" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> flow equation for each element </help>
-</parameter>
-<parameter key ="borderSSA" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> vertices on SSAs border (for tiling) </help>
-</parameter>
-<parameter key ="borderHO" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> vertices on HOs border (for tiling) </help>
-</parameter>
-<parameter key ="borderFS" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> vertices on FS border (for tiling) </help>
-</parameter></frame>
-
-
-<!-- Timestepping -->
-<parameter key ="start_time" type="double" default="0">
-     <section name="timestepping" />
-     <help> simulation starting time [yr] </help>
-</parameter>
-<parameter key ="final_time" type="double" default="5">
-     <section name="timestepping" />
-     <help> final time to stop the simulation [yr] </help>
-</parameter>
-<parameter key ="time_step" type="double" default="0.5">
-     <section name="timestepping" />
-     <help> length of time steps [yr] </help>
-</parameter>
-<parameter key ="time_adapt" type="double" default="0">
-     <section name="timestepping" />
-     <help> use cfl condition to define time step ? (0 or 1)  </help>
-</parameter>
-<parameter key ="cfl_coefficient" type="double" default="0.5">
-     <section name="timestepping" />
-     <help> coefficient applied to cfl condition </help>
-</parameter>
-
-
-<!-- initialization -->
-<frame key="1" label="Initial field values">
-<section name="initialization" />
-<parameter key ="vx" type="double" default="NaN">
-     <section name="initialization" />
-     <help> x component of velocity [m/yr] </help>
-</parameter>
-<parameter key ="vy" type="double" default="NaN">
-     <section name="initialization" />
-     <help> y component of velocity [m/yr] </help>
-</parameter>
-<parameter key ="vz" type="double" default="NaN">
-     <section name="initialization" />
-     <help> z component of velocity [m/yr] </help>
-</parameter>
-<parameter key ="vel" type="double" default="NaN">
-     <section name="initialization" />
-     <help> velocity norm [m/yr] </help>
-</parameter>
-<parameter key ="pressure" type="double" default="NaN">
-     <section name="initialization" />
-     <help> pressure field [Pa] </help>
-</parameter>
-<parameter key ="temperature" type="double" default="NaN">
-     <section name="initialization" />
-     <help> fraction of water in the ice </help>
-</parameter>
-<parameter key ="waterfraction" type="double" default="NaN">
-     <section name="initialization" />
-     <help> ice thickness [m] </help>
-</parameter>
-<parameter key ="sediment_head" type="double" default="NaN">
-     <section name="initialization" />
-     <help> sediment water head of subglacial system [m] </help>
-</parameter>
-<parameter key ="epl_head" type="double" default="NaN">
-     <section name="initialization" />
-     <help> epl water head of subglacial system [m] </help>
-</parameter>
-<parameter key ="watercolumn" type="double" default="NaN">
-     <section name="initialization" />
-     <help> thickness of subglacial water [m] </help>
-</parameter></frame>
-
-
-<!-- rifts -->
-<parameter key ="riftstruct" type="double" default="NaN">
-     <section name="rifts" />
-     <help> structure containing all rift information (vertices coordinates, segments, type of melange, ...) </help>
-</parameter>
-<parameter key ="riftproperties" type="double" default="NaN">
-     <section name="rifts" />
-     <help> N/A </help>
-</parameter>
-
-
-<!-- Debug -->
-<parameter key ="valgrind" type="logical" optional="false">
-     <section name="debug" />
-        <option value="false" type="string" default="true"></option>
-     <help> use Valgrind to debug (0 or 1) </help>
-</parameter>
-<parameter key ="gprof" type="logical" optional="false">
-     <section name="debug" />
-        <option value="false" type="string" default="true"></option>
-     <help> use gnu-profiler to find out where the time is spent </help>
-</parameter>
-<parameter key ="profiling" type="logical" optional="false">
-     <section name="debug" />
-        <option value="false" type="string" default="true"></option>
-     <help> enables profiling (memory, flops, time) </help>
-</parameter>
-
-<!-- verbose -->
-<parameter key ="mprocessor" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="module" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="solution" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="true" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="solver" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="convergence" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="control" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="true" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="qmu" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="true" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="autodiff" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-
-<!-- settings -->
-<parameter key ="results_on_nodes" type="double" default="0">
-     <section name="settings" />
-     <help> results are output for all the nodes of each element </help>
-</parameter>
-<parameter key ="io_gather" type="double" default="1">
-     <section name="settings" />
-     <help> I/O gathering strategy for result outputs (default 1) </help>
-</parameter>
-<parameter key ="lowmem" type="double" default="0">
-     <section name="settings" />
-     <help> is the memory limited ? (0 or 1) </help>
-</parameter>
-<parameter key ="output_frequency" type="double" default="1">
-     <section name="settings" />
-     <help> frequency at which results are saved in all solutions with multiple time_steps </help>
-</parameter>
-<parameter key ="waitonlock" type="double" default="Inf">
-     <section name="settings" />
-     <help> maximum number of minutes to wait for batch results (NaN to deactivate) </help>
-</parameter>
-<parameter key ="upload_server" type="char" default="N/A">
-     <section name="settings" />
-     <help> server hostname where model should be uploaded </help>
-</parameter>
-<parameter key ="upload_path" type="char" default="N/A">
-     <section name="settings" />
-     <help> path on server where model should be uploaded </help>
-</parameter>
-<parameter key ="upload_login" type="char" default="N/A">
-     <section name="settings" />
-     <help> server login </help>
-</parameter>
-<parameter key ="upload_port" type="double" default="0">
-     <section name="settings" />
-     <help> port login (default is 0) </help>
-</parameter>
-<parameter key ="upload_filename" type="char" default="N/A">
-     <section name="settings" />
-     <help> unique id generated when uploading the file to server </help>
-</parameter>
-
-<!-- generic -->
-<parameter key ="name" type="char" default="'XPS'">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="login" type="char" default="N/A">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="np" type="double" default="1">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="port" type="double" default="0">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="codepath" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/bin">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="executionpath" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/execution">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="etcpath" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/etc">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="valgrind" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/externalpackages/valgrind/install/bin/valgrind">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="valgrindlib" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/externalpackages/valgrind/install/lib/libmpidebug.so">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="valgrindsup" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/externalpackages/valgrind/issm.supp">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="verbose" type="double" default="1">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-
-<!-- balancethickness -->
-<parameter key ="spcthickness" type="double" default="N/A">
-     <section name="balancethickness" />
-     <help> thickness constraints (NaN means no constraint) [m] </help>
-</parameter>
-<parameter key ="thickening_rate" type="double" default="N/A">
-     <section name="balancethickness" />
-     <help> ice thickening rate used in the mass conservation (dh/dt) [m/yr] </help>
-</parameter>
-<parameter key ="stabilization" type="double" default="1">
-     <section name="balancethickness" />
-     <help> 0: None, 1: SU, 2: SSAs artificial diffusivity, 3:DG </help>
-</parameter>
-
-<!-- StressBalance solution parameters: -->
-<frame key="1" label="Convergence criteria">
-<section name="stressbalance" />
-<parameter key ="restol" type="double" default="0.0001">
-     <section name="stressbalance" />
-     <help> mechanical equilibrium residual convergence criterion </help>
-</parameter>
-<parameter key ="reltol" type="double" default="0.01">
-     <section name="stressbalance" />
-     <help> velocity relative convergence criterion, NaN: not applied </help>
-</parameter>
-<parameter key ="abstol" type="double" default="10">
-     <section name="stressbalance" />
-     <help> velocity absolute convergence criterion, NaN: not applied </help>
-</parameter>
-<parameter key ="isnewton" type="double" default="0">
-     <section name="stressbalance" />
-     <help> 0: Picards fixed point, 1: Newtons method, 2: hybrid </help>
-</parameter>
-<parameter key ="maxiter" type="double" default="100">
-     <section name="stressbalance" />
-     <help> maximum number of nonlinear iterations </help>
-</parameter>
-<parameter key ="viscosity_overshoot" type="double" default="0">
-     <section name="stressbalance" />
-     <help> over-shooting constant new=new+C*(new-old) </help>
-</parameter>
-</frame>
-<frame key="2" label="Boundary conditions">
-<section name="stressbalance" />
-<parameter key ="spcvx" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> x-axis velocity constraint (NaN means no constraint) [m/yr] </help>
-</parameter>
-<parameter key ="spcvy" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> y-axis velocity constraint (NaN means no constraint) [m/yr] </help>
-</parameter>
-<parameter key ="spcvz" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> z-axis velocity constraint (NaN means no constraint) [m/yr] </help>
-</parameter>
-</frame>
-<frame key="3" label="Rift options">
-<section name="stressbalance" />
-<parameter key ="rift_penalty_threshold" type="double" default="0">
-     <section name="stressbalance" />
-     <help> threshold for instability of mechanical constraints </help>
-</parameter>
-<parameter key ="rift_penalty_lock" type="double" default="10">
-     <section name="stressbalance" />
-     <help> number of iterations before rift penalties are locked </help>
-</parameter>
-</frame>
-<frame key="4" label="Other">
-<section name="stressbalance" />
-<parameter key ="shelf_dampening" type="double" default="0">
-     <section name="stressbalance" />
-     <help> use dampening for floating ice ? Only for FS model </help>
-</parameter>
-<parameter key ="FSreconditioning" type="double" default="10000000000000">
-     <section name="stressbalance" />
-     <help> multiplier for incompressibility equation. Only for FS model </help>
-</parameter>
-<parameter key ="referential" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> local referential </help>
-</parameter>
-<parameter key ="loadingforce" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> loading force applied on each point [N/m^3] </help>
-</parameter>
-<parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="stressbalance" />
-     <help> additional outputs requested </help>
-</parameter>
-</frame>
-
-
-<!-- groundingline -->
-<frame key="1" label="Grounding line migration parameters">
-<section name="groundingline" />
-<parameter key ="migration" type="char" default="'None'">
-     <section name="groundingline" />
-     <help> type of grounding line migration: "SoftMigration","AgressiveMigration" or "None" </help>
-</parameter>
-<parameter key ="melting_rate" type="double" default="0">
-     <section name="groundingline" />
-     <help> melting rate applied when previously grounded parts start floating [m/yr] </help>
-</parameter></frame>
-
-
-<!-- Hydrology -->
-<frame key="1" label="Hydrologyshreve solution parameters">
-<section name="hydrologyshreve" />
-<parameter key ="spcwatercolumn" type="double" default="N/A">
-     <section name="hydrologyshreve" />
-     <help> water thickness constraints (NaN means no constraint) [m] </help>
-</parameter>
-<parameter key ="n" type="double" default="0.02">
-     <section name="hydrologyshreve" />
-     <help> Manning roughness coefficient </help>
-</parameter>
-<parameter key ="CR" type="double" default="0.01">
-     <section name="hydrologyshreve" />
-     <help> tortuosity parameter </help>
-</parameter>
-<parameter key ="p" type="double" default="2">
-     <section name="hydrologyshreve" />
-     <help> dimensionless exponent in Manning velocity formula </help>
-</parameter>
-<parameter key ="q" type="double" default="1">
-     <section name="hydrologyshreve" />
-     <help> dimensionless exponent in Manning velocity formula </help>
-</parameter>
-<parameter key ="kn" type="double" default="0">
-     <section name="hydrologyshreve" />
-     <help> parameter in effective pressure formula </help>
-</parameter>
-<parameter key ="stabilization" type="double" default="1">
-     <section name="hydrologyshreve" />
-     <help> artificial diffusivity (default is 1). can be more than 1 to increase diffusivity. </help>
-</parameter>
-</frame>
-<!-- masstransport -->
-<frame key="1" label="Masstransport solution parameters">
-<section name="masstransport" />
-  <parameter key ="spcthickness" type="double" default="N/A">
-     <section name="masstransport" />
-     <help> thickness constraints (NaN means no constraint) [m] </help>
-  </parameter>
-  <parameter key ="calvingrate" type="double" default="N/A">
-     <section name="masstransport" />
-     <help> calving rate at given location [m/a] </help>
-  </parameter>
-  <parameter key ="isfreesurface" type="double" default="0">
-     <section name="masstransport" />
-     <help> do we use free surfaces (FS only) are mass conservation </help>
-  </parameter>
-  <parameter key ="min_thickness" type="double" default="1">
-     <section name="masstransport" />
-     <help> minimum ice thickness allowed [m] </help>
-  </parameter>
-  <parameter key ="hydrostatic_adjustment" type="char" default="'Absolute'">
-     <section name="masstransport" />
-     <help> adjustment of ice shelves surface and bed elevations: 'Incremental' or 'Absolute'  </help>
-  </parameter>
-  <parameter key ="stabilization" type="double" default="1">
-     <section name="masstransport" />
-     <help> 0: no, 1:  artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin </help>
-  </parameter>
-</frame>
-<frame key="2" label="Penalty options">
-<section name="masstransport" />
-  <parameter key ="vertex_pairing" type="double" default="N/A">
-     <section name="masstransport" />
-     <help> offset used by penalties: penalty = Kmax*10^offset </help>
-  </parameter>
-  <parameter key ="penalty_factor" type="double" default="3">
-     <section name="masstransport" />
-     <help> pairs of vertices that are penalized </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="masstransport" />
-     <help> additional outputs requested </help>
-  </parameter>
-</frame>
-<!-- thermal -->
-<frame key="1" label="Thermal solution parameters">
-<section name="thermal" />
-  <parameter key ="spctemperature" type="double" default="N/A">
-     <section name="thermal" />
-     <help> temperature constraints (NaN means no constraint) [K] </help>
-  </parameter>
-  <parameter key ="penalty_threshold" type="double" default="0">
-     <section name="thermal" />
-     <help> 0: no, 1: artificial_diffusivity, 2: SUPG </help>
-  </parameter>
-  <parameter key ="stabilization" type="double" default="1">
-     <section name="thermal" />
-     <help> maximum number of non linear iterations </help>
-  </parameter>
-  <parameter key ="maxiter" type="double" default="100">
-     <section name="thermal" />
-     <help> stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization) </help>
-  </parameter>
-  <parameter key ="penalty_lock" type="double" default="0">
-     <section name="thermal" />
-     <help> threshold to declare convergence of thermal solution (default is 0)  </help>
-  </parameter>
-  <parameter key ="penalty_factor" type="double" default="3">
-     <section name="thermal" />
-     <help> scaling exponent (default is 3) </help>
-  </parameter>
-  <parameter key ="isenthalpy" type="double" default="0">
-     <section name="thermal" />
-     <help> use an enthalpy formulation to include temperate ice (default is 0) </help>
-  </parameter>
-  <parameter key ="isdynamicbasalspc" type="double" default="0">
-     <section name="thermal" />
-     <help> enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)  </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="thermal" />
-     <help> additional outputs requested </help>
-  </parameter>
-</frame>
-<!-- steadystate -->
-<frame key="1" label="steadystate solution parameters">
-<section name="steadystate" />
-  <parameter key ="reltol" type="double" default="0.01">
-     <section name="steadystate" />
-     <help> relative tolerance criterion [K] </help>
-  </parameter>
-  <parameter key ="maxiter" type="double" default="100">
-     <section name="steadystate" />
-     <help> maximum number of iterations </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="steadystate" />
-     <help> additional requested outputs </help>
-  </parameter>
-</frame>
-<!-- transient -->
-<frame key="1" label="transient solution parameters">
-<section name="transient" />
-  <parameter key ="ismasstransport" type="double" default="1">
-     <section name="transient" />
-     <help> indicates whether a masstransport solution is used in the transient </help>
-  </parameter>
-  <parameter key ="isstressbalance" type="double" default="1">
-     <section name="transient" />
-     <help> indicates whether a stressbalance solution is used in the transient </help>
-  </parameter>
-  <parameter key ="isthermal" type="double" default="1">
-     <section name="transient" />
-     <help> indicates whether a thermal solution is used in the transient </help>
-  </parameter>
-  <parameter key ="isgroundingline" type="double" default="0">
-     <section name="transient" />
-     <help> indicates whether a groundingline migration is used in the transient </help>
-  </parameter>
-  <parameter key ="isgia" type="double" default="0">
-     <section name="transient" />
-     <help> indicates whether a postglacial rebound model is used in the transient </help>
-  </parameter>
-  <parameter key ="isdamage" type="double" default="0">
-     <section name="transient" />
-     <help> indicates whether damage evolution is used in the transient </help>
-  </parameter>
-  <parameter key ="islevelset" type="double" default="0">
-     <section name="transient" />
-     <help> LEVEL SET DESCRIPTION...  </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="transient" />
-     <help> list of additional outputs requested </help>
-  </parameter>
-</frame>
-<!-- gia -->
-<frame key="1" label="gia parameters">
-<section name="gia" />
-  <parameter key ="mantle_viscosity" type="double" default="N/A">
-     <section name="gia" />
-     <help> mantle viscosity[Pa s] </help>
-  </parameter>
-  <parameter key ="lithosphere_thickness" type="double" default="N/A">
-     <section name="gia" />
-     <help> lithosphere thickness (km) </help>
-  </parameter>
-  <parameter key ="cross_section_shape" type="double" default="1">
-     <section name="gia" />
-     <help> 1: square-edged (default). 2: elliptical.  See iedge in GiaDeflectionCore </help>
-  </parameter>
-</frame>
-<!-- autodiff -->
-<frame key="1" label="automatic differentiation parameters">
-<section name="autodiff" />
-  <parameter key ="isautodiff" type="logical" optional="false">
-     <section name="autodiff" />
-         <option value="false" type="string" default="true"></option>
-     <help> indicates if the automatic differentiation is activated </help>
-  </parameter>
-  <parameter key ="dependents" type="cell" default="(0x0)">
-     <section name="autodiff" />
-     <help> list of dependent variables </help>
-  </parameter>
-  <parameter key ="independents" type="cell" default="(0x0)">
-     <section name="autodiff" />
-     <help> list of independent variables </help>
-  </parameter>
-  <parameter key ="driver" type="char" default="'fos_forward'">
-     <section name="autodiff" />
-     <help> ADOLC driver ('fos_forward' or 'fov_forward') </help>
-  </parameter>
-  <parameter key ="obufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of operations per buffer (==OBUFSIZE in usrparms.h)  </help>
-  </parameter>
-  <parameter key ="lbufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of locations per buffer (==LBUFSIZE in usrparms.h) </help>
-  </parameter>
-  <parameter key ="cbufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of values per buffer (==CBUFSIZE in usrparms.h) </help>
-  </parameter>
-  <parameter key ="tbufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of taylors per buffer (&amp;lt;=TBUFSIZE in usrparms.h) </help>
-  </parameter>
-  <parameter key ="gcTriggerRatio" type="double" default="2">
-     <section name="autodiff" />
-     <help> free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio </help>
-  </parameter>
-  <parameter key ="gcTriggerRatio" type="double" default="2">
-     <section name="autodiff" />
-     <help> free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize </help>
-  </parameter>
-</frame>
-<!-- flaim -->
-<frame key="1" label="Input:">
-<section name="flaim" />
-  <parameter key ="targets" type="char" default="N/A">
-     <section name="flaim" />
-     <help> name of kml output targets file </help>
-  </parameter>
-  <parameter key ="tracks" type="char" default="N/A">
-     <section name="flaim" />
-     <help> name of kml input tracks file </help>
-  </parameter>
-  <parameter key ="flightreqs" type="struct" default="N/A">
-     <section name="flaim" />
-     <help> structure of kml flight requirements (not used yet) </help>
-  </parameter>
-  <parameter key ="criterion" type="double" default="N/A">
-     <section name="flaim" />
-     <help> element or nodal criterion for flight path evaluation (metric) </help>
-  </parameter>
-</frame>
-<frame key="2" label="Arguments:">
-<section name="flaim" />
-  <parameter key ="gridsatequator" type="double" default="200000">
-     <section name="flaim" />
-     <help> number of grids at equator (determines resolution) </help>
-  </parameter>
-  <parameter key ="usevalueordering" type="logical" optional="false">
-     <section name="flaim" />
-         <option value="true" type="string" default="true"></option>
-     <help> flag to consider target values for flight path evaluation </help>
-  </parameter>
-  <parameter key ="split_antimeridian" type="logical" optional="false">
-     <section name="flaim" />
-         <option value="true" type="string" default="true"></option>
-     <help> flag to split polygons on the antimeridian </help>
-  </parameter>
-</frame>
-<frame key="3" label="Optimization:">
-<section name="flaim" />
-  <parameter key ="path_optimize" type="logical" optional="false">
-     <section name="flaim" />
-         <option value="false" type="string" default="true"></option>
-     <help> optimize? (default false) </help>
-  </parameter>
-  <parameter key ="opt_ndir" type="double" default="1">
-     <section name="flaim" />
-     <help> number of directions to test when moving a point.  If this value = 1, a random direction is tested. A value > 1 results in directions equally spaced from [0, 2*PI] being tested. For example, 4 would result in directions [0, PI/2, PI, 3PI/2] </help>
-  </parameter>
-  <parameter key ="opt_dist" type="double" default="25">
-     <section name="flaim" />
-     <help> specifies the distance in km (default 25) to move a randomly selected path point on each iteration </help>
-  </parameter>
-  <parameter key ="opt_niter" type="double" default="30000">
-     <section name="flaim" />
-     <help> number of iterations (default 30,000) to run for flightplan optimization, i.e. the number of times to randomly select a point and move it. </help>
-  </parameter>
-</frame>
-<frame key="4" label="Output:">
-<section name="flaim" />
-  <parameter key ="solution" type="char" default="N/A">
-     <section name="flaim" />
-     <help> name of kml solution file </help>
-  </parameter>
-  <parameter key ="quality" type="double" default="0">
-     <section name="flaim" />
-     <help> quality of kml solution </help>
-  </parameter>
-</frame>
-<!-- inversion -->
-<frame key="1" label="inversion parameters">
-<section name="inversion" />
-  <parameter key ="iscontrol" type="double" default="0">
-     <section name="inversion" />
-     <help> is inversion activated? </help>
-  </parameter>
-  <parameter key ="incomplete_adjoint" type="double" default="1">
-     <section name="inversion" />
-     <help> 1: linear viscosity, 0: non-linear viscosity </help>
-  </parameter>
-  <parameter key ="control_parameters" type="cell" default="{'FrictionCoefficient'}">
-     <section name="inversion" />
-     <help> ex: {'FrictionCoefficient'}, or {'MaterialsRheologyBbar'} </help>
-  </parameter>
-  <parameter key ="nsteps" type="double" default="20">
-     <section name="inversion" />
-     <help> number of optimization searches </help>
-  </parameter>
-  <parameter key ="cost_functions" type="double" default="101">
-     <section name="inversion" />
-     <help> indicate the type of response for each optimization step  </help>
-  </parameter>
-  <parameter key ="cost_functions_coefficients" type="double" default="N/A">
-     <section name="inversion" />
-     <help> cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter </help>
-  </parameter>
-  <parameter key ="cost_function_threshold" type="double" default="N/A">
-     <section name="inversion" />
-     <help> misfit convergence criterion. Default is 1%, NaN if not applied </help>
-  </parameter>
-  <parameter key ="maxiter_per_step" type="double" default="(20x1)">
-     <section name="inversion" />
-     <help> maximum iterations during each optimization step  </help>
-  </parameter>
-  <parameter key ="gradient_scaling" type="double" default="(20x1)">
-     <section name="inversion" />
-     <help> scaling factor on gradient direction during optimization, for each optimization step </help>
-  </parameter>
-  <parameter key ="step_threshold" type="double" default="(20x1)">
-     <section name="inversion" />
-     <help> decrease threshold for misfit, default is 30% </help>
-  </parameter>
-  <parameter key ="min_parameters" type="double" default="N/A">
-     <section name="inversion" />
-     <help> absolute minimum acceptable value of the inversed parameter on each vertex </help>
-  </parameter>
-  <parameter key ="max_parameters" type="double" default="N/A">
-     <section name="inversion" />
-     <help> absolute maximum acceptable value of the inversed parameter on each vertex </help>
-  </parameter>
-  <parameter key ="vx_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed velocity x component [m/yr] </help>
-  </parameter>
-  <parameter key ="vy_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed velocity y component [m/yr]  </help>
-  </parameter>
-  <parameter key ="vel_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed velocity magnitude [m/yr] </help>
-  </parameter>
-  <parameter key ="thickness_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed thickness [m]) </help>
-  </parameter>
-</frame>
-<frame key="2" label="Available cost functions">
-<section name="inversion" />
-  <parameter key ="SurfaceAbsVelMisfit" type="string" default="101">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="SurfaceRelVelMisfit" type="string" default="102">
-     <section name="inversion" />
-     <help>   </help>
-  </parameter>
-  <parameter key ="SurfaceLogVelMisfit" type="string" default="103">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="SurfaceLogVxVyMisfit" type="string" default="104">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="SurfaceAverageVelMisfit" type="string" default="105">
-     <section name="inversion" />
-     <help>   </help>
-  </parameter>
-  <parameter key ="ThicknessAbsMisfit" type="string" default="106">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="DragCoefficientAbsGradient" type="string" default="107">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="RheologyBbarAbsGradient" type="string" default="108">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="ThicknessAbsGradient" type="string" default="109">
-     <section name="inversion" />
-     <help> </help>
-  </parameter>
-</frame>
-<!-- qmu -->
-<frame key="1" label="qmu parameters">
-<section name="qmu" />
-  <parameter key ="isdakota" type="double" default="0">
-     <section name="qmu" />
-     <help> is qmu analysis activated? </help>
-  </parameter>
-  <parameter key ="variables" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (arrays of each variable class) </help>
-  </parameter>
-  <parameter key ="responses" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (arrays of each response class) </help>
-  </parameter>
-  <parameter key ="numberofresponses" type="double" default="0">
-     <section name="qmu" />
-     <help> number of responses </help>
-  </parameter>
-  <parameter key ="params" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (array of method-independent parameters)  </help>
-  </parameter>
-  <parameter key ="results" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (information from dakota files) </help>
-  </parameter>
-  <parameter key ="partition" type="double" default="N/A">
-     <section name="qmu" />
-     <help> user provided mesh partitioning, defaults to metis if not specified </help>
-  </parameter>
-  <parameter key ="numberofpartitions" type="double" default="0">
-     <section name="qmu" />
-     <help> number of partitions for semi-discrete qmu  </help>
-  </parameter>
-  <parameter key ="variabledescriptors" type="cell" default="(0x0)">
-     <section name="qmu" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="responsedescriptors" type="cell" default="(0x0)">
-     <section name="qmu" />
-     <help> use an enthalpy formulation to include temperate ice (default is 0) </help>
-  </parameter>
-  <parameter key ="method" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> array of dakota_method class </help>
-  </parameter>
-  <parameter key ="mass_flux_profile_directory" type="double" default="N/A">
-     <section name="qmu" />
-     <help> directory for mass flux profiles </help>
-  </parameter>
-  <parameter key ="mass_flux_profiles" type="double" default="N/A">
-     <section name="qmu" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="mass_flux_segments" type="cell" default="(0x0)">
-     <section name="qmu" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="adjacency" type="double" default="N/A">
-     <section name="qmu" />
-     <help> additional outputs requested </help>
-  </parameter>
-  <parameter key ="vertex_weight" type="double" default="N/A">
-     <section name="qmu" />
-     <help> weight applied to each mesh vertex </help>
-  </parameter>
-</frame>
-<!-- outputdefinition -->
-<frame key="1" label="outputdefinition">
-<section name="outputdefinition" />
-  <parameter key ="definitions" type="cell" default="(0x0)">
-     <section name="outputdefinition" />
-     <help> list of potential outputs that can be requested, but which need additional data to be defined </help>
-  </parameter>
-</frame>
-<!-- miscellaneous -->
-<frame key="1" label="miscellaneous parameters">
-<section name="miscellaneous" />
-  <parameter key ="notes" type="char" default="N/A">
-     <section name="miscellaneous" />
-     <help> notes in a cell of strings </help>
-  </parameter>
-  <parameter key ="name" type="char" default="N/A">
-     <section name="miscellaneous" />
-     <help> model name </help>
-  </parameter>
-  <parameter key ="dummy" type="struct" default="N/A">
-     <section name="miscellaneous" />
-     <help> empty field to store some data </help>
-  </parameter>
-</frame>
-
-
-</inishell_config>
\ No newline at end of file
Index: ../trunk-jpl/src/java/lib/miglayout-4.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/MANIFEST.MF
===================================================================
--- ../trunk-jpl/src/java/MANIFEST.MF	(revision 18297)
+++ ../trunk-jpl/src/java/MANIFEST.MF	(revision 18298)
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.8.4
-Created-By: 1.6.0_51-b11-457-11M4509 (Apple Inc.)
-Built-By: larour
-Built-On: 2014-04-14
-Built-At: 14:27:23
-Main-Class: main/GUIBuilder
-Specification-Title: INI file generator
-Specification-Version: 1.0.0-20140414
-Specification-Vendor: SLF, www.slf.ch
-Implementation-Title: INIshell ini creator
-Implementation-Version: 1.0.0
-Implementation-Vendor: SLF, www.slf.ch
-
Index: ../trunk-jpl/src/java/src/gui_elements/OptionPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/OptionPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/OptionPanel.java	(revision 18298)
@@ -1,144 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.LinkedList;
-import java.util.HashMap;
-import javax.swing.event.EventListenerList;
-
-import main.GUIBuilder;
-import main.XMLHelper;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * A ControlledPanel that maintains a group of choices and invokes panel
- * creation according to the current choices.
- *
- * @author korhammer et egger
- *
- */
-public abstract class OptionPanel extends ControlledPanel implements ItemListener {
-
-	private static final long serialVersionUID = 88L;
-
-	protected LinkedList<String> defaultTrues;
-	protected EventListenerList listenerList;
-
-	protected String[] values;
-	protected String[] labels;
-	protected String[] helptexts;
-
-	/**
-	 * The constructor for an OptionPanel.
-	 *
-	 * @param element
-	 *            : The xml element which the OptionPanel is created for.
-	 * @throws GUIBuildException
-	 */
-	public OptionPanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		this(element, parent, true);
-	}
-
-	public OptionPanel(Element element, ControlledPanel parent, boolean doLayout) throws GUIBuildException {
-		super(element, parent, doLayout);
-		
-		String elementdefault = "";
-
-		if (element.hasAttribute("default"))
-			elementdefault = element.getAttribute("default");
-
-		listenerList = new EventListenerList();
-
-		final Element[] options = XMLHelper.getElementArray(element, "option");
-		defaultTrues = new LinkedList<String>();
-
-		values = new String[options.length];
-		labels = new String[options.length];
-		helptexts = new String[options.length];
-
-		for (int i=0;i<options.length;i++) {
-			values[i] = options[i].getAttribute("value");
-			labels[i] = options[i].getAttribute("label");
-
-			if (labels[i] == "")
-				labels[i] = values[i];
-
-			if (elementdefault.equals(values[i]))
-				defaultTrues.add(values[i]);
-
-			if (options[i].hasAttribute("default") && options[i].getAttribute("default").equals("true"))
-				defaultTrues.add(values[i]);
-
-			helptexts[i] = XMLHelper.getChildElementContent(options[i],"help");
-		}
-	}
-
-	@Override
-	public void set(HashMap hm, String key, String value) {
-		//System.out.println("Trying to change OptionPanel");
-		//ControlledPanel child = add("TA2");
-		//child.set(element);
-	}
-
-
-	/**
-	 * Invokes the appropriate build or destruct methods when changes are made
-	 * to choices.
-	 *
-	 * @param arg0
-	 * @param selectedOption
-	 */
-	public void handleItemEvent(ItemEvent arg0, String selectedOption) {
-		handleItemEvent(arg0, selectedOption, false, null, null, null);
-	}
-
-	public void handleItemEvent(ItemEvent arg0, String selectedOption, boolean doSet, HashMap hm, String setKey, String setValue) {
-		Element optionElement = XMLHelper.getCertainChildElement(this.element, "option", "label", selectedOption);
-
-		if (optionElement == null)
-			optionElement = XMLHelper.getCertainChildElement(this.element, "option", "value", selectedOption);
-
-		//System.out.println("XML of handleItem("+arg0.getItemSelectable().getClass().toString()+"): " + XMLHelper.getString((Node)optionElement));//this.element));
-
-		if (arg0.getStateChange() == ItemEvent.SELECTED) {
-			try {
-				GUIBuilder.recursiveBuild(optionElement, this, doSet, hm, setKey, setValue);
-			} catch (final GUIBuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-
-		} else {
-			try {
-				GUIBuilder.recursiveDestruct(optionElement, this);
-			} catch (final GUIBuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-	}
-
-}
Index: ../trunk-jpl/src/java/src/gui_elements/TextfieldPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/TextfieldPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/TextfieldPanel.java	(revision 18298)
@@ -1,129 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import main.GUI;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.util.HashMap;
-
-import javax.swing.JTextField;
-import javax.swing.JOptionPane;
-
-import org.w3c.dom.Element;
-
-/**
- * A panel that contains a textfield.
- *
- * @author korhammer et egger
- *
- */
-public class TextfieldPanel extends ControlledPanel implements KeyListener {
-
-	private static final long serialVersionUID = 1L;
-	private String defaultText;
-
-	protected JTextField textfield;
-
-	/**
-	 * The constructor for a TextfieldPanel.
-	 *
-	 * @param element
-	 */
-	public TextfieldPanel(Element element, ControlledPanel parent) {
-		super(element, parent);
-		textfield = new JTextField(10);
-		textfield.setVisible(true);
-		this.add(textfield, "width 250:100:400, cell 1 0, growx, ay top, gaptop 3");
-		textfield.addKeyListener(this);
-
-		defaultText = "";
-		if (element.hasAttribute("default")) {
-			defaultText = element.getAttribute("default");
-		}
-		textfield.setText(defaultText);
-
-		if (!optional)
-			textfield.setBackground(GUI.WARNING_BACKGROUND_COLOR);
-
-		this.checkBgColor();
-		textfield.invalidate();
-	}
-
-
-
-	@Override
-	public void close() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void set(HashMap hm, String key, String value) {
-		//System.out.println("\tI'm changing the label of the TextField with key '" + this.getKey() + "'");
-		String val = (String)hm.get(hashKey);
-		if (val != null) textfield.setText(val);
-		this.checkBgColor();
-	}
-
-	@Override
-	public String getValue() {
-		String thetext = textfield.getText();
-
-		if (!isOptional() && thetext.equals("")) {
-			JOptionPane.showMessageDialog(null, "No value was entered for "
-									+ getKey() + " (section '" + getSection().toUpperCase() + "')"
-									+ ".\nA value is required. Your .ini-file is probably incorrect.",
-									"Problem when building .ini file",
-									JOptionPane.WARNING_MESSAGE);
-		}
-
-		if (thetext.equals(""))
-			return null;
-
-		return thetext;
-	}
-
-	/** Handle the key typed event from the text field. */
-	public void keyTyped(KeyEvent e) {}
-
-	/** Handle the key-pressed event from the text field. */
-	public void keyPressed(KeyEvent e) {}
-
-	/** Handle the key-released event from the text field. */
-	public void keyReleased(KeyEvent e) {
-		checkBgColor();
-	}
-
-	public void checkBgColor() {
-		String text = textfield.getText();
-		
-		if (!optional) {
-			if (text.length() > 0) {
-				textfield.setBackground(GUI.NORMAL_BACKGROUND_COLOR);
-			} else {
-				textfield.setBackground(GUI.WARNING_BACKGROUND_COLOR);
-			}
-			textfield.invalidate();
-		}
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/FramePanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/FramePanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/FramePanel.java	(revision 18298)
@@ -1,71 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import main.GUIBuilder;
-import main.XMLHelper;
-
-import java.util.HashMap;
-import javax.swing.JPanel;
-import javax.swing.border.*;
-import javax.swing.BorderFactory;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import net.miginfocom.swing.MigLayout;
-
-public class FramePanel extends ControlledPanel {
-
-	private static final long serialVersionUID = 1987664773406118295L;
-	protected String title = "";
-
-	/**
-	 *
-	 *
-	 * @param element
-	 * @throws GUIBuildException
-	 */
-	public FramePanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		super(element, parent, false);
-		this.setLayout(new MigLayout("wrap 8, top, ins n 5 n n", "[200!][100!][100!][100!][100!][100!][300:400:400]", ""));
-
-		if (parent == null)	hierarchy = 1;
-
-		title = element.getAttribute("label");
-
-		Border mytitledborder = BorderFactory.createTitledBorder(title);
-		//Border loweredetched = BorderFactory.createEtchedBorder(EtchedBorder.LOWERED);
-		this.setBorder(mytitledborder);
-
-		this.invalidate();
-	}
-
-	@Override
-	public String getValue() {
-		return null;
-	}
-	
-	@Override
-	public void close() {
-
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/PathPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/PathPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/PathPanel.java	(revision 18298)
@@ -1,118 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.HashMap;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-
-import org.w3c.dom.Element;
-
-public class PathPanel extends TextfieldPanel implements ActionListener {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1486664773406118295L;
-
-	JButton select_button;
-
-	/**
-	 * Creates a panel with a text field and a file / path chooser button.
-	 *
-	 * @param element
-	 * @throws GUIBuildException
-	 */
-	public PathPanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		super(element, parent);
-
-		if (element.getAttribute("type").equals("path")) {
-			select_button = new JButton("Select Path");
-		} else if (element.getAttribute("type").equals("file")) {
-			select_button = new JButton("Select File");
-		} else {
-			throw new GUIBuildException("PathPanel is not applicable for parameter types other than 'file' and 'path'.");
-		}
-
-		this.remove(textfield);
-		this.add(textfield, "cell 1 0, growx, span2");
-
-		select_button.addActionListener(this);
-		select_button.setActionCommand("open chooser");
-		select_button.setVisible(true);
-		this.add(select_button, "cell 3 0, growx, wrap");
-
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent event) {
-		if (event.getActionCommand().equals("open chooser") && event.getSource() == this.select_button) {
-			try {
-				chooseFile();
-			} catch (final GUIBuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	@Override
-	public void set(HashMap hm, String key, String value) {
-		String val = (String)hm.get(hashKey);
-		if (val != null) textfield.setText(val);
-		this.checkBgColor();
-	}
-
-	/**
-	 * Opens the file chooser dialog and writes the path / filepath into the
-	 * texfield.
-	 *
-	 * @throws GUIBuildException
-	 */
-	public void chooseFile() throws GUIBuildException {
-		final JFileChooser filechooser = new JFileChooser(System.getProperty("user.dir"));
-
-		if (element.getAttribute("type").equals("path")) {
-			filechooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-		} else if (element.getAttribute("type").equals("file")) {
-			filechooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
-		} else {
-			throw new GUIBuildException("PathPanel is not applicable for parameter types other than 'file' and 'path'.");
-		}
-
-		final int returnVal = filechooser.showOpenDialog(new JPanel());
-
-		if (returnVal == JFileChooser.APPROVE_OPTION) {
-			if (element.getAttribute("type").equals("path")) {
-				textfield.setText(filechooser.getSelectedFile().getAbsolutePath());
-			} else {
-				textfield.setText(filechooser.getSelectedFile().getName());
-			}
-
-			checkBgColor();
-		}
-	}
-
-}
Index: ../trunk-jpl/src/java/src/gui_elements/IntegerPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/IntegerPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/IntegerPanel.java	(revision 18298)
@@ -1,246 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.event.*;
-import java.util.HashMap;
-
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
-import javax.swing.SwingConstants;
-
-import org.w3c.dom.Element;
-
-/**
- * A panel that maintains a number in an editable textfield,
- * optionally with a maximum and minimum value.
- * @author korhammer
- *
- */
-/**
- * @author korhammer
- *
- */
-public class IntegerPanel extends TextfieldPanel implements ActionListener, FocusListener {
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = -8959578535487185306L;
-
-	private int defaultvalue;
-	private int maximumvalue;
-	private int minimumvalue;
-
-	private boolean printPlus;
-
-	private final JButton down;
-	private final JButton up;
-
-	/**
-	 * Constructor for a NumberPanel.
-	 *
-	 * @param element
-	 * @throws GUIBuildException
-	 */
-	public IntegerPanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		super(element, parent);
-
-		setDefaultvalue(0);
-		minimumvalue = Integer.MIN_VALUE;
-		maximumvalue = Integer.MAX_VALUE;
-		printPlus = false;
-
-		if (element.getAttribute("type").equals("integer+")) {
-			setPrintplus(true);
-		} else {
-			setPrintplus(false);
-		}
-
-		if (element.hasAttribute("default")) {
-			setDefaultvalue(element.getAttribute("default"));
-		}
-		if (element.hasAttribute("maximum")) {
-			setMaximumvalue(element.getAttribute("maximum"));
-		}
-		if (element.hasAttribute("minimum")) {
-			setMinimumvalue(element.getAttribute("minimum"));
-		}
-
-		textfield.setColumns(4);
-		textfield.invalidate();
-		textfield.setHorizontalAlignment(SwingConstants.RIGHT);
-
-		up = new JButton("+");
-		up.addActionListener(this);
-		down = new JButton("-");
-		down.addActionListener(this);
-		this.add(up, "split 2, growx, ay top");
-		this.add(down, "growx, ay top");
-		textfield.addActionListener(this);
-		textfield.addFocusListener(this);
-
-	}
-
-	/**
-	 * Parses a String to an integer. Different from the standard methods as it
-	 * handles the + sign e.g. in time zones.
-	 *
-	 * @param text
-	 * @return the parsed number
-	 * @throws NumberFormatException
-	 */
-	private static int parse(String text) throws NumberFormatException {
-
-		final char first = text.charAt(0);
-
-		if (first == '+')
-			return Integer.parseInt(text.substring(1));
-		if (first == '-')
-			return Integer.parseInt(text);
-		return Integer.parseInt(text);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
-	 */
-	@Override
-	public void actionPerformed(ActionEvent e) {
-		if (e.getSource() == up) {
-			manipulateNumber(1);
-		} else if (e.getSource() == down) {
-			manipulateNumber(-1);
-		} else if (e.getSource() == textfield) {
-			parseTextfield();
-		}
-	}
-
-	@Override
-	public void set(HashMap hm, String key, String value) {
-		String val = (String)hm.get(hashKey);
-		if (val != null) {
-			try {
-				Integer.parseInt(val);
-				textfield.setText(val);
-			} catch (Exception e) {} //Do nothing if conversion fails
-		}
-	}
-
-	@Override
-	public void focusGained(FocusEvent arg0) {
-
-	}
-
-	@Override
-	public void focusLost(FocusEvent arg0) {
-		parseTextfield();
-	}
-
-	/**
-	 * Manipulates the number in the text field by parsing it, adding the
-	 * increment and writing it back into the textfield.
-	 *
-	 * @param increment
-	 */
-	public void manipulateNumber(int increment) {
-		int number;
-
-		try {
-			number = parseTextfield();
-		} catch (final NumberFormatException nfe) {
-			return;
-		}
-
-		if (number + increment <= maximumvalue
-				&& number + increment >= minimumvalue) {
-			number += increment;
-		} else if (number + increment < minimumvalue) {
-			number = minimumvalue;
-		} else if (number + increment > maximumvalue) {
-			number = maximumvalue;
-		}
-
-		printToTextfield(number);
-	}
-
-	/**
-	 * Calls the parse method on the textfield.
-	 *
-	 * @return
-	 * @throws NumberFormatException
-	 */
-	public int parseTextfield() throws NumberFormatException {
-		try {
-			return parse(textfield.getText());
-		} catch (final NumberFormatException nfe) {
-			JOptionPane.showMessageDialog(null, "The textfield " + getKey()
-					+ " does not contain a number.");
-			throw nfe;
-		}
-	}
-
-	/**
-	 * Prints a number to the text field optionally with a plus sign.
-	 *
-	 * @param number
-	 */
-	public void printToTextfield(int number) {
-		if (this.printPlus && number > 0) {
-			textfield.setText("+" + number);
-		} else {
-			textfield.setText("" + number);
-		}
-		checkBgColor();
-	}
-
-	public void setDefaultvalue(int defaultvalue) {
-		this.defaultvalue = defaultvalue;
-		this.printToTextfield(defaultvalue);
-	}
-
-	public void setDefaultvalue(String defaultvalue) {
-		this.defaultvalue = parse(defaultvalue);
-		this.printToTextfield(this.defaultvalue);
-	}
-
-	public void setMaximumvalue(int maximumvalue) {
-		this.maximumvalue = maximumvalue;
-	}
-
-	public void setMaximumvalue(String maximumvalue) {
-		this.maximumvalue = parse(maximumvalue);
-	}
-
-	public void setMinimumvalue(int minimumvalue) {
-		this.minimumvalue = minimumvalue;
-	}
-
-	public void setMinimumvalue(String minimumvalue) {
-		this.minimumvalue = parse(minimumvalue);
-	}
-
-	public void setPrintplus(boolean printPlus) {
-		this.printPlus = printPlus;
-		printToTextfield(parse(textfield.getText()));
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/AlternativePanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/AlternativePanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/AlternativePanel.java	(revision 18298)
@@ -1,177 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.event.ItemEvent;
-
-import javax.swing.JComboBox;
-import javax.swing.JOptionPane;
-import java.util.HashMap;
-import javax.swing.*;
-import java.awt.*;
-
-import main.GUI;
-
-import org.w3c.dom.Element;
-
-/**
- * The AlternativePanel contains a dropdown list with alternatives to choose from.
- *
- * @author Thomas Egger
- *
- */
-public class AlternativePanel extends OptionPanel {
-
-	private static final long serialVersionUID = 4468480774697888798L;
-	private final JComboBox box;
-
-	private String setKey = null, setValue = null;
-	private boolean doSet = false;
-	private HashMap setMap;
-
-	/**
-	 * Constructor for the AlternativePanel
-	 *
-	 * @param element the <parameter ...> element for which the panel is created.
-	 * @throws GUIBuildException
-	 */
-	public AlternativePanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		super(element, parent);
-
-		box = new JComboBox(labels);
-		box.insertItemAt("", 0);     //Add an empty label
-		box.setVisible(true);
-		box.setSelectedIndex(0);
-		box.addItemListener(this);
-
-		//Issue 263: On OSX the box.setBackground method does not function without this tweak:
-		if (System.getProperty("os.name").equals("Mac OS X")) 
-		    box.setRenderer(new ColorCellRenderer(box.getPreferredSize().width));
-
-		if (!optional) box.setBackground(GUI.WARNING_BACKGROUND_COLOR);
-
-		if (defaultTrues.size() > 1) {
-			throw new GUIBuildException("Element " + getHashKey() + " has multiple default values");
-		} else if (defaultTrues.size() == 1) {
-			box.setSelectedItem(defaultTrues.getFirst());
-		}
-
-		this.add(box, "cell 1 0, growx, ay top, wrap");
-	}
-
-	@Override
-	public void close() {
-		this.box.setSelectedIndex(0);
-	}
-
-	@Override
-	public String getValue() {
-
-		if (box.getSelectedIndex() != 0) {
-			//String selectedString = (String) box.getSelectedItem();
-			int index = box.getSelectedIndex() - 1;
-			if (index < 0)
-				return "";
-
-			return values[index];
-		}
-
-		if (!isOptional()) {
-			JOptionPane.showMessageDialog(null, "No option was selected for "
-									+ getKey() + " (section '" + getSection().toUpperCase() + "')"
-									+ ".\nA value is required. Your .ini-file is probably incorrect.",
-									"Problem when building .ini file",
-									JOptionPane.WARNING_MESSAGE);
-		}
-
-		return null;
-	}
-
-	@Override
-	public synchronized void set(HashMap hm, String key, String value) {
-		doSet = true;
-		setKey = key;
-		setValue = value;
-		setMap = hm;
-
-		if (!hm.containsKey(hashKey)) return;
-		String val = ((String)hm.get(hashKey)).toUpperCase();
-
-		//System.out.println("\tAP: Setting AlternativePanel: " + hashKey + " = " + val);
-
-		for (int ii=0; ii<values.length; ii++) { //loop through all existant items
-			if (val.equals(values[ii].toUpperCase())) { //compare to val
-				this.box.setSelectedIndex(ii+1);
-				break;
-			}
-		}
-	}
-
-	@Override
-	public synchronized void itemStateChanged(ItemEvent arg0) {
-		//Deal with help text
-		help.setText("");
-
-		if ((box.getSelectedIndex() > 0) && (helptexts[box.getSelectedIndex()-1] != null)) {
-			help.setText("<html>" + helptexts[box.getSelectedIndex()-1] + "</html>");
-		} else {
-			if (helptext != null) 
-				help.setText("<html>" + helptext + "</html>");
-		}
-
-		//handle selected Item
-		final String selectedOption = (String) arg0.getItem();
-		if (selectedOption == "") {
-			if (!optional) {
-				box.setBackground(GUI.WARNING_BACKGROUND_COLOR);
-			}
-		} else {
-			if (!optional) {
-				box.setBackground(GUI.NORMAL_BACKGROUND_COLOR);
-			}
-			//System.out.println("\tDOSET of AlternativePanel: " + doSet);
-			super.handleItemEvent(arg0, selectedOption, doSet, setMap, setKey, setValue);
-			doSet = false;
-			setKey = null;
-			setMap = null;
-			setValue = null;
-		}
-	}
-}
-
-class ColorCellRenderer implements ListCellRenderer {
-	protected DefaultListCellRenderer defaultRenderer = new DefaultListCellRenderer();
-	private Dimension preferredSize = new Dimension(0, 18);
-
-	public ColorCellRenderer(int width) {
-		width -= 50;
-
-		if (width < 100) width = 100; //Default size on OSX
-	
-		preferredSize = new Dimension(width, 18);
-	}
-
-	public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-		JLabel renderer = (JLabel) defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-		renderer.setPreferredSize(preferredSize);
-		return renderer;
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/DecimalPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/DecimalPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/DecimalPanel.java	(revision 18298)
@@ -1,133 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.util.HashMap;
-
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.DecimalFormatSymbols;
-import javax.swing.JFormattedTextField;
-
-import org.w3c.dom.Element;
-
-public class DecimalPanel extends TextfieldPanel implements ActionListener, FocusListener{
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1555742510677354674L;
-	double defaultvalue;
-	double maximumvalue;
-	double minimumvalue;
-
-	JFormattedTextField textfield;
-
-	public DecimalPanel(Element element, ControlledPanel parent) {
-		super(element, parent);
-		this.remove(super.textfield);
-
-		DecimalFormat format = (DecimalFormat)DecimalFormat.getInstance();
-		DecimalFormatSymbols custom = new DecimalFormatSymbols();
-		custom.setDecimalSeparator('.');
-		format.setDecimalFormatSymbols(custom);
-		format.setGroupingUsed(false);
-
-		textfield = new JFormattedTextField(format);
-		textfield.addActionListener(this);
-		textfield.addFocusListener(this);
-		this.add(textfield,"cell 1 0, growx, ay top, gaptop 3");
-		textfield.setVisible(true);
-		this.invalidate();
-		defaultvalue = 0.0;
-		maximumvalue = Double.MAX_VALUE;
-		minimumvalue = Double.MIN_VALUE;
-
-
-		if(element.hasAttribute("minimum")){
-			minimumvalue = Double.parseDouble(element.getAttribute("minimum"));
-		}
-		if(element.hasAttribute("maximum")){
-			maximumvalue = Double.parseDouble(element.getAttribute("maximum"));
-		}
-		if(element.hasAttribute("default")){
-			defaultvalue = Double.parseDouble(element.getAttribute("default"));
-		}
-		setToDefaultValue();
-	}
-
-	private void setToDefaultValue() {
-		textfield.setValue(new Double(defaultvalue));
-		this.invalidate();
-	}
-
-	private void checkValue(){
-		try {
-			textfield.commitEdit();
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		double currentvalue = ((Number)textfield.getValue()).doubleValue();
-		if(currentvalue > maximumvalue){
-			textfield.setValue(new Double(maximumvalue));
-		}
-		else if(currentvalue<minimumvalue){
-			textfield.setValue(new Double(minimumvalue));
-		}
-	}
-
-	public String getValue(){
-		return textfield.getValue().toString();
-	}
-
-	@Override
-	public void set(HashMap hm, String key, String value) {
-		String val = (String)hm.get(hashKey);
-		if (val != null) {
-			try {
-				Double.parseDouble(val);
-				textfield.setText(val);
-			} catch (Exception e) {} //Do nothing if conversion fails
-		}
-	}
-
-	@Override
-	public void focusGained(FocusEvent arg0) {
-		checkValue();
-
-	}
-
-	@Override
-	public void focusLost(FocusEvent arg0) {
-		checkValue();
-
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent arg0) {
-		checkValue();
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/CombinedPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/CombinedPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/CombinedPanel.java	(revision 18298)
@@ -1,267 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.event.ItemEvent;
-import java.text.NumberFormat;
-import java.util.*;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JFormattedTextField;
-import javax.swing.JTextField;
-import javax.swing.JLabel;
-import javax.swing.JComboBox;
-
-import main.XMLHelper;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import net.miginfocom.swing.MigLayout;
-
-/**
- * @brief The CombinedPanel may contain other panels, such as check and drop down boxes and text fields
- *
- * @author Thomas Egger
- */
-public class CombinedPanel extends OptionPanel {
-	enum Type { CHOICE, INTEGER, DECIMAL, STRING, DROPDOWN }
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = -6751282938445852408L;;
-
-	private final LinkedList<JComponent> valueComponents;
-
-	/**
-	 * Constructor for a panel that can hold text, numbers and check boxes. It
-	 * corresponds to the parameter type "combination" in the configuration file
-	 * and its subcomponents correspond to the option values.
-	 *
-	 * @param element
-	 * @throws GUIBuildException
-	 */
-	public CombinedPanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		super(element, parent, false); //doing layout by itself
-
-		//System.out.println("Hierarchy: Parent: " + parent.getKey() + ": "+ parent.getHierarchy() + "  own: " + getHierarchy());
-
-		int column1 = 200;
-		column1 -= getHierarchy() * 5;
-		this.setLayout(new MigLayout("gapx 6, wrap 8, ins n 5 n n", "["+column1+"!][78!][78!][78!][78!][78!][78!][20!][200:400:400]", ""));
-
-		this.add(jlabel, "gapleft " + getHierarchy() * 5);
-		this.add(help, "cell 8 0, wrap");
-
-		valueComponents = new LinkedList<JComponent>();
-
-		final Element[] optionElements = XMLHelper.getElementArray(element, "option");
-
-		byte lblcounter = 0;
-
-		DecimalFormat format = (DecimalFormat)DecimalFormat.getInstance();
-		DecimalFormatSymbols custom = new DecimalFormatSymbols();
-		custom.setDecimalSeparator('.');
-		format.setDecimalFormatSymbols(custom);
-		format.setGroupingUsed(false);
-
-		DecimalFormat integerFormat = (DecimalFormat)DecimalFormat.getIntegerInstance();
-		integerFormat.setGroupingUsed(false);
-
-		int row = 0;
-		int column = 1;
-		
-		for (int i=0;i<optionElements.length;i++) {
-			final Type optionType = Type.valueOf(optionElements[i].getAttribute("type").toUpperCase());
-			final String initialValue = optionElements[i].getAttribute("value");
-			final String label = optionElements[i].getAttribute("label");
-
-			JComponent component = null;
-			JLabel lblcomponent  = null;
-
-			NodeList nodelist = optionElements[i].getChildNodes();
-
-			switch (optionType) {
-			case INTEGER:
-				component = new JFormattedTextField(integerFormat);
-				((JFormattedTextField)component).setColumns(8);
-				if ((initialValue != null) && (!initialValue.equals("")))
-					((JFormattedTextField)component).setValue(new Integer(initialValue));
-				break;
-			case DECIMAL:
-				component = new JFormattedTextField(format);
-				((JFormattedTextField)component).setColumns(8);
-				if ((initialValue != null) && (!initialValue.equals("")))
-					((JFormattedTextField)component).setValue((new Double(initialValue)));
-				break;
-			case STRING:
-				component = new JTextField(10);
-				((JTextField)component).setText(initialValue);
-				break;
-			case CHOICE:
-				component = new JCheckBox(optionElements[i].getAttribute("value"));
-				((JCheckBox)component).addItemListener(this);
-				break;
-			case DROPDOWN:
-				component = new JComboBox();
-
-				for (int jj = 0; jj < nodelist.getLength(); jj++) {
-					if (nodelist.item(jj).getNodeType() == Node.ELEMENT_NODE) {
-						((JComboBox)component).addItem(((Element)nodelist.item(jj)).getAttribute("value"));
-					}
-				}
-
-				((JComboBox)component).setSelectedItem(optionElements[i].getAttribute("value"));
-				((JComboBox)component).addItemListener(this);
-				break;
-			}
-			
-			int width = 1;
-
-			if ((label != null) && (!label.equals(""))){
-				if (label.length() > 12) width = 2; //for oversize labels
-
-				if (column+width >= 7) { 
-					column = 1; 
-					row++; 
-				}
-				lblcomponent = new JLabel(label);
-				valueComponents.add(lblcomponent);
-				
-				//System.out.println("component: " + component.getClass() + ");
-				//System.out.println("component: " + lblcomponent.getClass() + "  size: " + lblcomponent.getWidth() + "  col: " + column + " row: " + row);
-				this.add(lblcomponent, "cell " + column + " " + row + " " + width + " 1");
-				column += width;
-				width = 1;
-				lblcomponent.setVisible(true);
-			}
-
-			if (column >= 7) { 
-				column = 1; 
-				row++; 
-			}
-			//System.out.println("component: " + component.getClass() + "  size: " + component.getWidth() + "  col: " + column + " row: " + row);
-			this.add(component, "cell " + column + " " + row + " " + width + " 1");
-			column++;
-
-			valueComponents.add(component);
-			component.setVisible(true);
-		}
-		
-		//System.out.println("\t-->Instantiated one Combined Panel with " + optionElements.length + " components");
-	}
-
-	@Override
-	public void close() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void set(HashMap hm, String inkey, String invalue) {
-		if (!hm.containsKey(hashKey)) return;
-		String val = (String)hm.get(hashKey);
-
-		//System.out.println("\tSetting CombinedPanel: " + hashKey + " = " + val);
-		//System.out.println("\tThis CombinedPanel has the key: " + this.getKey() + "  should be: " + inkey + " val: " + invalue);
-
-		//Now loop through valueComponents and see if the value string can be matched
-		if (val == null) return;
-
-		String[] tokens = val.split("\\s+");
-		int counter = 0;
-
-		//System.out.println("\t\tLooking at VAL param: " + val);
-		for (final JComponent comp : valueComponents) {
-			boolean digested = false;
-			if (tokens.length <= counter) break;
-			//System.out.println("\t\tLooking at USER param: " + tokens[counter]);
-
-			if (comp.getClass() == JCheckBox.class) {
-				String cbString = ((JCheckBox) comp).getText();
-				if (tokens[counter].equals(cbString)) {
-					((JCheckBox) comp).setSelected(true);
-					digested = true;
-				}
-			} else if (comp.getClass() == JComboBox.class) {
-				JComboBox box = (JComboBox) comp;
-
-				for (int ii=0; ii<box.getItemCount(); ii++) {
-					String itemString = (String) box.getItemAt(ii);
-					if (itemString.equals(tokens[counter])) {
-						box.setSelectedIndex(ii);
-						digested = true;
-					}
-				}
-			} else if (comp.getClass() == JTextField.class) {
-				((JTextField) comp).setText(tokens[counter]);
-				digested = true;
-			} else if (comp.getClass() == JFormattedTextField.class) {
-				((JFormattedTextField) comp).setText(tokens[counter]);
-				digested = true;
-			}
-
-			if ((comp.getClass() != JLabel.class) && (digested))
-				counter++;
-		}
-	}
-
-	@Override
-	public String getValue() {
-		String value = "";
-
-		for (final JComponent comp : valueComponents) {
-			if (comp.getClass() == JTextField.class) {
-				value += ((JTextField) comp).getText();
-			} else if (comp.getClass() == JFormattedTextField.class) {
-				value += ((JFormattedTextField) comp).getText();
-			} else if (comp.getClass() == JCheckBox.class) {
-				if (((JCheckBox) comp).isSelected())
-					value += ((JCheckBox) comp).getText();
-			} else if (comp.getClass() == JComboBox.class) {
-				value += ((String)((JComboBox)comp).getSelectedItem());
-			}
-
-			if (value.length() > 0)
-				value += " ";
-		}
-
-		if (value.equals("")) return null;
-		else	return value;
-	}
-
-	@Override
-	public void itemStateChanged(ItemEvent arg0) {
-		String selectedOption = null;
-
-		if (arg0.getItemSelectable().getClass() == JCheckBox.class) {
-			selectedOption = ((JCheckBox) arg0.getItemSelectable()).getText();
-			super.handleItemEvent(arg0, selectedOption);
-		} else if (arg0.getItemSelectable().getClass() == JComboBox.class) {
-			selectedOption = ((String)((JComboBox)arg0.getItemSelectable()).getSelectedItem());
-			//HACK: should call super...
-		}
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/SelectorPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/SelectorPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/SelectorPanel.java	(revision 18298)
@@ -1,233 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
- *
- *   INIshell is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   INIshell is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package gui_elements;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
-
-
-import main.GUIBuilder;
-import main.XMLHelper;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * This class introduces more flexibility into the inishell interface:
- * The SelectorPanel offers the user to add a specific parameter to
- * the interface.
- *
- * @author Thomas Egger
- */
-public class SelectorPanel extends ControlledPanel implements ActionListener {
-
-	private static final long serialVersionUID = 8610877538909126920L;
-
-	String[] parameters;
-
-	JButton addButton;
-	JButton removeButton;
-	Element template;
-	String  templateKey;
-	HashMap<String, ControlledPanel> mapOfParameters;
-	ControlledPanel cp = null;
-
-	public SelectorPanel(Element element, ControlledPanel parent) {
-		super(element, parent);
-		templateKey = ""; //will store the pattern of the key
-
-		addButton = new JButton("+");
-		this.add(addButton, "cell 1 0, split 2, grow");
-		addButton.addActionListener(this);
-
-		removeButton = new JButton("-");
-		this.add(removeButton, "cell 1 0, grow, wrap");
-		removeButton.addActionListener(this);
-
-		//The following lines try to extract the template key (e.g. %::filters#, %::resample, COPY::%)
-		final NodeList nodelist = element.getChildNodes();
-		for (int ii = 0; ii < nodelist.getLength(); ii++) {
-			if (nodelist.item(ii).getNodeType() == Node.ELEMENT_NODE) {
-				Element currentElement = (Element)nodelist.item(ii);
-				if (currentElement.getAttribute("template").equals("true")){
-					template = (Element)currentElement.cloneNode(true);
-					templateKey = template.getAttribute("key");
-					template.setAttribute("template", "false");
-				}
-			}
-		}
-
-		final Element[] options = XMLHelper.getElementArray(element, "option");
-		parameters = new String[options.length + 1];
-		for (int ii=0; ii < options.length; ii++) {
-			parameters[ii] = options[ii].getAttribute("value");
-		}
-		parameters[options.length] = "Other...";
-
-		key = templateKey; //IMPORTANT: this changes the key only, not the label!
-		hashKey = this.getSection().toUpperCase() + "::" + this.getKey().toUpperCase();
-		mapOfParameters  = new HashMap<String, ControlledPanel>();
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent arg0) {
-		if (arg0.getSource() == addButton) {
-			add();
-		} else if (arg0.getSource() == removeButton) {
-			remove();
-		}
-	}
-
-	@Override
-	public void set(HashMap hm, String key, String value) {
-		//HACK
-		//System.out.println("\tKEY: " + key + "  VAL: " + value);
-
-		String myKey = this.section.toUpperCase() + "::" + templateKey.toUpperCase().replace("%","([a-zA-Z0-9_]+)");
-		myKey = myKey.replace("#","[1-9]+[0-9]*"); //all integer numbers from 1 to infinity
-		//System.out.println("PATTERN: " + myKey);
-		String myKey2 = key.replaceAll(myKey, "$1");
-		String myKey3 = key.replaceAll(myKey, "$0");
-
-		//System.out.println("HUHUI: " + templateKey + " --- " + myKey2 + " -- " + myKey3);
-
-		boolean toAdd = true;
-		if (mapOfParameters.get(myKey2) != null) toAdd = false; //Parameter already exists
-
-		if (toAdd) {
-			ControlledPanel child = add(myKey2, true, hm, key, value);
-			cp = child;
-			if (child != null) child.set(hm, key, value);
-		} else {
-			if (cp != null) cp.set(hm, key, value);
-		}
-	}
-
-	public void add() {
-		String param = "";
-		String choice = "Other...";
-
-		if (parameters.length > 1)
-			choice = (String)JOptionPane.showInputDialog(this, "Add a parameter", "Add", JOptionPane.QUESTION_MESSAGE, null, parameters, null);
-
-		if (choice == null) return;
-
-		if (choice.equals("Other...")) {
-			param = JOptionPane.showInputDialog(this, "Enter the name of a meteo parameter\n(e.g. VW_AVG, P2");
-		} else {
-			param = choice;
-		}
-
-		add(param, false, null, null, null);
-	}
-
-	public ControlledPanel add(String param, boolean doSet, HashMap hm, String key, String value) {
-		//System.out.println("Trying to add SelectorPanel: " + key + " ... " + value);
-
-		if ((param == null) || (param.length() == 0)) return null;
-		param = param.toUpperCase();
-
-		if (mapOfParameters.get(param) != null) return null; //Parameter already exists
-
-		Element child = (Element)template.cloneNode(true);
-		recursiveKeyReplace(child, param);
-		element.appendChild(child);
-
-		ControlledPanel childPanel = null;
-		try {
-			childPanel = ControlledPanel.createSingleParameterPanel(child, this);
-			childPanel.setKey(childPanel.getKey());
-			GUIBuilder.gui.addToTab(childPanel, section, this);
-			childPanel.hold();
-			GUIBuilder.control(childPanel);
-			GUIBuilder.recursiveBuild(child, this, doSet, hm, key, value);
-
-			mapOfParameters.put(param, childPanel);
-		} catch (final GUIBuildException e1) {
-			e1.printStackTrace();
-		}
-
-		this.invalidate();
-
-		return childPanel;
-	}
-
-	@Override
-	public void close() {
-
-	}
-
-	@Override
-	public String getValue() {
-		return null;
-	}
-
-	public void remove() {
-		if (mapOfParameters.size() == 0) return;
-
-		String choice = (String)JOptionPane.showInputDialog(this, "Remove a parameter", "Remove", JOptionPane.QUESTION_MESSAGE, null, mapOfParameters.keySet().toArray(), null);
-
-		if (choice == null) return; //nothing to do
-
-		String childKey = templateKey.replaceAll("%", choice);
-		final Element child = XMLHelper.getCertainChildElement(element, "parameter", "key", childKey);
-
-		if (child == null) return;
-
-		try { //this makes sure that all child nodes are destroyed
-			GUIBuilder.recursiveDestruct(child, this);
-			element.removeChild(child);
-			final ControlledPanel childPanel = GUIBuilder.panelControl.get(section, childKey);
-
-			childPanel.release();
-			childPanel.close();
-
-			if (!childPanel.isNeeded())
-				GUIBuilder.gui.removeFromTab(childPanel, section, this);
-
-			mapOfParameters.remove(choice);
-		} catch (final GUIBuildException e) {
-			e.printStackTrace();
-		}
-
-		this.invalidate();
-	}
-
-	private void recursiveKeyReplace(Element element, String string) {
-		if (element.hasAttribute("key"))
-			element.setAttribute("key", element.getAttribute("key").replaceAll("%", string));
-
-		final NodeList nodelist = element.getChildNodes();
-		for (int i = 0; i < nodelist.getLength(); i++) {
-			if (nodelist.item(i).getNodeType() == Node.ELEMENT_NODE) {
-				recursiveKeyReplace(((Element) nodelist.item(i)), string);
-			}
-		}
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/GUIBuildException.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/GUIBuildException.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/GUIBuildException.java	(revision 18298)
@@ -1,33 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-public class GUIBuildException extends Exception {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public GUIBuildException(String message) {
-		super(message);
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/ControlledPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/ControlledPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/ControlledPanel.java	(revision 18298)
@@ -1,285 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-
-import javax.swing.JEditorPane;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.*;
-import java.util.HashMap;
-import javax.swing.border.*;
-
-import main.GUI;
-import main.GUIBuilder;
-import main.XMLHelper;
-import net.miginfocom.swing.MigLayout;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Abstract class for JPanels that are maintained with their key and designated
- * section and can return their current value.
- */
-public abstract class ControlledPanel extends JPanel {
-
-	private static final long serialVersionUID = 1L;
-
-	private int dependencies;
-
-	protected JLabel jlabel;
-
-	protected String section;
-	protected String key;
-	protected String label;
-	protected String hashKey;
-
-	protected Element element;
-
-	protected boolean optional;
-	protected String replace;
-
-	protected int hierarchy;
-	protected String helptext;
-	protected JEditorPane help;
-
-	/**
-	 * Constructor for a controlled panel.
-	 *
-	 * @param element
-	 */
-	public ControlledPanel(Element element, ControlledPanel parent) {
-		this(element, parent, true);
-	}
-
-	public ControlledPanel(Element element, ControlledPanel parent, boolean doLayout) {
-		super();
-		initialize(element, parent);
-
-		if (doLayout) {
-			int column1 = 200;
-			column1 -= getHierarchy() * 5; //Indentation for the label, 5px per hierarchy level
-
-			setLayout(new MigLayout("gapx 6, wrap 8, top, ins n 5 n n", "["+ column1 + "!][100!][100!][100!][100!][100!][300:400:400]", ""));
-			add(jlabel, "growx, ay top, gaptop 5, gapleft " + getHierarchy() * 5);
-			add(help, "cell 6 0, wrap");
-		}
-	}
-
-	private void initialize(Element element, ControlledPanel parent) {
-		dependencies = 0;
-
-		this.element = element;
-		this.key = element.getAttribute("key");
-		this.label = this.key;
-
-		this.section = element.getAttribute("section");
-		this.hashKey = this.section.toUpperCase() + "::" + this.key.toUpperCase();
-		this.optional = element.getAttribute("optional").equals("true");
-
-		jlabel = new JLabel(this.label + ":      ");
-		jlabel.setForeground(GUI.LABEL_COLOR);
-
-		this.setBackground(Color.white);
-		this.setVisible(true);
-
-		/* Add help to the right side of the panel. */
-		helptext = XMLHelper.getChildElementContent(element, "help");
-		help = ControlledPanel.createHelpPane("<html>"+helptext+"</html>");
-		if (helptext != null) help.setText(helptext);		
-
-		if (parent != null) {
-			setHierarchy(parent.getHierarchy() + 1);
-		} else {
-			setHierarchy(0);
-		}
-	}
-
-	/**
-	 * Creates a ControlledPanel for a parameter that matches its type. (i.e.
-	 * radio buttons for an option parameter, ...
-	 *
-	 * @param element
-	 * @return the Controlled Panel
-	 * @throws GUIBuildException
-	 */
-	public static ControlledPanel createSingleParameterPanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		ControlledPanel panel;
-
-		//System.out.println("IN create: " + XMLHelper.getString((Node)element));
-
-		if (element.hasAttribute("counter")) {
-			panel = new DuplicatorPanel(element, parent);
-		} else if (element.getTagName().equals("frame")) {
-			panel = new FramePanel(element, parent);
-		} else if (element.getAttribute("type").equals("path")	|| element.getAttribute("type").equals("file")) {
-			panel = new PathPanel(element, parent);
-		} else if (element.getAttribute("type").equals("alternative") || element.getAttribute("type").equals("logical")) {
-			panel = new AlternativePanel(element, parent);
-		} else if (element.getAttribute("type").equals("choice")) {
-			panel = new CheckBoxPanel(element, parent);
-		} else if (element.getAttribute("type").equals("integer") || element.getAttribute("type").equals("integer+")){
-			panel = new IntegerPanel(element, parent);
-		} else if (element.getAttribute("type").equals("decimal")) {
-			panel = new DecimalPanel(element, parent);
-		} else if (element.getAttribute("type").equals("double")) {
-			panel = new TextfieldPanel(element, parent);
-		} else if (element.getAttribute("type").equals("string") || element.getAttribute("type").equals("char") || element.getAttribute("type").equals("cell")){
-			panel = new TextfieldPanel(element, parent);
-		} else if (element.getAttribute("type").equals("combination")) {
-			panel = new CombinedPanel(element, parent);
-		} else if (element.getAttribute("type").equals("selector")) {
-			panel = new SelectorPanel(element, parent);
-		} else {
-			throw new GUIBuildException("Cannot create a GUI panel for a parameter of type " + element.getAttribute("type"));
-		}
-
-		return panel;
-	}
-
-	public static JEditorPane createHelpPane(String helptext){
-		JEditorPane help = new JEditorPane();
-		help.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
-		help.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 12));
-		help.setEditable(false);
-		help.setContentType("text/html");
-		help.setForeground(Color.GRAY);
-		help.addHyperlinkListener(GUIBuilder.gui);
-
-		if (helptext!=null) {
-			help.setText("<html>"+helptext+"</html>");
-		} else {
-			help.setText("<html></html>");
-		}
-
-		return help;
-	}
-
-	public void setHierarchy(int val) {
-		hierarchy = val;		
-	}
-
-	public int getHierarchy() {
-		return hierarchy;
-	}
-
-	/**
-	 * This method should be called when the panel is removed.
-	 */
-	public abstract void close();
-
-	/**
-	 * @return the GUI component.
-	 */
-	public Component getComponent() {
-		return this;
-	}
-
-	/**
-	 * @return the number of dependencies on the panel.
-	 */
-	public int getDependencies() {
-		return dependencies;
-	}
-
-	/**
-	 * @return the key of the corresponding key / value set
-	 */
-	public String getKey() {
-		return key;
-	}
-
-	/**
-	 * @return the current value of the key / value set null if the key value
-	 *         set should not be printed
-	 */
-	public abstract String getValue();
-
-	/**
-	 * This method should be called when another panel depends needs this panel
-	 * to exist.
-	 */
-	public synchronized void hold() {
-		this.dependencies++;
-	}
-
-	/**
-	 * @return true if dependencies on this panel exist
-	 * @throws GUIBuildException
-	 */
-	public synchronized boolean isNeeded() throws GUIBuildException {
-		if (dependencies == 0) {
-			return false;
-		} else if (dependencies > 0) {
-			return true;
-		} else {
-			throw new GUIBuildException("Inplausible number of dependencies on panel");
-		}
-	}
-
-	/**
-	 * @return true if a value for the underlying parameter is optional
-	 */
-	public boolean isOptional() {
-		return optional;
-	}
-
-	/**
-	 * This method should be called when a panel no longer needs this panel to
-	 * exist. The panel will be removed if no dependency exists.
-	 */
-	public synchronized void release() {
-		this.dependencies--;
-	}
-
-	public void set(HashMap hm, String key, String value) {
-		System.out.println("Set not implemented for ControlledPanel: " + serialVersionUID);
-	}
-
-	public String getHashKey() {
-		return hashKey;
-	}
-
-	/**
-	 * This method sets a new key for a panel and changes its label.
-	 *
-	 * @param key
-	 *            the new key
-	 */
-	public void setKey(String key) {
-		this.key = key;
-		element.setAttribute("key", key);
-		jlabel.setText(this.label + ":      ");
-	}
-
-	/**
-	 * Getter method for the section.
-	 * @return the section
-	 */
-	public String getSection() {
-		return section;
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/CheckBoxPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/CheckBoxPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/CheckBoxPanel.java	(revision 18298)
@@ -1,139 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import main.*;
-
-import java.awt.Color;
-import java.awt.event.ItemEvent;
-import java.util.HashMap;
-
-import javax.swing.JCheckBox;
-import javax.swing.JOptionPane;
-import javax.swing.JLabel;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class CheckBoxPanel extends OptionPanel {
-
-	private static final long serialVersionUID = 552186457208697362L;
-	private final JCheckBox[] boxes;
-	String concat;
-	private String setKey = null, setValue = null;
-	private boolean doSet = false;
-	private HashMap setMap;
-
-
-	/**
-	 * Constructor for a panel that can hold a number of checkboxes to compose
-	 * the value for a key/value set.
-	 *
-	 * @param element
-	 * @throws GUIBuildException
-	 */
-	public CheckBoxPanel(Element element, ControlledPanel parent) throws GUIBuildException {
-		super(element, parent);
-
-		concat = "";
-		boxes = new JCheckBox[values.length];
-		for (int i = 0; i < values.length; i++) {
-			boxes[i] = new JCheckBox(values[i]);
-
-			this.add(boxes[i], "cell 1 " + i + ", wrap, ay top");
-
-			String extra = "";
-			if (i > 0)
-				extra = ", gapleft 12";
-
-			this.add(ControlledPanel.createHelpPane(this.helptexts[i]), "cell 6 "+ i +", width 200:400:400, wrap" + extra);
-
-			boxes[i].setBackground(Color.white);
-			boxes[i].setVisible(true);
-			boxes[i].addItemListener(this);
-			if (defaultTrues.contains(values[i])) {
-				boxes[i].setSelected(true);
-				concat += values[i] + " ";
-			}
-		}
-	}
-
-	@Override
-	public void close() {
-		for (final JCheckBox box : boxes)
-			box.setSelected(false);
-	}
-
-	@Override
-	public String getValue() {
-		if (!isOptional() && concat.equals("")) {
-			JOptionPane.showMessageDialog(null, "No option was selected for "
-									+ getKey() + " (section '" + getSection().toUpperCase() + "')"
-									+ ".\nA value is required. Your .ini-file is probably incorrect.",
-									"Problem when building .ini file",
-									JOptionPane.WARNING_MESSAGE);
-		}
-
-		if (concat.equals("")) return null;
-		else	return concat.trim();
-	}
-
-	public synchronized void set(HashMap hm, String key, String value) {
-		String val = ((String)hm.get(hashKey)).toUpperCase();
-		//System.out.println("\tABOUT TO CHANGE CHECKBOXPANEL KEY: " + key + "  VAL: " + val);
-
-		String[] tokens = val.split("\\s+");
-		for (final JCheckBox box : boxes) {
-			box.setSelected(false);
-			
-			for (final String token : tokens) {
-				if (token.equals(box.getText())) {
-					//System.out.println("\t\tSelecting Checkbox: " + token);
-					doSet = true;
-					setKey = key;
-					setValue = value;
-					setMap = hm;
-					box.setSelected(true);
-				}
-			}
-		}
-	}
-
-
-	@Override
-	public synchronized void itemStateChanged(ItemEvent arg0) {
-		final String selectedOption = ((JCheckBox) arg0.getItemSelectable()).getText();
-
-		if (arg0.getStateChange() == ItemEvent.SELECTED) {
-			concat += selectedOption + " ";
-		} else {
-			concat = concat.replaceAll(new String(" " + selectedOption + " "), " ");
-			concat = concat.replaceFirst(new String("^" + selectedOption + " "), ""); //at the beginning of the concat
-		}
-
-		//super.handleItemEvent(arg0, selectedOption);
-		super.handleItemEvent(arg0, selectedOption, doSet, setMap, setKey, setValue);
-		doSet = false;
-		setKey = null;
-		setMap = null;
-		setValue = null;
-	}
-}
Index: ../trunk-jpl/src/java/src/gui_elements/DuplicatorPanel.java
===================================================================
--- ../trunk-jpl/src/java/src/gui_elements/DuplicatorPanel.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/gui_elements/DuplicatorPanel.java	(revision 18298)
@@ -1,175 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package gui_elements;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.*;
-
-import javax.swing.JButton;
-
-import main.GUIBuilder;
-import main.XMLHelper;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class DuplicatorPanel extends ControlledPanel implements ActionListener {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 6801877538909126920L;
-	JButton addButton;
-	Element clone;
-
-	JButton removeButton;
-
-	public DuplicatorPanel(Element element, ControlledPanel parent) {
-		super(element, parent);
-
-		addButton = new JButton("+");
-		this.add(addButton, "cell 1 0, split 2, grow");
-		addButton.addActionListener(this);
-
-		removeButton = new JButton("-");
-		this.add(removeButton, "cell 1 0, grow, wrap");
-		removeButton.addActionListener(this);
-
-		clone = (Element) element.cloneNode(true);
-		clone.removeAttribute("counter");
-		clone.setAttribute("counted", "true");
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent arg0) {
-		if (arg0.getSource() == addButton) {
-			add();
-		} else if (arg0.getSource() == removeButton) {
-			remove();
-		}
-	}
-
-	@Override
-	public void set(HashMap hm, String key, String value) {
-		//System.out.println("Trying to add DUPLICATOR Panel: " + key + " ... " + value + "  HashKey: " + this.getHashKey());
-
-		if (key.indexOf('#') == -1) {
-			ControlledPanel child = add(true, hm, key, value);
-			child.set(hm, key, value);
-		}
-	}
-
-	public ControlledPanel add() {
-		return add(false, null, null, null);
-	}
-
-	public ControlledPanel add(boolean doSet, HashMap hm, String key, String value) {
-
-		final Element child = (Element) this.clone.cloneNode(true);
-		final int counter = Integer.parseInt(element.getAttribute("counter"));
-		element.setAttribute("counter", (counter + 1) + "");
-
-		// child.setAttribute("key",element.getAttribute("key").replaceAll("#",counter+""));
-
-		//System.out.println("\t-->Adding a child panel to DUPLICATOR with key: " + key + "  val: " + value + "  HASH: " + this.getHashKey() + "  hier: " + this.getHierarchy());
-
-		recursiveKeyReplace(child, counter + "");
-		element.appendChild(child);
-
-		ControlledPanel childPanel = null;
-		try {
-			childPanel = ControlledPanel.createSingleParameterPanel(child, this);
-			childPanel.setKey(childPanel.getKey());
-			GUIBuilder.gui.addToTab(childPanel, section, this);
-			childPanel.hold();
-			GUIBuilder.control(childPanel);
-			GUIBuilder.recursiveBuild(child, this, doSet, hm, key, value);
-
-		} catch (final GUIBuildException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-
-		this.invalidate();
-		
-		return childPanel;
-	}
-
-	@Override
-	public void close() {
-		boolean doRemove = true;
-
-		do {
-			doRemove = remove();
-		} while (doRemove);
-	}
-
-	@Override
-	public String getValue() {
-		return null;
-	}
-
-	public boolean remove() {
-		final int counter = Integer.parseInt(element.getAttribute("counter")) - 1;
-		final String childKey = element.getAttribute("key").replace("#", counter + "");
-		final Element child = XMLHelper.getCertainChildElement(element, "parameter", "key", childKey);
-
-		if (child == null) return false;
-
-		element.removeChild(child);
-		element.setAttribute("counter", (counter) + "");
-
-		final ControlledPanel childPanel = GUIBuilder.panelControl.get(section, childKey);
-
-		if (childPanel != null) {
-			childPanel.release();
-			childPanel.close();
-
-			try {
-				if (!childPanel.isNeeded()) {
-					GUIBuilder.gui.removeFromTab(childPanel, section, this);
-				}
-			} catch (final GUIBuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		this.invalidate();
-
-		return true;
-	}
-
-	private void recursiveKeyReplace(Element element, String string) {
-		if (element.hasAttribute("key")) {
-			element.setAttribute("key", element.getAttribute("key").replaceAll("#", string));
-		}
-		final NodeList nodelist = element.getChildNodes();
-		for (int i = 0; i < nodelist.getLength(); i++) {
-			if (nodelist.item(i).getNodeType() == Node.ELEMENT_NODE) {
-				recursiveKeyReplace(((Element) nodelist.item(i)), string);
-			}
-		}
-	}
-
-}
Index: ../trunk-jpl/src/java/src/main/GUIBuilder.java
===================================================================
--- ../trunk-jpl/src/java/src/main/GUIBuilder.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/main/GUIBuilder.java	(revision 18298)
@@ -1,391 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package main;
-
-import gui_elements.ControlledPanel;
-import gui_elements.GUIBuildException;
-
-import java.io.IOException;
-
-import javax.swing.ProgressMonitor;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.filechooser.FileNameExtensionFilter;
-
-import java.util.*;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * The main class to build the .ini file creator. Upon construction it reads an
- * XML file and creates the corresponding GUI. Maintains an ElementControl
- * object.
- *
- * @author korhammer et egger
- *
- */
-public class GUIBuilder {
-	public static ProgressMonitor monitor;
-
-	public static final String xsd = GUIBuilder.class.getClassLoader().getResource("resources/config_schema-0.1.1.xsd").toString();
-	public static String res_filepath = GUIBuilder.class.getClassLoader().getResource("resources/default_config.xml").toString(); //the default config to start with
-	public static Document doc;
-
-	public static GUI gui;
-	public static PanelControl panelControl;
-
-	public static String application;
-	public static String currentConfigFile;
-
-	public static String saveFilePath = System.getProperty("user.dir");
-
-
-	private static String getFileExtension(final String file_and_path) {
-		final String file_sep = System.getProperty("file.separator");
-
-		// get filename without path
-		final int fileSepIndex = file_and_path.lastIndexOf(file_sep);
-		if (fileSepIndex == -1) {
-			return "";
-		}
-		final String filename = file_and_path.substring(fileSepIndex+1); //remove path
-
-		// get the extension from the filename
-		final int extIndex = filename.lastIndexOf(".");
-		if (extIndex == -1)
-			return "";
-
-		return filename.substring(extIndex+1);
-	}
-
-	/**
-	 * The main method. Opens the GUI Builder with a menu bar on the side.
-	 * If an XML filepath is handed over as an argument,
-	 * the XML file is opened.
-	 *
-	 * @param args
-	 * @throws GUIBuildException
-	 */
-	public static void main(String args[]) throws GUIBuildException {
-
-		new GUIBuilder();
-
-		if ((args.length != 0) && (args[0].length() > 0))
-			res_filepath = args[0]; //User may provice xml file as first argument
-
-		buildGUI(res_filepath);
-		//gui.hideOpenButton();
-	}
-
-	/**
-	 * Builds a GUI from the XML-file specified with validation through
-	 * the specified schema.
-	 *
-	 * @param filepath
-	 * @param schemapath
-	 * @throws GUIBuildException
-	 */
-	public GUIBuilder()	throws GUIBuildException {
-		if (System.getProperty("mrj.version") != null) {  //detect if running on mac
-			System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Inishell");
-			System.setProperty("apple.awt.brushMetalLook", "true");
-		}
-		gui = new GUI();
-	}
-
-	public static void setComments(HashMap<String, String> added_comments, HashMap<String, String> comments) {
-		panelControl.setComments(added_comments, comments);
-	}
-
-	/**
-	 * Builds the gui for a filepath that can either be handed over as an argument
-	 * on application start or chosen by using the open button.
-	 *
-	 * @param filepath
-	 * @throws GUIBuildException
-	 */
-	public static void buildGUI(String filepath) throws GUIBuildException{
-		currentConfigFile = filepath;
-
-		doc = XMLHelper.readXML(filepath, xsd);
-		doc = XMLHelper.resolveReferences(doc);
-
-		application = doc.getDocumentElement().getAttribute("application");
-
-		gui.setApplicationForTitle(application);
-
-		panelControl = new PanelControl();
-
-		final Element root = doc.getDocumentElement();
-		recursiveBuild(root, null, false);
-	}
-
-
-	public static void setValues(final HashMap<String, String> hm, final HashMap<String, String> added_comments, final HashMap<String, String> comments) {
-		if (hm == null) return;
-
-		monitor = new ProgressMonitor(gui, "Loading INI file", "0 out of " + panelControl.order.size() + " sections loaded", 0, panelControl.order.size());
-		monitor.setMillisToPopup(0);
-
-		Thread myrunner = new Thread() {
-				public void run() {
-					int progress_counter = 0; //Effectively counts the sections already parsed into the GUI
-					try {
-						final int returnval = GUIBuilder.closeFile();
-						if (returnval == JOptionPane.CANCEL_OPTION) return;
-						monitor.setProgress(progress_counter);
-
-						GUIBuilder.buildGUI(currentConfigFile);
-					} catch (GUIBuildException e) {
-						e.printStackTrace();
-					}
-
-					gui.setEnabled(false); //Disable user interaction while the ProgressMonitor is on
-
-					HashSet<String> usedKeys = new HashSet<String>(); //save all keys that were used from the HashMap
-					HashSet<String> unusedKeys = new HashSet<String>(); //save all keys that were used from the HashMap
-
-					Iterator<Map.Entry<String, TreeMap<String, ControlledPanel>>> sectionIterator = panelControl.panels.entrySet().iterator();
-					while (sectionIterator.hasNext()) {
-						progress_counter++;
-						monitor.setProgress(progress_counter);
-						monitor.setNote(progress_counter + " out of " + panelControl.order.size() + " sections loaded");
-
-						if (monitor.isCanceled()) { //user cancelled loading
-							monitor.close();
-							gui.setEnabled(true);
-							break; //HACK, should reset the whole environment before breaking
-						}
-
-						Map.Entry<String, TreeMap<String, ControlledPanel>> entry = sectionIterator.next();
-						TreeMap<String, ControlledPanel> value = entry.getValue();
-
-						List<String> sectionKeys = new ArrayList<String>(hm.keySet()); //all keys as defined in the existing ini
-						String sectionKey = entry.getKey().toUpperCase() + "::"; //The section string
-						filterList(sectionKey, sectionKeys); //filter keys for current section only (optimization)
-
-						LinkedList<ControlledPanel> todos = new LinkedList<ControlledPanel>();
-						LinkedList<String> keys = new LinkedList<String>();
-						LinkedList<String> values = new LinkedList<String>();
-
-						do {
-							todos.clear();
-							keys.clear();
-							values.clear();
-
-							Iterator<Map.Entry<String, ControlledPanel>> keyIterator = value.entrySet().iterator();
-							while(keyIterator.hasNext()) { //go through all keys of current section
-								final ControlledPanel mypanel = keyIterator.next().getValue();
-								//System.out.println("\t" + mypanel.getKey());
-
-								String pattern = mypanel.getHashKey();
-								pattern = pattern.replace("%","[a-zA-Z0-9_]+");
-								pattern = pattern.replace("#","[1-9]+[0-9]*"); //all integer numbers from 1 to infinity
-								//System.out.println("Current pattern: " + pattern);
-
-								//Loop through all defined keys of this section and compare them with pattern
-								Iterator<String> keyit = sectionKeys.iterator();
-								while (keyit.hasNext()) {
-									final String currkey = keyit.next();
-									//System.out.println("sectionKeys contains: " + currkey);
-
-									if ((!usedKeys.contains(currkey)) && currkey.matches(pattern)) {
-										//Add mypanel to list of todos
-										//System.out.println("Adding panel for " + currkey);
-										todos.add(mypanel);
-										keys.add(currkey);
-										values.add(hm.get(currkey));
-
-										usedKeys.add(currkey);
-									}
-								}
-							}
-
-							for (int jj = 0; jj < todos.size(); jj++) {
-								//System.out.println("--> SETTING " + keys.get(jj) + "  = " +values.get(jj));
-								todos.get(jj).set(hm, keys.get(jj), values.get(jj));
-							}
-						} while (todos.size() != 0);
-
-						if (progress_counter == panelControl.order.size()) gui.setEnabled(true);
-					}
-
-					//Now find out all keys that were not used in the hashmap
-					for (String key : hm.keySet()) {
-						if (!usedKeys.contains(key)) {
-							//System.out.println("Unknown key = " + key);
-							unusedKeys.add(key);
-							panelControl.setUnusedKeys(key, hm.get(key));
-						}
-					}
-
-					setComments(added_comments, comments);
-				}
-			};//thread
-		myrunner.start();
-	}
-
-	private static void filterList(String filter, List<String> list) {
-		for (Iterator<String> it=list.iterator(); it.hasNext();) {
-			final String next = it.next();
-			if (!next.startsWith(filter)) {
-				it.remove();
-			}
-		}
-	}
-
-	public static int closeFile(){
-		final int returnval = JOptionPane.showConfirmDialog(new JPanel(),
-				"You will lose all changes made to the current ini-file. " +
-				"Do you want this?", "Inishell is already open for " + application, JOptionPane.OK_CANCEL_OPTION);
-
-
-
-		if (returnval == JOptionPane.OK_OPTION) {
-			gui.closeAllTabs();
-			gui.rootNode = new PanelNode("");
-			application = null;
-			doc = null;
-			panelControl = null;
-		}
-
-		return returnval;
-	}
-
-
-	/**
-	 * Puts the specified panel into the panel control.
-	 * @param panel
-	 */
-	public static void control(ControlledPanel panel) {
-		final String section = panel.getSection();
-		panelControl.put(section, panel);
-	}
-
-
-	/**
-	 * Recursively traverses all children of the specified element
-	 * and builds the corresponding panels.
-	 *
-	 * @param parentElement
-	 * @param parentPanel
-	 * @throws GUIBuildException
-	 */
-	public static void recursiveBuild(Element parentElement, ControlledPanel parentPanel, boolean doSet) throws GUIBuildException {
-		recursiveBuild(parentElement, parentPanel, doSet, null, null, null);
-	}
-
-
-	public static void recursiveBuild(Element parentElement, ControlledPanel parentPanel, boolean doSet, HashMap hm, String key, String value) throws GUIBuildException {
-
-		/* get all child elements for the root */
-		final String[] tags = {"parameter", "frame"};
-		final Element[] parameterElements = XMLHelper.getElementArray(parentElement, tags);
-
-		for (final Element element : parameterElements) {
-			final String section = element.getAttribute("section");
-			ControlledPanel parameterPanel;
-
-			if (!panelControl.contains(section, element.getAttribute("key"))) {
-				//System.out.println("Adding through recursiveBuild: " + element.getAttribute("key"));
-				parameterPanel = ControlledPanel.createSingleParameterPanel(element, parentPanel);
-				parameterPanel.setKey(parameterPanel.getKey());
-
-				if (!element.getAttribute("template").equals("true")) {
-					//if (doSet) System.out.println("\tSETTING component key: " + key + "  value: " + value);
-					if (doSet) parameterPanel.set(hm, parameterPanel.getKey(), value);
-
-					gui.addToTab(parameterPanel, section, parentPanel);
-					control(parameterPanel);
-				}
-			} else {
-				parameterPanel = panelControl.get(section, element.getAttribute("key"));
-			}
-
-			parameterPanel.hold();
-			recursiveBuild(element, parameterPanel, doSet);
-		}
-
-		gui.validate();
-	}
-
-	/**
-	 * Recursively destructs child elements of the specified root.
-	 *
-	 * @param rootElement
-	 * @param rootPanel
-	 * @throws GUIBuildException
-	 */
-	public static void recursiveDestruct(Element rootElement, ControlledPanel rootPanel)
-		throws GUIBuildException {
-
-		/* get all child elements for the root */
-		final Element[] parameterElements = XMLHelper.getElementArray(rootElement, "parameter");
-
-		for (final Element element : parameterElements) {
-			final String section = element.getAttribute("section");
-			final ControlledPanel parameterPanel = panelControl.get(section, element.getAttribute("key"));
-			recursiveDestruct(element, parameterPanel);
-
-			parameterPanel.release();
-			parameterPanel.close();
-
-			if (!parameterPanel.isNeeded()) {
-				gui.removeFromTab(parameterPanel, section, rootPanel);
-			}
-
-		}
-
-		gui.validate();
-	}
-
-
-	/**
-	 * Opens a prompt for the path to save the ini file to. Then prints the ini
-	 * to the path specified.
-	 *
-	 * @throws IOException
-	 * @throws GUIBuildException
-	 */
-	public static void printIOFile() throws IOException, GUIBuildException {
-		final FileNameExtensionFilter inifilter = new FileNameExtensionFilter(".ini files", "ini");
-
-		final JFileChooser filechooser = new JFileChooser(saveFilePath);
-		filechooser.setFileFilter(inifilter);
-
-		final int returnval = filechooser.showSaveDialog(new JPanel());
-
-		if (returnval == JFileChooser.APPROVE_OPTION) {
-			String path = filechooser.getSelectedFile().getAbsolutePath();
-			final String ext = getFileExtension(path).toLowerCase();
-			if(!ext.equals("ini")) {
-				path += ".ini";
-			}
-
-			if (filechooser.getSelectedFile().isDirectory()) return;
-			saveFilePath = filechooser.getSelectedFile().getParent();
-
-			panelControl.printToFile(path);
-		}
-	}
-}
Index: ../trunk-jpl/src/java/src/main/PanelControl.java
===================================================================
--- ../trunk-jpl/src/java/src/main/PanelControl.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/main/PanelControl.java	(revision 18298)
@@ -1,248 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package main;
-
-import gui_elements.ControlledPanel;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.Iterator;
-
-/**
- * Class that maintains all ControlledPanels so that values can be retrieved
- * from panels, ini-files can be written. And a panel is not multiply created.
- *
- * @author korhammer
- *
- */
-public class PanelControl {
-
-	LinkedList<String> order;
-	HashMap<String, TreeMap<String, ControlledPanel>> panels;
-	HashMap<String, String> comments = null;
-	HashMap<String, String> added_comments = null;
-	HashMap<String, HashMap<String, String>> unusedKeys = null;
-	PanelNode rootNode = null;
-
-	/**
-	 * Constructor for the panel control.
-	 */
-	public PanelControl() {
-		panels = new HashMap<String, TreeMap<String, ControlledPanel>>();
-		order = new LinkedList<String>();
-
-		unusedKeys = new HashMap<String, HashMap<String, String>>();
-	}
-
-	public PanelControl(PanelControl p) {
-		panels = new HashMap<String, TreeMap<String, ControlledPanel>>(p.panels);
-		order = new LinkedList<String>(p.order);
-		if (added_comments != null)
-			added_comments = new HashMap<String, String>(p.added_comments);
-
-		if (comments != null)
-			comments = new HashMap<String, String>(p.comments);
-	}
-
-	public void setUnusedKeys(String key, String value) {
-		//Parse key
-		int offset = key.indexOf("::");
-		String section = key.substring(0, offset);
-		String sectionkey = key.substring(offset + 2);
-
-		HashMap<String, String> hm = unusedKeys.get(section);
-		if (hm == null) unusedKeys.put(section, new HashMap<String, String>());
-
-		unusedKeys.get(section).put(sectionkey, value);
-	}
-
-	public void setComments(HashMap<String, String> inaddedcomments, HashMap<String, String> incomments) {
-		this.added_comments = new HashMap<String, String>(inaddedcomments);
-		this.comments = new HashMap<String, String>(incomments);
-	}
-
-	/**
-	 * @param section
-	 * @param key
-	 * @return true if a panel with such key is maintained in the specified
-	 *         section
-	 */
-	public boolean contains(String section, String key) {
-		if (!panels.containsKey(section))
-			return false;
-
-		return panels.get(section).containsKey(key);
-	}
-
-	/**
-	 *
-	 * @param section
-	 * @param key
-	 * @return the panel with the specified section / key pair
-	 */
-	public ControlledPanel get(String section, String key) {
-		return panels.get(section).get(key);
-	}
-
-	/**
-	 * Prints the ini-file at the specified path.
-	 *
-	 * @param path
-	 */
-	public void printToFile(String path) {
-		/* create file */
-		final File file = new File(path);
-
-		try {
-			final FileWriter writer = new FileWriter(file);
-
-			writer.write(this.toString());
-			writer.close();
-		} catch (final IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Adds the panel to the specified section.
-	 *
-	 * @param section
-	 * @param panel
-	 */
-	public void put(String section, ControlledPanel panel) {
-		final String key = panel.getKey();
-		if (!panels.containsKey(section)) {
-			order.add(section);
-			panels.put(section, new TreeMap<String, ControlledPanel>());
-		}
-		panels.get(section).put(key, panel);
-	}
-
-	/**
-	 * Removes the panel with the specified section and key.
-	 *
-	 * @param section
-	 * @param key
-	 * @return the panel
-	 */
-	public ControlledPanel remove(String section, String key) {
-		return panels.get(section).remove(key);
-	}
-
-	/**
-	 * Prints the maintained panels to a string.
-	 *
-	 * @return an ini-file-like structure
-	 */
-	public void setRootNode(PanelNode inrootNode) {
-		rootNode = inrootNode;
-	}
-
-	public String extractKey(String instring) {
-		int offset = instring.indexOf("::");
-		if (offset == -1) return null;
-
-		return instring.substring(offset+2);
-	}
-
-	@Override
-	public String toString() {
-		String out = "";
-
-		for (final String section : order) {
-			/* create section */
-			final String sectionstring = "[" + section.toUpperCase() + "]\n";
-			String keyvaluestring = "";
-
-			/* print section */
-			LinkedList<String> keys = new LinkedList<String>();
-			PanelNode sectionNode = rootNode.get(section.toUpperCase());
-			if (sectionNode != null) sectionNode.getKeyList(keys);
-
-			//final Set<String> keys = panels.get(section).keySet();
-			for (final String hashKey : keys) {
-				String key = extractKey(hashKey);
-				if (key == null) continue;
-
-				final String value = panels.get(section).get(key).getValue();
-				if (value != null) {
-					if ((comments != null) && comments.containsKey(hashKey.toUpperCase())) {
-						String precomments =  comments.get(hashKey.toUpperCase());
-						if (!precomments.equals(""))
-						 	keyvaluestring += precomments;						
-					}
-
-					keyvaluestring += key + "\t=\t" + value;					
-
-					if ((added_comments != null) && added_comments.containsKey(hashKey.toUpperCase()))
-						keyvaluestring += "\t" + added_comments.get(hashKey.toUpperCase());
-
-					keyvaluestring += "\n";
-				}
-			}
-
-			//Add unused keys
-			HashMap<String, String> extra = unusedKeys.get(section.toUpperCase());
-			if (extra != null) {
-				if (!keyvaluestring.equals("")) keyvaluestring += "\n";
-
-				for (String extrakey : extra.keySet()) {
-					String hashKey = section.toUpperCase() + "::" + extrakey.toUpperCase();
-					if ((comments != null) && comments.containsKey(hashKey)) {
-						String precomments =  comments.get(hashKey);
-						if (!precomments.equals(""))
-						 	keyvaluestring += precomments;						
-					}
-				
-					keyvaluestring += extrakey + "\t=\t" + extra.get(extrakey);
-
-					if ((added_comments != null) && added_comments.containsKey(hashKey))
-					    keyvaluestring += "\t" + added_comments.get(hashKey);
-
-					keyvaluestring += "\n";
-				}
-			}
-			
-			//check if there aren't any comments in that section
-			String hashKey = section.toUpperCase() + "::";
-			if ((comments != null) && comments.containsKey(hashKey)) {
-				String precomments =  comments.get(hashKey);
-				if (!precomments.equals("")) {
-					if (precomments.indexOf("\n") == -1) precomments += "\n";
-					keyvaluestring = precomments + keyvaluestring + "\n";
-				}
-			}
-			
-			/* add section only if keys / values are printed */
-			if (!keyvaluestring.equals("")) {
-				out += sectionstring + keyvaluestring + "\n";
-			}
-		}
-
-		return out;
-	}
-}
Index: ../trunk-jpl/src/java/src/main/XMLHelper.java
===================================================================
--- ../trunk-jpl/src/java/src/main/XMLHelper.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/main/XMLHelper.java	(revision 18298)
@@ -1,525 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package main;
-
-import gui_elements.GUIBuildException;
-
-import java.io.IOException;
-import java.util.LinkedList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-//for the XML printing
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import java.io.StringWriter;
-
-public class XMLHelper {
-
-	/**
-	 * Find the parameter values for which the element should be cloned
-	 * e.g. for section tags.
-	 *
-	 * @param element
-	 * @param tagName
-	 * @param attributeName
-	 * @param parentArgument
-	 * @return the
-	 */
-	public static String[] findApplicableValues(Element element,
-			String tagName, String attributeName, String parentArgument) {
-
-		final String[] argumentsFromElement = getAttributesFromChildren(
-				element, tagName, attributeName);
-
-		/*
-		 * If no such arguments are specified for the current element but there
-		 * are for the parent element, take that of the parent.
-		 */
-		if (argumentsFromElement.length == 0 && parentArgument != null)
-			return new String[] { parentArgument };
-		else if ((argumentsFromElement.length > 0 && parentArgument != null)) {
-			if (getCertainChildElement(element, tagName, attributeName,
-					parentArgument) != null)
-				return new String[] { parentArgument };
-			else
-				/*
-				 * The empty intersection is an empty array so that his case can
-				 * be handled differently from the null case below.
-				 */
-				return new String[0];
-		}
-
-		/*
-		 * If no arguments are specified for the parent use all element
-		 * arguments.
-		 */
-		else if (argumentsFromElement.length > 0 && parentArgument == null)
-			return argumentsFromElement;
-		else if (argumentsFromElement.length == 0 && parentArgument == null)
-			return null;
-		return null;
-	}
-
-	/**
-	 * Get all children of an element that have a certain element tag and
-	 * extract the values for a certain attribute.
-	 *
-	 * @param parent
-	 *            the parent element
-	 * @param tag
-	 *            the element tag
-	 * @param attribute
-	 *            the attribute name
-	 *
-	 * @return a String array with the attribute values
-	 */
-	public static String[] getAttributesFromChildren(Element parent, String tag, String attribute) {
-		final Element[] elements = getElementArray(parent, tag);
-
-		final String[] attributes = new String[elements.length];
-		for (int i = 0; i < elements.length; i++) {
-			attributes[i] = elements[i].getAttribute(attribute);
-		}
-		return attributes;
-	}
-
-	/**
-	 * Returns the first child element that has the specified element tag and
-	 * the value for the specified attribute.
-	 *
-	 * @param parent
-	 * @param tag
-	 * @param attribute
-	 * @param value
-	 * @return the first child element that meets the criteria
-	 */
-	public static Element getCertainChildElement(Element parent, String tag,
-			String attribute, String value) {
-		final Element[] allElements = getElementArray(parent, tag);
-		for (final Element element : allElements) {
-			if (element.hasAttribute(attribute)) {
-				if (element.getAttribute(attribute).equals(value))
-					return element;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * For the specified element gets the text that is contained in the first
-	 * child that has a certain element name.
-	 *
-	 *
-	 * @param parent
-	 *            the parent element
-	 * @param tag
-	 *            the element tag for the child
-	 * @return the text content
-	 */
-	public static String getChildElementContent(Element parent, String tag) {
-		final Element[] elements = getElementArray(parent, tag);
-		if (elements.length == 0)
-			return null;
-
-		return elements[0].getTextContent();
-	}
-
-
-
-	/**
-	 * @param parent
-	 * @param tag
-	 * @return all child elements of the parent with the specified tag
-	 */
-	public static Element[] getElementArray(Element parent, String tag) {
-		if (!parent.hasChildNodes())
-			return new Element[0];
-
-		final NodeList nodeList = parent.getChildNodes();
-		final LinkedList<Element> elementlist = new LinkedList<Element>();
-		for (int i = 0; i < nodeList.getLength(); i++) {
-
-			final Node element = nodeList.item(i);
-			if (element.getNodeType() == Node.ELEMENT_NODE && ((Element) element).getTagName().equals(tag)) {
-				elementlist.add((Element) element);
-			}
-		}
-		final Element[] elements = new Element[elementlist.size()];
-
-		return elementlist.toArray(elements);
-	}
-
-	public static Element[] getElementArray(Element parent, String[] tags) {
-		if (!parent.hasChildNodes())
-			return new Element[0];
-
-		final NodeList nodeList = parent.getChildNodes();
-		final LinkedList<Element> elementlist = new LinkedList<Element>();
-		for (int ii = 0; ii < nodeList.getLength(); ii++) {
-
-			final Node element = nodeList.item(ii);
-			if (element.getNodeType() == Node.ELEMENT_NODE) {
-				//Loop through all possible tags
-				for (int jj=0; jj<tags.length; jj++) {
-					if (((Element) element).getTagName().equals(tags[jj])) {
-						elementlist.add((Element) element);
-						break;
-					}
-				}
-			}
-		}
-
-		final Element[] elements = new Element[elementlist.size()];
-		return elementlist.toArray(elements);
-	}
-
-	/**
-	 * Prints the Document object to the console. as XML.
-	 *
-	 * @param doc
-	 */
-	public static String printToScreen(Document doc) {
-
-		final javax.xml.transform.TransformerFactory tfactory = TransformerFactory
-				.newInstance();
-
-		javax.xml.transform.Transformer xform;
-		try {
-			xform = tfactory.newTransformer();
-
-			final javax.xml.transform.Source src = new javax.xml.transform.dom.DOMSource(
-					doc);
-
-			final java.io.StringWriter writer = new java.io.StringWriter();
-			final javax.xml.transform.Result result = new javax.xml.transform.stream.StreamResult(
-					writer);
-
-			xform.transform(src, result);
-
-			return writer.toString();
-
-		} catch (final TransformerConfigurationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (final TransformerException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-
-
-	/**
-	 * Reads an XML file and writes it into a Document structure.
-	 *
-	 * @param filepath
-	 * @param xsdpath
-	 *            the path of the W3 XML schema that the file is based on.
-	 * @throws GUIBuildException
-	 */
-	public static Document readXML(String filepath, String xsdpath)
-			throws GUIBuildException {
-
-		/* read XML file and write it into Document structure */
-
-		final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-		dbf.setIgnoringComments(true);
-		dbf.setValidating(true);
-		dbf.setIgnoringElementContentWhitespace(true);
-
-		dbf.setAttribute(
-				"http://java.sun.com/xml/jaxp/properties/schemaLanguage",
-				"http://www.w3.org/2001/XMLSchema");
-		dbf.setAttribute(
-				"http://java.sun.com/xml/jaxp/properties/schemaSource", xsdpath);
-
-
-		DocumentBuilder db;
-		Document doc;
-
-		try {
-
-			db = dbf.newDocumentBuilder();
-			doc = db.parse(filepath);
-		} catch (final ParserConfigurationException e) {
-			throw new GUIBuildException(e.getMessage());
-		} catch (final SAXException e) {
-			throw new GUIBuildException(e.getMessage());
-		} catch (final IOException e) {
-			throw new GUIBuildException(e.getMessage());
-		}
-
-		doc.normalize();
-		doc.normalizeDocument();
-
-		resolveIncludes(doc, xsdpath);
-		resolveReferences(doc);
-		recursivelyResolveSections(doc.getDocumentElement(), null);
-		recursivelyResolveReplaces(doc.getDocumentElement(), null);
-
-		return doc;
-	}
-
-	/**
-	 * This method recursively traverses the document tree and replaces all
-	 * parameters that contain replace elements with the corresponding number of
-	 * cloned elements.
-	 *
-	 * @param current
-	 *            the current element
-	 * @param parentReplace
-	 *
-	 */
-	public static void recursivelyResolveReplaces(Element current,
-			String parentReplace) {
-
-		final String[] replacements = XMLHelper.findApplicableValues(
-				current, "replace", "name", parentReplace);
-
-		/* delete replace children */
-		final Element[] replaceChildren = XMLHelper.getElementArray(current,
-				"replace");
-		for (final Element replace : replaceChildren) {
-			current.removeChild(replace);
-		}
-
-		if (replacements == null) {
-			final NodeList childNodes = current.getChildNodes();
-			final Node[] nodes = new Node[childNodes.getLength()];
-			for (int i = 0; i < childNodes.getLength(); i++) {
-				nodes[i] = childNodes.item(i);
-			}
-
-			for (final Node node : nodes) {
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					XMLHelper.recursivelyResolveReplaces((Element) node,
-							parentReplace);
-				}
-			}
-		} else if (replacements.length == 0) {
-			current.getParentNode().removeChild(current);
-		} else if (replacements != null) {
-			/* clone element */
-			for (final String replace : replacements) {
-				final Element clone = (Element) current.cloneNode(true);
-				clone.setAttribute("key",
-						clone.getAttribute("key").replaceAll("%", replace));
-				clone.setAttribute("replaced", replace);
-				current.getParentNode().appendChild(clone);
-
-				/* Recursion: Do not do recursion on NodeList as it is updated */
-				final NodeList childNodes = clone.getChildNodes();
-				final Node[] nodes = new Node[childNodes.getLength()];
-				for (int i = 0; i < childNodes.getLength(); i++) {
-					nodes[i] = childNodes.item(i);
-				}
-
-				for (final Node node : nodes) {
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						XMLHelper.recursivelyResolveReplaces((Element) node,
-								replace);
-					}
-				}
-
-			}
-			current.getParentNode().removeChild(current);
-		}
-	}
-
-	/**
-	 * This method recursively traverses the document tree and replaces all
-	 * parameters that contain section elements with the corresponding number of
-	 * cloned elements.
-	 *
-	 * @param current
-	 */
-	public static void recursivelyResolveSections(Element current,
-			String parentSection) {
-
-		final String[] sections = XMLHelper.findApplicableValues(current,
-				"section", "name", parentSection);
-
-
-		final Element[] sectionChildren = XMLHelper.getElementArray(current,
-				"section");
-		for (final Element section : sectionChildren) {
-			current.removeChild(section);
-		}
-
-		if (sections == null) {
-			final NodeList childNodes = current.getChildNodes();
-			final Node[] nodes = new Node[childNodes.getLength()];
-			for (int i = 0; i < childNodes.getLength(); i++) {
-				nodes[i] = childNodes.item(i);
-			}
-
-			for (final Node node : nodes) {
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					XMLHelper.recursivelyResolveSections((Element) node,
-							parentSection);
-				}
-			}
-		} else if (sections != null) {
-			/* clone element */
-			for (final String section : sections) {
-				final Element clone = (Element) current.cloneNode(true);
-				clone.setAttribute("section", section);
-
-				current.getParentNode().appendChild(clone);
-
-				/* Recursion: Do not do recursion on NodeList as it is updated */
-				final NodeList childNodes = clone.getChildNodes();
-				final Node[] nodes = new Node[childNodes.getLength()];
-				for (int i = 0; i < childNodes.getLength(); i++) {
-					nodes[i] = childNodes.item(i);
-				}
-
-				for (final Node node : nodes) {
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						XMLHelper.recursivelyResolveSections((Element) node,
-								section);
-					}
-				}
-
-			}
-			current.getParentNode().removeChild(current);
-		}
-	}
-
-	/**
-	 * Parses an XML file as specified in the path of an "include" element and
-	 * replaces the include element with the content of the XML file.
-	 *
-	 * @param doc
-	 */
-	public static Document resolveIncludes(Document doc, String xsdpath) {
-		final NodeList include = doc.getElementsByTagName("include");
-
-		for (int i = 0; i < include.getLength(); i++) {
-
-			final String includePath = ((Element) include.item(i))
-					.getAttribute("path");
-
-			try {
-				final Document partialDocument = readXML(includePath, xsdpath);
-
-				final NodeList children = partialDocument.getChildNodes()
-						.item(0).getChildNodes();
-				final Node parent = include.item(i).getParentNode();
-
-				for (int j = 0; j < children.getLength(); j++) {
-					final Node imported = doc
-							.importNode(children.item(j), true);
-					parent.appendChild(imported);
-				}
-
-				// parent.replaceChild(fragment, include.item(i));
-			} catch (final GUIBuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-
-		}
-
-		return doc;
-	}
-
-	/**
-	 * Manipulates the document structure, so that "reference" elements are
-	 * replaced by the corresponding "parametergroup".
-	 *
-	 * @param doc
-	 * @return
-	 */
-	public static Document resolveReferences(Document doc) {
-
-		final NodeList references = doc.getElementsByTagName("reference");
-		final NodeList parametergroups = doc.getElementsByTagName("parametergroup");
-
-		while (references.getLength() != 0) {
-
-			final Element referenceElement = (Element) references.item(0);
-
-			final Element parent = (Element) referenceElement.getParentNode();
-
-			parent.removeChild(referenceElement);
-
-			for (int i = 0; i < parametergroups.getLength(); i++) {
-
-				final Node parametergroupElement = parametergroups.item(i);
-
-				if (((Element) parametergroupElement).getAttribute("name")
-						.equals(referenceElement.getAttribute("name"))) {
-					final NodeList children = parametergroupElement
-							.getChildNodes();
-
-					for (int j = 0; j < children.getLength(); j++) {
-						final Node clone = children.item(j).cloneNode(true);
-						parent.appendChild(clone);
-					}
-				}
-			}
-		}
-
-		while (parametergroups.getLength() != 0) {
-			parametergroups.item(0).getParentNode()
-					.removeChild(parametergroups.item(0));
-		}
-
-		return doc;
-	}
-
-
-	/**
-	 * @brief  The funciton expects a Node element as argument and transform the XML
-	 *         (sub)tree starting with the given Node into a string
-	 * @return A string representing the (sub)tree starting with node
-	 * @author Thomas Egger
-	 */
-	public static String getString(Node node){
-		String str = "";
-
-		try {
-			Transformer transformer = TransformerFactory.newInstance().newTransformer();
-			StringWriter buffer = new StringWriter();
-			transformer.transform(new DOMSource(node), new StreamResult(buffer));
-			str = buffer.toString();
-		} catch (Exception ex) {
-			throw new RuntimeException("Error converting to String", ex);
-		}
-
-		return str;
-	}
-}
Index: ../trunk-jpl/src/java/src/main/GUI.java
===================================================================
--- ../trunk-jpl/src/java/src/main/GUI.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/main/GUI.java	(revision 18298)
@@ -1,548 +0,0 @@
-/***********************************************************************************/
-/*  Copyright 2012 WSL Institute for Snow and Avalanche Research    SLF-DAVOS      */
-/***********************************************************************************/
-/*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package main;
-
-import gui_elements.ControlledPanel;
-import gui_elements.GUIBuildException;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Desktop;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.LinkedList;
-
-import javax.swing.BoxLayout;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JEditorPane;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JToolBar;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import java.io.*;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * The GUI created by the author.
- *
- * @author korhammer et egger
- *
- */
-public class GUI extends JFrame implements WindowListener, ActionListener, HyperlinkListener {
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = -2428732881181670225L;
-	public static PanelNode rootNode = null;
-
-	private static String title = GUI.class.getPackage().getImplementationTitle() + " " + GUI.class.getPackage().getImplementationVersion();
-
-	public static final Color LABEL_COLOR = Color.decode("#000080");
-	public static Color NORMAL_BACKGROUND_COLOR = Color.decode("#EEEEEE");
-	public static Color WARNING_BACKGROUND_COLOR = Color.decode("#FF0011");
-
-	public static ImageIcon openicon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/xml_open.png"));
-	public static ImageIcon openiniicon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/fileopen.png"));
-	public static ImageIcon exporticon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/filesave.png"));
-	public static ImageIcon previewicon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/kghostview.png"));
-	public static ImageIcon reseticon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/reset.png"));
-
-	private final JButton createbutton;
-	private final JButton previewButton;
-	private final JButton openbutton;
-	private final JButton openinibutton;
-	private final JButton resetbutton;
-
-	private final JTabbedPane tabpane;
-	private final JToolBar toolbar;
-	private HashMap<String,JPanel> tabpanels;
-
-	private String configFilePath, iniFilePath;
-
-	/*
-	 * Creates a window with the static components of the GUI, i.e. components
-	 * that do not depend on the configuration file.
-	 */
-	public GUI() throws GUIBuildException {
-		super(title);
-
-		configFilePath = System.getProperty("user.dir");
-		iniFilePath = System.getProperty("user.dir");
-
-		tabpanels = new HashMap<String,JPanel>();
-
-		Dimension screenDim = new Dimension(1280, 800);
-		Dimension maxDim = null;
-
-		if (this.getMaximizedBounds() == null) {
-			Toolkit tk = Toolkit.getDefaultToolkit();
-			maxDim = tk.getScreenSize();
-			this.setMaximizedBounds(new Rectangle(0, 0, (int)maxDim.getWidth(), (int)maxDim.getHeight()));
-		} else {
-			maxDim = this.getMaximizedBounds().getSize();
-		}
-
-		if (maxDim.height < screenDim.height) {
-			screenDim.height = maxDim.height;
-			if (screenDim.height > 100)
-				screenDim.height -= 25;
-		}
-
-		if (maxDim.width < screenDim.width) {
-			screenDim.width = maxDim.width;
-			if (screenDim.width > 100)
-				screenDim.width -= 25;
-		}
-
-		this.setSize(screenDim);
-		//this.setExtendedState(MAXIMIZED_BOTH);
-		this.setVisible(true);
-		this.setLayout(new BorderLayout());
-
-		this.toolbar = new JToolBar();
-		toolbar.setLayout(new BoxLayout(toolbar, 1));
-		toolbar.setFloatable(false);
-		this.setVisible(true);
-		this.add(toolbar, BorderLayout.WEST);
-
-		this.tabpane = new JTabbedPane();
-		this.add(tabpane);
-		tabpane.setVisible(true);
-
-		this.openbutton = new JButton(openicon);
-		this.openbutton.setActionCommand("open config");
-		this.openbutton.setToolTipText("Open XML-configuration");
-		openbutton.addActionListener(this);
-		toolbar.add(this.openbutton);
-
-		this.openinibutton = new JButton(openiniicon);
-		this.openinibutton.setActionCommand("open ini");
-		this.openinibutton.setToolTipText("Open existing INI file");
-		openinibutton.addActionListener(this);
-		toolbar.add(this.openinibutton);
-
-		this.resetbutton = new JButton(reseticon);
-		this.resetbutton.setActionCommand("reset");
-		this.resetbutton.setToolTipText("Reset Interface");
-		resetbutton.addActionListener(this);
-		toolbar.add(this.resetbutton);
-
-		this.createbutton = new JButton(exporticon);
-		this.createbutton.setActionCommand("write config");
-		this.createbutton.setToolTipText("Write to INI-file");
-		createbutton.addActionListener(this);
-		toolbar.add(this.createbutton);
-
-		this.previewButton = new JButton(previewicon);
-		this.previewButton.setActionCommand("preview");
-		this.previewButton.setToolTipText("Preview INI-file");
-		previewButton.addActionListener(this);
-		toolbar.add(previewButton);
-
-		this.addWindowListener(this);
-
-		rootNode = new PanelNode("");
-	}
-
-	/**
-	 * Writes the application name into the GUI window title bar.
-	 *
-	 * @param application
-	 */
-	public void setApplicationForTitle(String application){
-		if(application.equals("")){
-			this.setTitle(title);
-		}
-		else{
-			this.setTitle(title + " for "+application);
-		}
-	}
-
-	public void hideOpenButton(){
-		openbutton.setVisible(false);
-	}
-
-	/**
-	 * Closes all tabs.
-	 */
-	public void closeAllTabs(){
-		tabpane.removeAll();
-	}
-
-	/**
-	 * Adds a component to the tab specified and creates the tab if it does not
-	 * already exist.
-	 *
-	 * @param comp
-	 * @param tabName
-	 * @throws GUIBuildException
-	 */
-	public void addToTab(ControlledPanel comp, String tabName, ControlledPanel parentPanel) throws GUIBuildException {
-		tabName = Character.toUpperCase(tabName.charAt(0)) + tabName.substring(1).toLowerCase();
-
-		String section = ((ControlledPanel)comp).getSection().toUpperCase();
-		String key = section + "::" + ((ControlledPanel)comp).getKey();//((ControlledPanel)comp).getHashKey();
-		//System.out.println("\tPanel: " + ((ControlledPanel)comp).getHashKey() + "   Section: " + ((ControlledPanel)comp).getSection());
-
-		PanelNode sectionNode = rootNode.getChild(section);
-		if (sectionNode == null) {
-			PanelNode tmp = new PanelNode(section);
-			//System.out.println("\t--Adding section '" + section + "' to tree");
-			sectionNode = rootNode.add(tmp);
-		}
-
-		if (parentPanel != null) {
-			//System.out.println("\tLooking for node: " + parentPanel.getHashKey());
-			sectionNode = sectionNode.get(parentPanel.getSection().toUpperCase() + "::" + parentPanel.getKey());
-		}
-
-		if (sectionNode != null) {
-			PanelNode keyNode = sectionNode.get(key);
-			if (keyNode == null) {
-				PanelNode tmp = new PanelNode(key);
-				keyNode = sectionNode.add(tmp);
-				//System.out.println("\t--Adding key '" + key + "' to tree as leaf to " + sectionNode.getData());
-			}
-		}
-
-		JPanel tab;
-		if (tabpane.indexOfTab(tabName) == -1) {
-
-			tab = new JPanel();
-			tab.setBackground(Color.white);
-			tab.setVisible(true);
-			tab.setLayout(new MigLayout("wrap 1"));
-
-			JScrollPane scrollpane = new JScrollPane(tab);
-			tabpane.add(tabName, scrollpane);
-			tabpanels.put(tabName, tab);
-
-		} else {
-			tab = tabpanels.get(tabName);
-		}
-
-		if (parentPanel != null && containsPanel(tab, parentPanel)) {
-			parentPanel.add(comp, "span");
-		} else {
-			tab.add(comp);
-		}
-
-		//JViewport jv = ((JScrollPane)tabpane.getComponentAt(tabpane.indexOfTab(tabName))).getViewport();
-		//jv.setViewPosition(new Point(0,0));
-
-		this.validate();
-	}
-
-	public void removeFromTab(ControlledPanel parameterPanel, String section, ControlledPanel parentPanel) {
-		final String tabTitle = section.substring(0, 1).toUpperCase() + section.substring(1).toLowerCase();
-		final int index = tabpane.indexOfTab(tabTitle);
-
-		final Container container = (Container) tabpane.getComponentAt(index);
-
-		//System.out.println("Removing Panel: " + parameterPanel.getHashKey());
-		PanelNode tmp = rootNode.get(parameterPanel.getSection().toUpperCase() + "::" + parameterPanel.getKey());
-		tmp.getParent().remove(tmp);
-
-		if (parentPanel != null && containsPanel(container, parentPanel)) {
-			parentPanel.remove(parameterPanel);
-		} else {
-			container.remove(parameterPanel);
-		}
-
-		GUIBuilder.panelControl.remove(section, parameterPanel.getKey());
-
-		container.repaint();
-		this.validate();
-	}
-
-	public boolean containsPanel(Container container, JPanel panel) {
-
-		for (final Component component : container.getComponents()) {
-			if (component == panel)
-				return true;
-			if (containsPanel((Container) component, panel))
-				return true;
-		}
-		return false;
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent e) {
-		if (e.getActionCommand().equals("write config") && GUIBuilder.application!=null ) {
-			GUIBuilder.panelControl.setRootNode(rootNode);
-
-			try {
-				GUIBuilder.printIOFile();
-			} catch (final IOException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			} catch (final GUIBuildException e2) {
-				// TODO Auto-generated catch block
-				e2.printStackTrace();
-			}
-		} else if (e.getActionCommand().equals("preview") && GUIBuilder.application!=null) {
-			GUIBuilder.panelControl.setRootNode(rootNode);
-			previewINIFile();
-		} else if (e.getActionCommand().equals("reset") && GUIBuilder.application!=null) {
-			resetGUI();
-		} else if( (e.getActionCommand().equals("open config"))) {
-			openFile();
-		} else if( (e.getActionCommand().equals("open ini"))) {
-			openINIFile();
-		}
-	}
-
-	public void resetGUI() {
-		try {
-			int returnval = GUIBuilder.closeFile();
-			if (returnval == JOptionPane.CANCEL_OPTION) return;
-			GUIBuilder.buildGUI(GUIBuilder.currentConfigFile);
-		} catch (GUIBuildException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void previewINIFile(){
-		JFrame frame = new JFrame();
-		frame.setSize(600,800);
-		frame.setVisible(true);
-		//frame.setLayout(new BorderLayout());
-
-		JEditorPane pane = new JEditorPane();
-
-		pane.setText(GUIBuilder.panelControl.toString());
-		pane.setVisible(true);
-		pane.setEditable(false);
-
-		JScrollPane scrollPane = new JScrollPane(pane);
-		scrollPane.setVisible(true);
-		frame.add(scrollPane);
-
-		frame.validate();
-		frame.repaint();
-	}
-
-	public void openINIFile(){
-		final FileNameExtensionFilter inifilter = new FileNameExtensionFilter(".ini files", "ini");
-		final JFileChooser filechooser = new JFileChooser(iniFilePath);
-		filechooser.setFileFilter(inifilter);
-		final int returnval = filechooser.showOpenDialog(new JPanel());
-
-		HashMap<String, String> hm = new HashMap<String, String>();
-		HashMap<String, String> comments = new HashMap<String, String>();
-		HashMap<String, String> added_comments = new HashMap<String, String>();
-
-		if (returnval == JFileChooser.APPROVE_OPTION) {
-			final String path = filechooser.getSelectedFile().toString();
-			if (filechooser.getSelectedFile().isDirectory()) return;
-
-			iniFilePath = filechooser.getSelectedFile().getParent();
-
-			System.out.println("Opening INI file: " + path);
-
-			try {
-				BufferedReader br = new BufferedReader(new FileReader(path));
-				String line;
-
-				String section = "GENERAL::";
-				String clines = "";
-
-				while((line = br.readLine()) != null) {
-					int offset = line.indexOf(";");
-					int offset2 = line.indexOf("#");
-
-					if ((offset2 != -1) && (offset != -1)) {
-						if (offset2 < offset) offset = offset2;
-					} else if ((offset2 != -1) && (offset == -1)) {
-						offset = offset2;
-					}
-
-					String comment = null;
-				     //System.out.println("CLINES" + clines);
-					if (offset != -1) {
-						//System.out.println("COMMENT: " + line.substring(offset));
-						comment = line.substring(offset);
-					} else {
-						//System.out.println("COMMENTLESS");
-					}
-
-					if (-1 != offset) line = line.substring(0, offset);
-
-					offset = line.indexOf("#");
-					if (-1 != offset) line = line.substring(0, offset);
-
-					line = line.trim(); //take away ws
-
-					if (line.length()>1) {
-
-						if (line.charAt(0) == '[') {
-							offset = line.indexOf("]");
-							if ((offset == -1) || (offset <= 1)) continue;
-
-							if (!clines.equals("")) {
-								int lbr = clines.indexOf("\n");
-								clines = clines.substring(0, lbr);
-								//System.out.println("Adding the precomment: " + clines);
-								comments.put(section, clines);
-								clines = "";
-							}
-
-							section = line.substring(1, offset).toUpperCase() + "::";
-							//System.out.println("New Section: " + section);
-
-						} else {
-							String[] tokens = line.split("=");
-							if (tokens.length == 2) {
-								String key = tokens[0].trim();
-								String value = tokens[1].trim();
-								if (key.length() > 0) {
-									hm.put(section + key.toUpperCase(), value);
-									if (comment != null) added_comments.put(section + key.toUpperCase(), comment);
-									if (!clines.equals("")) {
-										//System.out.println("Adding the precomment: " + clines);
-										comments.put(section + key.toUpperCase(), clines);
-										clines = "";
-									}
-								}
-							}
-						}
-
-						//System.out.println(line);
-					} else {
-						//it was a comment line only, associate it with the next key
-						if (comment != null) clines += comment;
-						clines += "\n";
-					}
-				}
-				br.close();
-
-				GUIBuilder.setValues(hm, added_comments, comments);
-			} catch (Exception e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-			}
-		}
-	}
-
-	public void openFile(){
-		/* If a configuration is already open, ask for close. */
-		final FileNameExtensionFilter xmlfilter = new FileNameExtensionFilter(".xml files", "xml");
-		final JFileChooser filechooser = new JFileChooser(configFilePath);
-		filechooser.setFileFilter(xmlfilter);
-		final int returnval = filechooser.showOpenDialog(new JPanel());
-		if (returnval == JFileChooser.APPROVE_OPTION) {
-			if(GUIBuilder.application != null){
-				final int returnval2 = GUIBuilder.closeFile();
-				if (returnval2 == JOptionPane.CANCEL_OPTION) return;
-			}
-
-			final String path = filechooser.getSelectedFile().toString();
-			if (filechooser.getSelectedFile().isDirectory()) return;
-
-			configFilePath = filechooser.getSelectedFile().getParent();
-
-			try {
-				GUIBuilder.buildGUI(path);
-			} catch (GUIBuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	@Override
-	public void windowActivated(WindowEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void windowClosed(WindowEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void windowClosing(WindowEvent e) {
-		System.exit(NORMAL);
-
-	}
-
-	@Override
-	public void windowDeactivated(WindowEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void windowDeiconified(WindowEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void windowIconified(WindowEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void windowOpened(WindowEvent e) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void hyperlinkUpdate(HyperlinkEvent e) {
-
-		if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-		      try {
-				Desktop.getDesktop().browse(e.getURL().toURI());
-			} catch (IOException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			} catch (URISyntaxException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-		}
-	}
-}
Index: ../trunk-jpl/src/java/src/main/PanelNode.java
===================================================================
--- ../trunk-jpl/src/java/src/main/PanelNode.java	(revision 18297)
+++ ../trunk-jpl/src/java/src/main/PanelNode.java	(revision 18298)
@@ -1,69 +0,0 @@
-package main;
-
-import java.util.List;
-import java.util.LinkedList;
-
-public class PanelNode {
-	private String data;
-	private PanelNode parent;
-	private LinkedList<PanelNode> children = new LinkedList<PanelNode>();
-
-	public PanelNode(String indata) {
-		data = indata;
-		parent = null;
-	}
-
-	public PanelNode(PanelNode p) {
-		data = p.data;
-		parent = p.parent;
-		children = new LinkedList<PanelNode>(p.children);
-	}
-
-	public String getData() {
-		return data;
-	}
-
-	public PanelNode getChild(String data) {
-		for (PanelNode child : children) {
-			if (child.data.equals(data))
-				return child;
-		}
-
-		return null;
-	}
-
-	public PanelNode add(PanelNode c) {
-		c.parent = this;
-		children.add(c);
-
-		return children.getLast();
-	}
-
-	public PanelNode get(String searchstring) {
-		if (data.equals(searchstring)) return this;
-
-		for (PanelNode child : children) {
-			PanelNode tmp = child.get(searchstring);
-			if (tmp != null) return tmp;
-		}
-
-		return null; //Nothing found in subtree
-	}
-
-	public boolean remove(PanelNode tmp) {
-		return children.remove(tmp);
-	}
-
-	public PanelNode getParent() {
-		return parent;
-	}
-
-	public void getKeyList(LinkedList<String> keyList) {
-		if ((data.indexOf('#') == -1) && (data.indexOf('%') == -1))
-			keyList.add(data);
-
-		for (PanelNode child : children) {
-			child.getKeyList(keyList);
-		}
-	}
-}
Index: ../trunk-jpl/src/java/src/resources/icons/mydocuments.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/readme.txt
===================================================================
--- ../trunk-jpl/src/java/src/resources/icons/readme.txt	(revision 18297)
+++ ../trunk-jpl/src/java/src/resources/icons/readme.txt	(revision 18298)
@@ -1,10 +0,0 @@
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-This copyright and license notice covers the images in this directory.
-************************************************************************
-
-TITLE:	Crystal Project Icons
-AUTHOR:	Everaldo Coelho
-SITE:	http://www.everaldo.com
-CONTACT: everaldo@everaldo.com
-
-Copyright (c)  2006-2007  Everaldo Coelho.
Index: ../trunk-jpl/src/java/src/resources/icons/kghostview.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/file_ops.xcf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/filesave.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/viewmag.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/ini_open.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/fileopen.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/xml_open.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/filesaveas.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/opensettings.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/reset.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/icons/advancedsettings.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/config_schema-0.1.1.xsd
===================================================================
--- ../trunk-jpl/src/java/src/resources/config_schema-0.1.1.xsd	(revision 18297)
+++ ../trunk-jpl/src/java/src/resources/config_schema-0.1.1.xsd	(revision 18298)
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-*   
-*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*    	
-* -->
-<xsd:schema version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <xsd:element name="inishell_config" type="general" />
-  
-  <xsd:complexType name="general">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="parameter" type="parametertype" />
-      <xsd:element name="parametergroup" type="pargroup" />
-      <xsd:element name="include" type="pathonly" /> 
-      <xsd:element name="frame" type="framegroup" /> 
-    </xsd:choice>
-    <xsd:attribute name="application" />
-  </xsd:complexType>
-
-  <xsd:complexType name="framegroup">
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
-      <xsd:element name="parameter" type="parametertype" />
-      <xsd:element name="reference" type="nameonly" />
-      <xsd:element name="section" type="nameonly"/>
-    </xsd:choice>
-    <xsd:attribute name="key" />
-    <xsd:attribute name="label" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="parametertype">
-    <xsd:complexContent>
-      <xsd:extension base="parbasetype">
-		<xsd:attribute name="key" type="xsd:string" use="required"/> 
-		<xsd:attribute name="default" type="xsd:string" />
-		<xsd:attribute name="counter" type="xsd:integer" />
-      </xsd:extension>
-    </xsd:complexContent>		
-  </xsd:complexType>
-  
-  <xsd:complexType name="nameonly">
-	<xsd:attribute name="name" />   
-  </xsd:complexType>
-
-  <xsd:complexType name="optionvalue">
-	<xsd:attribute name="value" />   
-  </xsd:complexType>
-
-  <xsd:complexType name="pathonly">
-	<xsd:attribute name="path" />   
-  </xsd:complexType>
-  
-  <xsd:complexType name="pargroup">
-	<xsd:choice minOccurs="1" maxOccurs="unbounded">
-	  <xsd:element name="parameter" type="parametertype" />
-	  <xsd:element name="reference" type="nameonly" />
-	  <xsd:element name="option" type="optionvalue" />
-	  <xsd:element name="frame" type="framegroup" /> 
-	</xsd:choice>
-	<xsd:attribute name="name" />
-  </xsd:complexType>
-
-  <xsd:complexType name="parbasetype">
-	<xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="section" type="nameonly"/>
-	  </xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="replace" type="nameonly"/>
-	  </xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="parameter" type="parametertype" />
-	  </xsd:sequence>
-	  <xsd:choice minOccurs="0" maxOccurs="unbounded">				
-		<xsd:element name="option" minOccurs="0">
-		  <xsd:complexType>
-			<xsd:complexContent>
-			  <xsd:extension base="parbasetype">
-				<xsd:attribute name="value" type="xsd:string" use="required" />
-				<xsd:attribute name="label" type="xsd:string" use="optional" />
-				<xsd:attribute name="default" type="xsd:boolean" use="optional"/>
-			  </xsd:extension>
-			</xsd:complexContent>
-		  </xsd:complexType>
-		</xsd:element>
-	  </xsd:choice>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="reference" type="nameonly" />
-	  </xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="help" type="helptype"/>	
-	  </xsd:sequence>
-	</xsd:sequence>
-	
-	<xsd:attribute name="type" use="required">
-	  <xsd:simpleType>
-		<xsd:restriction base="xsd:string">
-		  <xsd:enumeration value="integer" />
-		  <xsd:enumeration value="integer+" />
-		  <xsd:enumeration value="decimal" />
-		  <xsd:enumeration value="path" />
-		  <xsd:enumeration value="file" />
-		  <xsd:enumeration value="choice" />
-		  <xsd:enumeration value="alternative" />
-		  <xsd:enumeration value="dropdown" />
-		  <xsd:enumeration value="string" />
-		  <xsd:enumeration value="combination" />
-		  <xsd:enumeration value="selector" />
-		</xsd:restriction>
-	  </xsd:simpleType>
-	</xsd:attribute>
-	
-	<xsd:attribute name="maximum" type="xsd:integer"/>
-	<xsd:attribute name="minimum" type="xsd:integer"/>
-	<xsd:attribute name="template" type="xsd:boolean" default="false" use="optional" />
-	<xsd:attribute name="optional" type="xsd:boolean" default="true" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="needstype">
-	<xsd:attribute name="type" type="xsd:string" use="required" />
-	<xsd:attribute name="name" type="xsd:string" use="required" />
-	
-	<xsd:attribute name="value" />
-	<xsd:attribute name="optional" type="xsd:boolean" />
-	<xsd:attribute name="minoccur" type="xsd:integer" />
-	<xsd:attribute name="maxoccur" type="xsd:string" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="baseType">
-	<xsd:sequence minOccurs="0" maxOccurs="1">
-	  <xsd:element name="help" type="helptype" />		
-	</xsd:sequence>
-	<xsd:attribute name="key" type="xsd:string" use="required" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="helptype" mixed="true">
-	<xsd:choice minOccurs="0" maxOccurs="unbounded">
-	  <xsd:element name="section" type="nameonly" />
-	  <xsd:element name="replace" type="nameonly" />
-	</xsd:choice>
-  </xsd:complexType> 
-</xsd:schema>
Index: ../trunk-jpl/src/java/src/resources/document-open-2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/document-preview.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/document-export-4.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/src/resources/config_schema.xsd
===================================================================
--- ../trunk-jpl/src/java/src/resources/config_schema.xsd	(revision 18297)
+++ ../trunk-jpl/src/java/src/resources/config_schema.xsd	(revision 18298)
@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-*   
-*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*    	
-* -->
-
-<xsd:schema version="1.0"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <xsd:element name="inishell_config" type="general" />
-  
-	<xsd:complexType name="general">
-      <xsd:choice maxOccurs="unbounded">
-			<xsd:element name="parameter" type="parametertype" />
-			<xsd:element name="parametergroup" type="pargroup" />
-			<xsd:element name="include" type="pathonly" /> 
-      </xsd:choice>
-	  <xsd:attribute name="application" />
-    </xsd:complexType>
-	
-	<xsd:complexType name="parametertype">
-		<xsd:complexContent>
-			<xsd:extension base="parbasetype">
-				<xsd:attribute name="key" type="xsd:string" use="required"/> 
-				<xsd:attribute name="default" type="xsd:string" />
-				<xsd:attribute name="counter" type="xsd:integer" />
-			</xsd:extension>
-		</xsd:complexContent>		
-	</xsd:complexType>
-   
-   <xsd:complexType name="nameonly">
-		<xsd:attribute name="name" />   
-   </xsd:complexType>
-   
-   <xsd:complexType name="pathonly">
-		<xsd:attribute name="path" />   
-   </xsd:complexType>
-   
-	<xsd:complexType name="pargroup">
-		<xsd:choice minOccurs="1" maxOccurs="unbounded">
-			<xsd:element name="parameter" type="parametertype" />
-			<xsd:element name="reference" type="nameonly" />
-		</xsd:choice>
-		<xsd:attribute name="name" />
-	</xsd:complexType>
-  
-	
-	<xsd:complexType name="parbasetype">
-		<xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="section" type="nameonly"/>
-			</xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="replace" type="nameonly"/>
-			</xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="parameter" type="parametertype" />
-			</xsd:sequence>
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">				
-				<xsd:element name="option" minOccurs="0">
-					<xsd:complexType>
-						<xsd:complexContent>
-							<xsd:extension base="parbasetype">
-								<xsd:attribute name="value" type="xsd:string" use="required" />
-								<xsd:attribute name="label" type="xsd:string" use="optional" />
-								<xsd:attribute name="default" type="xsd:boolean"/>
-							</xsd:extension>
-						</xsd:complexContent>
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:choice>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="reference" type="nameonly" />
-			</xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="help" type="helptype"/>	
-			</xsd:sequence>
-		</xsd:sequence>
-		
-		<xsd:attribute name="type" use="required">
-		     <xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="integer" />
-					<xsd:enumeration value="integer+" />
-					<xsd:enumeration value="decimal" />
-					<xsd:enumeration value="path" />
-					<xsd:enumeration value="file" />
-					<xsd:enumeration value="choice" />
-					<xsd:enumeration value="alternative" />
-					<xsd:enumeration value="string" />
-					<xsd:enumeration value="combination" />
-					<xsd:enumeration value="selector" />
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		
-		<xsd:attribute name="maximum" type="xsd:integer"/>
-		<xsd:attribute name="minimum" type="xsd:integer"/>
-		<xsd:attribute name="template" type="xsd:boolean" default="false" use="optional" />
-		<xsd:attribute name="optional" type="xsd:boolean" default="true" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="needstype">
-		<xsd:attribute name="type" type="xsd:string" use="required" />
-		<xsd:attribute name="name" type="xsd:string" use="required" />
-	
-		<xsd:attribute name="value" />
-		<xsd:attribute name="optional" type="xsd:boolean" />
-		<xsd:attribute name="minoccur" type="xsd:integer" />
-		<xsd:attribute name="maxoccur" type="xsd:string" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="baseType">
-		<xsd:sequence minOccurs="0" maxOccurs="1">
-			<xsd:element name="help" type="helptype" />		
-		</xsd:sequence>
-		<xsd:attribute name="key" type="xsd:string" use="required" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="helptype" mixed="true">
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:element name="section" type="nameonly" />
-			<xsd:element name="replace" type="nameonly" />
-		</xsd:choice>
-	</xsd:complexType>
-	
-</xsd:schema>
Index: ../trunk-jpl/src/java/src/resources/default_config.xml
===================================================================
--- ../trunk-jpl/src/java/src/resources/default_config.xml	(revision 18297)
+++ ../trunk-jpl/src/java/src/resources/default_config.xml	(revision 18298)
@@ -1,919 +0,0 @@
-<inishell_config application="Meteo IO">
-
-	<!-- General Parameters -->
-	<parameter key="BUFF_CHUNK_SIZE" type="integer" default="30">
-		<section name="general" />
-		<help>Size in days of a chunk of data to read at once.</help>
-	</parameter>
-
-	<parameter key="BUFF_BEFORE" type="decimal" default="1.5">
-		<section name="general" />
-		<help>Alternate way of buffer centering: When rebuffering, the new date will be located BUFF_BEFORE days from the
-		beginning of the buffer (therefore, it takes a value in days).</help>
-	</parameter>
-
-	<!-- Coordinate systems, time zones -->
-	<parameter key="COORDSYS" type="alternative" optional="false">
-		<section name="input" />
-		<section name="output" />
-		<option value="CH1903" type="string" default="true">
-			<help>coordinates in the Swiss Grid &lt;a href="http://geomatics.ladetto.ch/ch1903_wgs84_de.pdf"&gt;http://geomatics.ladetto.ch/ch1903_wgs84_de.pdf&lt;/a&gt;</help>
-		</option>
-		<option value="UTM" type="string">
-			<parameter key="COORDPARAM" type="string">
-				<help>specify the zone with the zone letter (for example, 32T)</help>
-			</parameter>
-			<help>UTM coordinates, see &lt;a href="http://www.oc.nps.edu/oc2902w/maps/utmups.pdf"&gt;http://www.oc.nps.edu/oc2902w/maps/utmups.pdf&lt;/a&gt;</help>
-		</option>
-		<option value="UPS" type="string">
-			<parameter key="COORDPARAM" type="string">
-				<help>specify the hemisphere (either N or S)</help>
-			</parameter>
-			<help>Universal Polar Stereographic coordinates, see &lt;a href="https://en.wikipedia.org/wiki/Universal_Polar_Stereographic_coordinate_system"&gt;https://en.wikipedia.org/wiki/Universal_Polar_Stereographic_coordinate_system&lt;/a&gt;</help>
-		</option>
-		<option value="PROJ4" type="string">
-			<parameter key="COORDPARAM" type="string" optional="false" />
-			<help>external library: see &lt;a href="http://trac.osgeo.org/proj/"&gt;http://trac.osgeo.org/proj/&lt;/a&gt;</help>
-		</option>
-		<option value="LOCAL"  type="string">
-			<help>uses the horizontal and vertical distance from a reference point</help>
-		</option>
-		<help>coordinate system</help>
-	</parameter>
-
-	<parameter key="TIME_ZONE" type="integer+" default="+1" maximum="14" minimum="-12" optional="false">
-		<section name="input" />
-		<section name="output" />
-	</parameter>
-
-	<!-- Datatypes: special pts -->
-	<parameter key="SPECIALPTS" type="alternative">
-		<section name="input" />
-		<option value="A3D" type="string">
-			<parameter key="SPECIALPTSFILE" type="file" optional="false">
-				<help>a path+file name to the a file containing grid coordinates of special points of interest (for special outputs)</help>
-			</parameter>
-		</option>
-		<option value="SMET" type="string">
-			<parameter key="SPECIALPTSFILE" type="file" optional="false">
-				<help>a path+file name to the a file containing grid coordinates of special points of interest (for special outputs)</help>
-			</parameter>
-		</option>
-	</parameter>
-
-	<!-- Datatypes: Meteo Data -->
-	<parameter key="METEO" type="alternative">
-		<section name="input" />
-		<section name="output" />
-
-		<option value="A3D" type="string">
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string containing the path to the meteorological files</help>
-			</parameter>
-		</option>
-		<option value="BORMA" type="string">
-			<section name="input" />
-			<reference name="BORMA" />
-		</option>
-		<option value="COSMO" type="string">
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string containing the path to the meteorological files</help>
-			</parameter>
-		</option>
-		<option value="GEOTOP" type="string">
-			<section name="input" />
-			<reference name="GEOTOP_IN" />
-		</option>
-		<option value="GEOTOP" type="string">
-			<section name="output" />
-			<reference name="GEOTOP_OUT" />
-		</option>
-		<option value="GRIB" type="string">
-			<section name="input" />
-			<reference name="GRIB_METEO" />
-		</option>
-		<option value="GSN" type="string">
-			<section name="input" />
-			<reference name="GSN" />
-		</option>
-		<option value="IMIS" type="string">
-			<section name="input" />
-			<reference name="IMIS" />
-		</option>
-		<option value="SMET" type="string">
-			<section name="input" />
-			<reference name="SMET_IN" />
-		</option>
-		<option value="SMET" type="string">
-			<section name="output" />
-			<reference name="SMET_OUT" />
-		</option>
-		<option value="SNOWPACK" type="string">
-			<section name="input" />
-			<reference name="SNIO_IN" />
-		</option>
-		<option value="SNOWPACK" type="string">
-			<section name="output" />
-			<parameter key="METEOPATH" type="path" optional="false">
-				<help>string representing path where SNOWPACK files should be saved</help>
-			</parameter>
-		</option>
-
-		<help>plugin for METEO data </help>
-	</parameter>
-
-	<parameter key="Add Meteo parameter copy" type="selector">
-		<section name="input"/>
-		<parameter key="COPY::%" type="string" optional="false" template="true">
-		  <help>The name of the parameter to copy (e.g. TA, RH, VW, ISWR, etc)</help>
-		</parameter>
-	</parameter>
-
-	<!-- Datatypes: DEM -->
-	<frame key="dem_frame" label="Digital Elevation Model">
-	<section name="input"/>
-		<parameter key="DEM" type="alternative">
-			<section name="input" />
-			<option value="ARC" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-			</option>
-			<option value="ARPS" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-				<parameter key="ARPS_XCOORD" type="decimal" optional="false">
-					<help>x coordinate of the lower left corner of the grids</help>
-				</parameter>
-				<parameter key="ARPS_YCOORD" type="decimal" optional="false">
-					<help>y coordinate of the lower left corner of the grids</help>
-				</parameter>
-			</option>
-			<option value="GRASS" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-			</option>
-			<option value="GRIB" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-				<parameter key="GRIB_DEM_UPDATE" type="alternative" optional="true">
-					<option value="TRUE" type="string" />
-					<option value="FALSE" type="string" />
-					<help>recompute slope/azimuth from the elevations when reading a DEM (default=false, that is we use the slope and azimuth included in the GRIB file)</help>
-				</parameter>
-			</option>
-			<option value="PGM" type="string">
-				<parameter key="DEMFILE" type="file" optional="false">
-					<help>For reading the data as a DEMObject</help>
-				</parameter>
-				<reference name="PGM_IN" />
-			</option>
-
-			<help>plugin for Digital Elevation Model data </help>
-		</parameter>
-	</frame>
-
-	<!-- Datatypes: Landuse -->
-	<parameter key="LANDUSE" type="alternative">
-		<section name="input" />
-		<option value="ARC" type="string">
-			<parameter key="LANDUSEFILE" type="file" optional="false">
-				<help>File containing a grid of landuse codes</help>
-			</parameter>
-		</option>
-
-		<help>plugin for land cover data </help>
-	</parameter>
-
-	<!-- Datatypes: Grids -->
-	<parameter key="GRID2D" type="alternative">
-		<section name="input" />
-		<section name="output" />
-		<option value="ARC" type="string">
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="ARC" />
-		</option>
-		<option value="ARPS" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="ARPS" />
-		</option>
-		<option value="GRASS" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-		</option>
-		<option value="GRIB" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="GRIB_GRIDS" />
-		</option>
-		<option value="PGM" type="string">
-			<section name="input" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="PGM_IN" />
-		</option>
-		<option value="PGM" type="string">
-			<section name="output" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-		</option>
-		<option value="PNG" type="string">
-			<section name="output" />
-			<parameter key="GRID2DPATH" type="path" optional="false">
-				<help>string representing path where grid files should be read from</help>
-			</parameter>
-			<reference name="PNG" />
-		</option>
-		<help>plugin for 2D gridded data </help>
-	</parameter>
-
-	<!--Parameter group for list of stations -->
-	<parametergroup name="stationgroup_files">
-		<parameter key="STATION#" type="file" counter="1" optional="false">
-			<help>filename for station number # </help>
-		</parameter>
-	</parametergroup>
-	<parametergroup name="stationgroup_names">
-		<parameter key="STATION#" type="string" counter="1" optional="false">
-			<help>station id for the given station number # </help>
-		</parameter>
-	</parametergroup>
-	<parametergroup name="stationgroup_pos">
-		<parameter key="STATION#" type="string" counter="1">
-			<help>Coordinates are given as "lat lon" or "xcoord ycoord epsg_code"</help>
-		</parameter>
-	</parametergroup>
-
-	<!-- Plugins for Meteo Data-->
-	<parametergroup name="BORMA">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the xml files</help>
-		</parameter>
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="IMIS">
-		<parameter key="DBNAME" type="string" optional="false">
-			<help>database name, as provided by your database administrator</help>
-		</parameter>
-		<parameter key="DBUSER" type="string" optional="false">
-			<help>database user name</help>
-		</parameter>
-		<parameter key="DBPASS" type="string" optional="false">
-			<help>database password associated with the user name</help>
-		</parameter>
-		<parameter key="USEANETZ" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: use ANETZ stations to provide precipitations for normal IMIS stations.
-		  Each IMIS station is associated with one or two ANETZ stations and does a weighted
-		  average to get what should be its local precipitations</help>
-		</parameter>
-		<parameter key="USE_IMIS_HNW" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: if set to false (default), all IMIS precipitation will be deleted (since IMIS stations don't have heated rain gauges, their precipitation measurements are not good in winter conditions). If set to true, it is strongly advised to use a FilterHNWMelt filter to detect snow melting in the rain gauge and perform winter conditions detection in the application.</help>
-		</parameter>
-		<parameter key="USE_SNOWPACK_HNW" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>if set to true, the SNOWPACK simulated Snow Water Equivalent from the database will be used to compute HNW. Data gaps greater than 3 hours on SWE will lead to unchanged hnw while all data that can properly be computed will overwrite hnw. (default=false)</help>
-		</parameter>
-
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="GRIB_METEO">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the grib files</help>
-		</parameter>
-		<parameter key="METEOEXT" type="string" optional="true">
-			<help>grib file extension, or none for no file extension (default: .grb)</help>
-		</parameter>
-
-		<reference name="stationgroup_pos" />
-	</parametergroup>
-
-	<parametergroup name="GEOTOP_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the data files</help>
-		</parameter>
-		<parameter key="METAFILE" type="file" optional="false">
-			<help>absolute filename of the geotop.inpts file</help>
-		</parameter>
-		<parameter key="METEOPREFIX" type="string" optional="true">
-			<help>prefix to append when generating a file name for reading</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="GEOTOP_OUT">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the data files</help>
-		</parameter>
-		<parameter key="METEOSEQ" type="string" optional="false">
-			<help>specifiy in which order the columns should be printed out</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="GSN">
-		<parameter key="ENDPOINT" type="string" optional="false">
-			<help>webserver running GSN with its port number and full path. For example:
-			http://montblanc.slf.ch:22001/services/A3DWebService</help>
-		</parameter>
-		<parameter key="PROXY" type="string" optional="true">
-			<help>Should the connection go through a proxy? This is useful for servers
-			filtering on domains but usually not necessary.</help>
-		</parameter>
-		<parameter key="PROXYPORT" type="string" optional="true" />
-		<parameter key="PROXYUSER" type="string" optional="true" />
-		<parameter key="PROXYPASS" type="string" optional="true" />
-
-		<reference name="stationgroup_names" />
-	</parametergroup>
-
-	<parametergroup name="SMET_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the smet files</help>
-		</parameter>
-		<reference name="stationgroup_files" />
-	</parametergroup>
-
-	<parametergroup name="SMET_OUT">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string representing path where SMET files should be saved</help>
-		</parameter>
-		<parameter key="METEOPARAM" type="alternative">
-		  <option value="ASCII" type="string" default="true">
-		    <help>Write ASCII SMET files</help>
-		  </option>
-		  <option value="BINARY" type="string">
-		    <help>Write BINARY SMET files</help>
-		  </option>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="SNIO_IN">
-		<parameter key="METEOPATH" type="path" optional="false">
-			<help>string containing the path to the SNOWPACK files</help>
-		</parameter>
-		<parameter key="METAFILE" type="file" optional="true">
-			<help>filename of the meta data file (in METEOPATH)</help>
-		</parameter>
-
-		<parameter key="NUMBER_MEAS_TEMPERATURES" type="integer+" minimum="0" default="0">
-		  <help>the number of measured snow temperatures provided</help>
-		</parameter>
-
-		<parameter key="NUMBER_OF_SOLUTES" type="integer+" minimum="0" default="0">
-		  <help>the number of solutes for which input data are provided</help>
-		</parameter>
-
-		<parameter key="RSWR_INP" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		</parameter>
-		<parameter key="ISWR_INP" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		</parameter>
-		<parameter key="VW_DRIFT" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: wind velocity to use for blowing and drifting snow is provided</help>
-		</parameter>
-		<parameter key="RHO_HN" type="alternative" optional="true">
-		  <option value="TRUE" type="string" />
-		  <option value="FALSE" type="string" />
-		  <help>OPTIONAL: measured new snow density is provided</help>
-		</parameter>
-
-		<reference name="stationgroup_files" />
-	</parametergroup>
-
-	<!-- Plugins for Gridded Data-->
-	<parametergroup name="ARC">
-		<parameter key="A3D_VIEW" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate names compatible with Alpine3D's grid viewer?</help>
-		</parameter>
-		<parameter key="GRID2DEXT" type="string" optional="true">
-			<help>grid file extension, or none for no file extension (default: .asc)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="ARPS">
-		<parameter key="ARPS_XCOORD" type="decimal" optional="false">
-			<help>x coordinate of the lower left corner of the grids</help>
-		</parameter>
-		<parameter key="ARPS_YCOORD" type="decimal" optional="false">
-			<help>y coordinate of the lower left corner of the grids</help>
-		</parameter>
-		<parameter key="GRID2DEXT" type="string" optional="true">
-			<help>grid file extension, or none for no file extension (default: .asc)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="GRIB_GRIDS">
-		<parameter key="GRID2DPREFIX" type="string" optional="true">
-			<help>prefix to append when generating a file name for reading (ie: something like "laf" for Cosmo-Analysis-full domain)</help>
-		</parameter>
-		<parameter key="GRID2DEXT" type="string" optional="true">
-			<help>grib file extension, or none for no file extension (default: .grb)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="PNG">
-		<parameter key="PNG_WORLD_FILE" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate a world file for each output file? This file contains the geolocalization information</help>
-		</parameter>
-		<parameter key="PNG_LEGEND" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate a legend?</help>
-		</parameter>
-		<parameter key="PNG_AUTOSCALE" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>autoscale color scale?</help>
-		</parameter>
-		<parameter key="PNG_SCALING" type="alternative" optional="true">
-			<option value="nearest" type="string" />
-			<option value="bilinear" type="string" />
-			<help>scaling algorithm (default=bilinear)</help>
-		</parameter>
-		<parameter key="PNG_MIN_SIZE" type="string" optional="false">
-			<help>minimum dimensions of the PNG, like 640x480</help>
-		</parameter>
-		<parameter key="PNG_MAX_SIZE" type="string" optional="false">
-			<help>maximum dimensions of the PNG, like 1024x768</help>
-		</parameter>
-		<parameter key="PNG_INDEXED" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>generate a color indexed file (default=true)</help>
-		</parameter>
-		<parameter key="PNG_SPEED_OPTIMIZE" type="alternative" optional="true">
-			<option value="TRUE" type="string" />
-			<option value="FALSE" type="string" />
-			<help>optimize for speed (default=false)</help>
-		</parameter>
-		<parameter key="PNG_NR_LEVELS" type="integer+" default="+30" maximum="255" minimum="6" optional="true">
-			<help>number of colors in the palette (default=30)</help>
-		</parameter>
-	</parametergroup>
-
-	<parametergroup name="PGM_IN">
-		<parameter key="PGM_XCOORD" type="decimal" optional="false">
-			<help>lower left x coordinate</help>
-		</parameter>
-		<parameter key="PGM_YCOORD" type="decimal" optional="false">
-			<help>lower left y coordinate</help>
-		</parameter>
-		<parameter key="PGM_CELLSIZE" type="decimal" optional="false">
-			<help>cellsize in meters</help>
-		</parameter>
-		<parameter key="PGM_MIN" type="decimal" optional="false">
-			<help>minimum value in real world coordinates to match with the minimum value read out of the PGM file (such minimum being greater than 0 because 0 is NODATA)</help>
-		</parameter>
-		<parameter key="PGM_MAX" type="decimal" optional="false">
-			<help>maximum value in real world coordinates to match with the maximum value read out of the PGM file</help>
-		</parameter>
-	</parametergroup>
-
-	<!-- Meteo Parameters for Filters, resampling, spatial interpolations-->
-	<parametergroup name="METEOIOPARAMETERS">
-		<option value="TA"/>
-		<option value="RH"/>
-		<option value="VW"/>
-		<option value="DW"/>
-		<option value="VW_MAX"/>
-		<option value="ISWR"/>
-		<option value="RSWR"/>
-		<option value="ILWR"/>
-		<option value="HS"/>
-		<option value="HNW"/>
-		<option value="TSG"/>
-		<option value="TSS"/>
-		<option value="P"/>
-	</parametergroup>
-
-	<!-- Filters -->
-	<parameter key="Add/Remove Filter" type="selector">
-		<section name="filters" />
-
-		<parameter key="%::filter#" type="alternative" counter="1" template="true">
-			<section name="filters" />
-
-			<option label="MeanAvg" value="mean_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Mean average processing. The mean average filter returns the mean value of all values within a user given time window.</help>
-			</option>
-
-			<option label="MedianAvg" value="median_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="decimal" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Median average processing. The median average filter returns the median value of all values within a user given time window.</help>
-			</option>
-
-			<option label="Std Deviation Filter" value="std_dev" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Standard deviation filter. Values outside of mean ± 2 std_dev are rejected.</help>
-			</option>
-
-			<option label="MAD" value="mad" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Median Absolute Deviation. Values outside of median ± 3 σ_MAD are rejected. &lt;br&gt;
-			  See http://en.wikipedia.org/wiki/Median_absolute_deviation for more information.</help>
-			</option>
-
-			<option label="Tukey 53H Filter" value="Tukey" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      The keyword "soft" maybe added, if the window position is allowed to be adjusted to the data present.
-			      The two arguments may be preceded by the keywords "left", "center" or "right", indicating the window position.
-			    </help>
-			  </parameter>
-			  <help>Tukey 53H method A smooth time sequence is generated from the median, substracted from the original signal and
-			  compared with the standard deviation. see "Despiking Acoustic Doppler Velocimeter Data", Derek G. Goring and Vladimir
-			  L. Nikora, Journal of Hydraulic Engineering, 128, 1, 2002 The deviation factor coeffecient is currently hard-coded as k=1.5. </help>
-			</option>
-
-			<option label="Wind Averaging Filter" value="wind_avg" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			    </help>
-			  </parameter>
-			  <help>Wind vector averaging. This calculates the vector average over a user given time period. Each wind vector
-			  within this period is added and the final sum is normalized by the number of vectors that have been added. </help>
-			</option>
-
-			<option label="Exponential Smoothing" value="exp_smoothing" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <option label="alpha:" value="0.8" type="decimal" minimum="0" maximum="1"/>
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			      Alpha needs to be provided as last argument. Please note that the standard filter works with a left window!
-			    </help>
-			  </parameter>
-			  <help>Exponential smooting processing, exponential moving average s_0 = x_0 s_n = alpha*x_(t-1) + (1-alpha)*s_t-1</help>
-			</option>
-
-			<option label="Weighted Moving Average Smoothing" value="wma_smoothing" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option value="center" type="dropdown">
-			      <option value="left" type="string" />
-			      <option value="center" type="string" />
-			      <option value="right" type="string" />
-			    </option>
-			    <option label="# of points:" value="1" type="integer" minimum="1" />
-			    <option label="Duration:" value="0" type="integer" minimum="0" />
-			    <help>
-			      Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
-			      Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
-			      Please note that the standard filter works with a left window!
-			    </help>
-			  </parameter>
-			  <help>Weighted moving average smoothing such as: WMA = (1*X1 + 2*X2 + ... + n*Xn) / sum_of_weights</help>
-			</option>
-
-			<option label="Min Range Filter" value="min" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Min:" value="" type="decimal" />
-			    <option label="Adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data smaller than the min would be
-			    assigned the minimum permissible value or another value given as an extra argument</help>
-			  </parameter>
-			  <help>Min range filter. Reject all values smaller than the min.</help>
-			</option>
-
-			<option label="Max Range Filter" value="max" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Max:" value="" type="decimal" />
-			    <option label="Adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data greater than the max would be
-			    assigned the maximum permissible value or another value given as an extra argument</help>
-			  </parameter>
-			  <help>Max range filter. Reject all values greater than the max.</help>
-			</option>
-
-			<option label="MinMax (2 or 4 arguments)" value="min_max" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="Min:" value="" type="decimal" />
-			    <option label="Max:" value="" type="decimal" />
-			    <option label="Min adjust to:" value="" type="decimal" />
-			    <option label="Max adjust to:" value="" type="decimal" />
-			    <help>The keyword "soft" maybe added, in such a case all data greater than the max would be assigned
-			    the maximum permissible value and all data smaller than the min would be assigned the minimum
-			    permissible value or an optional extra set of two user provided values</help>
-			  </parameter>
-			  <help>Reject all values greater than the max or smaller than the min. &lt;br&gt;</help>
-			</option>
-
-			<option label="Rate Filter (1 argument)" value="rate" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="Max:" value="1.0" type="decimal" minimum="0" maximum="1" />
-			    <help>the absolute value of the maximum permissible rate of change (per seconds)</help>
-			  </parameter>
-			  <help>Rate of change filter. Calculate the change rate (ie: slope) between two points, if it is above a user given value, reject the point.</help>
-			</option>
-
-			<option label="Rate Filter (2 arguments)" value="rate" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="Min:" value="0.0" type="decimal" minimum="0" maximum="1" />
-			    <option label="Max:" value="1.0" type="decimal" minimum="0" maximum="1" />
-			    <help>the minimum and maximum permissible rate of change (per second)</help>
-			  </parameter>
-			  <help>Rate of change filter. Calculate the change rate (ie: slope) between two points, if it is above a user given value, reject the point.</help>
-			</option>
-
-			<option label="Unheated Rain Gauge Filter" value="Unheated_RainGauge" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option value="soft" type="choice" />
-			    <option label="RH threshold:" value="0.5" type="decimal" minimum="0" maximum="1" />
-			    <option label="Delta_T threshold:" value="3.0" type="decimal" minimum="0" maximum="20" />
-			  </parameter>
-			  <help>Filters out snow melting in an unheated rain gauge. This filter can ONLY be applied to precipitation. Non-zero measurements are accepted only if they take place when the relative humidity is greater than RH_threshold and (TA-TSS) smaller than Delta_T_threshold, otherwise they get reset to 0. If none of these conditions could be tested (for lack of data), then the precipitation is reset to nodata (or left unchanged if "soft" has been selected).</help>
-			</option>
-
-			<option label="WMO Undercatch Filter" value="undercatch_wmo" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option value="Gage type" type="dropdown">
-					<option value="Nipher" type="string" />
-					<option value="Tretyakov" type="string" />
-					<option value="US8sh" type="string" />
-					<option value="US8unsh" type="string" />
-					<option value="Hellmann" type="string" />
-					<option value="Hellmannsh" type="string" />
-				</option>
-			  </parameter>
-			  <help>This implements the standard methods for precipitation correction as described in "WMO Solid Precipitation Measurement Intercomparison", B. Goodison, P. Louie and D. Yang, 872, 1998 as well as the overview given by "Literature Study on the Correction of Precipitation Measurements", Annette Wagner, 2009. The correction parameters for the shielded Hellmann gauge (German version) are from "Wind-induced Precipitation Undercatch of the Hellmann Gauges", Daqing Yang et al, Nordic Hydrology, 30, 1999, pp 57-80.</help>
-			</option>
-
-			<option label="WMO Undercatch Filter - simplified" value="undercatch_wmo" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option value="Kind" type="dropdown">
-					<option value="Cst" type="string" />
-				</option>
-				<option label="Snow factor:" value="1.3" type="decimal" minimum="0" maximum="5" />
-				<option label="Mixed prec factor:" value="1.1" type="decimal" minimum="0" maximum="5" />
-			  </parameter>
-			  <help>This applies a constant correction factor to the precipitation, one for pure snow and one for mixed precipitation. The following thresholds are used: pure snow below -2 C; mixed precipitation between -2 and +2 C; pure rain above 2 C. These threshold can be changed (see online documentation).</help>
-			</option>
-
-			<option label="Unventillated temperature sensor" value="Unventilated_T" type="string">
-			  <parameter key="%::arg#" type="combination">
-			    <option label="albedo:" value="0.23" type="decimal" />
-			    <option value="soft" type="choice" />
-			    <help>If the "soft" option is given, the albedo has a value different according to snow (or no snow) on the ground</help>
-			  </parameter>
-			  <help>This implements the correction described in (Reina Nakamura, 2005) with an albedo dependency as introduced in (Huwald, 2009)</help>
-			</option>
-
-			<option label="Add an offset" value="add" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option label="offset:" value="0." type="decimal" />
-			  </parameter>
-			  <help>This adds a given offset to the data.</help>
-			</option>
-
-			<option label="Multiply by a factor" value="mult" type="string">
-			  <parameter key="%::arg#" type="combination">
-				<option label="factor:" value="1." type="decimal" />
-			  </parameter>
-			  <help>This multiplies the data by a given factor.</help>
-			</option>
-
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-
-	<!-- 1D Interpolation -->
-	<parameter key="WINDOW_SIZE" type="integer+" minimum="1" default="43200">
-		<section name="Interpolations1D" />
-		<help>Affects resampling: expresses (in seconds) how far a valid point can be
-		searched for when re-interpolating a missing value</help>
-	</parameter>
-
-	<parameter key="Add/Remove 1D Interpolation" type="selector">
-		<section name="Interpolations1D" />
-
-		<parameter key="%::resample" type="alternative" template="true">
-			<section name="Interpolations1D" />
-			<option label="No Interpolation" value="none" type="string" />
-			<option label="Nearest Neighbour" value="nearest_neighbour" type="string" />
-			<option label="Linear" value="linear" type="string">
-			  <parameter key="%::args" type="combination">
-			    <option value="extrapolate" type="choice" />
-			    <help>
-			      If "extrapolate" is added, then data *outside* of the original date range can be interpolated.
-			      Otherwise, a data point will only be calculated between the original date range.
-			    </help>
-			  </parameter>
-			  <help>Mean average processing. The mean average filter returns the mean value of all values within a user given time window.</help>
-			</option>
-			<option label="Accumulate" value="accumulate" type="string">
-			  <parameter key="%::args" type="combination">
-			    <option value="strict" type="choice" />
-			    <option label="Seconds:" value="900" type="integer" minimum="1" />
-			    <help>Accumulation period (in seconds). This must usually match the model time step. if enabling "strict", nodatas will propagate (ie. a single nodata in the input will force the re-accumulated value to be nodata). Otherwise, all valid values are aggregated and only pure nodata intervals produce a nodata in the output.</help>
-			  </parameter>
-			  <help>Accumulation over a user given period (filter argument, in seconds -
-			  should coincide with your calculation step!).</help>
-			</option>
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-
-	<!-- 2D Interpolation -->
-	<parameter key="Add/Remove 2D Interpolation" type="selector">
-		<section name="Interpolations2D" />
-
-		<parameter key="%::algorithms" type="choice" template="true">
-			<section name="Interpolations2D" />
-			<option value="STD_PRESS" type="choice">
-				<help>Generate a standard atmosphere pressure as a function of the cell's elevation</help>
-			</option>
-			<option value="CST" type="choice">
-				<help>Fill the grid with the average over all the stations</help>
-			</option>
-			<option value="CST_LAPSE" type="choice">
-			  <parameter key="%::cst_lapse" type="combination">
-			    <option label="Lapse Rate:" value="0.008" type="decimal" optional="false" />
-			    <option value="" type="dropdown">
-			      <option value="" type="string" />
-			      <option value="soft" type="string" />
-			      <option value="frac" type="string" />
-			    </option>
-			  </parameter>
-			  <help>Detrend the measured data, fill the grid with the average over all the stations, reapply the elevation trend</help>
-			</option>
-			<option value="IDW" type="choice">
-				<help>Inverse Distance Weighted average</help>
-			</option>
-			<option value="IDW_LAPSE" type="choice">
-			  <parameter key="%::idw_lapse" type="combination">
-			    <option label="Lapse Rate:" value="0.008" type="decimal" optional="false" />
-			    <option value="" type="dropdown">
-			      <option value="" type="string" />
-			      <option value="soft" type="string" />
-			      <option value="frac" type="string" />
-			    </option>
-			  </parameter>
-			  <help>Detrend the measured data, apply Inverse Distance Weighted average, reapply elevation trend</help>
-			</option>
-			<option value="LIDW_LAPSE" type="choice">
-			  <parameter key="%::lidw_lapse" type="combination">
-			    <option label="Lapse Rate:" value="0.008" type="decimal" optional="false" />
-			    <option value="" type="dropdown">
-			      <option value="" type="string" />
-			      <option value="soft" type="string" />
-			      <option value="frac" type="string" />
-			    </option>
-			  </parameter>
-			  <help>Same as IDW_LAPSE, but only considering a given number of neighboring stations</help>
-			</option>
-			<option value="RH" type="choice">
-				<help>Computes the dew point temperature, distribute it with IDW_LAPSE, recompute RH at each pixel</help>
-			</option>
-			<option value="ILWR" type="choice">
-				<help>Compute emissivity, distribute it with IDW_LAPSE, recompute ILWR at each pixel</help>
-			</option>
-			<option value="WIND_CURV" type="choice">
-				<help>Distribute wind velocity with IDW_LAPSE, then apply correction factors as a function of local slope and curvature</help>
-			</option>
-			<option value="HNW_SNOW" type="choice">
-				<parameter key="%::hnw_snow" type="combination">
-				<option value="IDW_LAPSE" type="dropdown">
-					<option value="CST" type="string" />
-					<option value="CST_LAPSE" type="string" />
-					<option value="IDW" type="string" />
-					<option value="IDW_LAPSE" type="string" />
-					<option value="ODKRIG" type="string" />
-				</option>
-				<help>Base algorithm (do not forget to add the options for the base algorithm)</help>
-				</parameter>
-				<help>Distribute precipitation with a base algorithm (IDW_LAPSE by default), then reduce/remove precipitation on
-				steep slopes and correct with the local curvature. This is to simulate snow redistribution processes.</help>
-			</option>
-			<option value="USER" type="choice">
-			  <parameter key="%::user" type="path" optional="false"/>
-			  <help>User provided grids, named as {numeric date}_{capitalized meteo parameter}.asc</help>
-			</option>
-			<option value="ODKRIG" type="choice">
-			  <parameter key="%::odkrig" type="combination">
-			  	<option value="" type="dropdown">
-					<option value="LINVARIO" type="string" />
-					<option value="EXPVARIO" type="string" />
-					<option value="SPHERICVARIO" type="string" />
-					<option value="RATQUADVARIO" type="string" />
-				</option>
-				<help>Variogram model</help>
-			  </parameter>
-			  <help>Ordinary kriging (EXPERIMENTAL)</help>
-			</option>
-		</parameter>
-
-		<reference name="METEOIOPARAMETERS" />
-	</parameter>
-</inishell_config>
\ No newline at end of file
Index: ../trunk-jpl/src/java/COPYING
===================================================================
--- ../trunk-jpl/src/java/COPYING	(revision 18297)
+++ ../trunk-jpl/src/java/COPYING	(revision 18298)
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Index: ../trunk-jpl/src/java/build.xml
===================================================================
--- ../trunk-jpl/src/java/build.xml	(revision 18297)
+++ ../trunk-jpl/src/java/build.xml	(revision 18298)
@@ -1,126 +0,0 @@
-<project name="inishell" default="help" basedir=".">
-	<description>
-	Build and run the inishell Application from the command line.
-	</description>
-
-
-	<!-- set global properties for the build -->
-	<property name="src" location="src"/>
-	<property name="examples" location="doc/examples"/>
-	<property name="build" location="build"/>
-	<property name="dist"  location="dist"/>
-	<property name="lib.dir" location="lib"/>
-	<tstamp prefix="build-info">
-		<format property="date" pattern="yyyy-MM-dd" locale="en" />
-		<format property="time" pattern="HH:mm:ss" locale="en" />
-		<format property="num-date" pattern="yyyyMMdd" locale="en" />
-	</tstamp>
-	<property name="version.num" value="1.0.0" />
-	<!--<buildnumber file="dist/build.num"/>-->
-	<!--<property name="version-number" value="${version.num}-${build.number}" />-->
-	<property name="version-number" value="${version.num}" />
-	<property name="version-full" value="${version.num}-${build-info.num-date}" />
-
-	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="**/*.jar"/>
-	</path>
-
-
-	<!-- targets -->
-	<target name="help">
-		<echo>You can use the following targets:</echo>
-		<echo> </echo>
-		<echo>  help     : (default) Prints this message </echo>
-		<echo>  init     : create necessary directories</echo>
-		<echo>  clean    : Deletes work directories</echo>
-		<echo>  compile  : Compiles into class files</echo>
-		<echo>  dist     : pack all necessary files into a JAR file</echo>
-		<echo>  issm 	 : create inishell GUI using issm.xml</echo>
-		<echo>  snowpack : dist tailored for snowpack</echo>
-		<echo>  meteoio  : dist tailored for meteoio</echo>
-		<echo>  run      : run the previously compiled version</echo>
-		<echo>  pack     : pack all in a zip file for a release</echo>
-		<echo></echo>
-	</target>
-
-	<target name="init">
-		<mkdir dir="${build}"/>
-		<mkdir dir="${dist}"/>
-	</target>
-
-	<target name="snowpack" depends="init" description="Make doc/examples/snowpack_config.xml the default XML config">
-		<copy file="${examples}/snowpack_config.xml" tofile="${build}/resources/default_config.xml" overwrite="true"/>
-		<antcall target="dist"/>
-	</target>
-
-	<target name="meteoio" depends="init" description="Make doc/examples/meteoio_config.xml the default XML config">
-		<copy file="${examples}/meteoio_config.xml" tofile="${build}/resources/default_config.xml" overwrite="true"/>
-		<antcall target="dist"/>
-	</target>
-	
-	<target name="issm" depends="init" description="Make doc/examples/issm.xml the default XML config">
-		<copy file="./doc/examples/issm.xml" tofile="${build}/resources/default_config.xml" overwrite="true"/>
-		<antcall target="dist"/>
-	</target>
-
-	<target name="compile" depends="init" description="Compile from ${src} to ${build}">
-		<javac srcdir="${src}" destdir="${build}" includeantruntime="false">
-			<classpath>
-				<fileset dir="lib">
-				<include name="**/*.jar"/>
-				</fileset>
-			</classpath>
-		</javac>
-		<copy todir="${build}/resources">
-		<fileset dir="${src}/resources" includes="**"/>
-	</copy>
-	</target>
-
-	<target name="dist" depends="compile" description="generate the distribution" >
-		<!-- Create the distribution directory -->
-		<delete file="MANIFEST.MF"/>
-		<manifest file="MANIFEST.MF">
-			<attribute name="Built-By" value="${user.name}"/>
-			<attribute name="Built-On" value="${build-info.date}" />
-			<attribute name="Built-At" value="${build-info.time}" />
-			<attribute name="Main-Class" value="main/GUIBuilder"/>
-			<attribute name="Specification-Title" value="INI file generator"/>
-			<attribute name="Specification-Version" value="${version-full}"/>
-			<attribute name="Specification-Vendor" value="SLF, www.slf.ch"/>
-			<attribute name="Implementation-Title" value="INIshell ini creator"/>
-			<attribute name="Implementation-Version" value="${version-number}"/>
-			<attribute name="Implementation-Vendor" value="SLF, www.slf.ch"/>
-		</manifest>
-
-		<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-		<jar jarfile="${dist}/inishell.jar" basedir="${build}" manifest="MANIFEST.MF" index="true" >
-			<zipfileset src="${lib.dir}/miglayout-4.0.jar" includes="**/*.class"/>
-		</jar>
-	</target>
-
-	<target name="run" depends="dist">
-		<java fork="true" classname="main/GUIBuilder">
-			<classpath>
-				<path refid="classpath"/>
-				<path location="${dist}/inishell.jar"/>
-			</classpath>
-		</java>
-	</target>
-
-	<target name="clean" description="clean up" >
-		<!-- Delete the ${build} and ${dist} directory trees -->
-		<delete file="MANIFEST.MF"/>
-		<delete dir="${build}"/>
-		<delete dir="${dist}"/>
-	</target>
-
-	<target name="pack" depends="dist" description="pack for distribution">
-		<zip destfile="inishell-${version.num}.zip">
-			<zipfileset dir="doc/examples" prefix="inishell-${version.num}/doc/examples"/>
-			<zipfileset dir="dist" prefix="inishell-${version.num}/bin"/>
-			<zipfileset dir="." includes="inishell.sh" prefix="inishell-${version.num}/bin"/>
-			<zipfileset dir="." includes="Changelog_${version.num}.txt" prefix="inishell-${version.num}/doc"/>
-		</zip>
-	</target>
-
-</project>
Index: ../trunk-jpl/src/java/build/resources/document-open-2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/document-preview.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/document-export-4.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/config_schema.xsd
===================================================================
--- ../trunk-jpl/src/java/build/resources/config_schema.xsd	(revision 18297)
+++ ../trunk-jpl/src/java/build/resources/config_schema.xsd	(revision 18298)
@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-*   
-*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*    	
-* -->
-
-<xsd:schema version="1.0"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <xsd:element name="inishell_config" type="general" />
-  
-	<xsd:complexType name="general">
-      <xsd:choice maxOccurs="unbounded">
-			<xsd:element name="parameter" type="parametertype" />
-			<xsd:element name="parametergroup" type="pargroup" />
-			<xsd:element name="include" type="pathonly" /> 
-      </xsd:choice>
-	  <xsd:attribute name="application" />
-    </xsd:complexType>
-	
-	<xsd:complexType name="parametertype">
-		<xsd:complexContent>
-			<xsd:extension base="parbasetype">
-				<xsd:attribute name="key" type="xsd:string" use="required"/> 
-				<xsd:attribute name="default" type="xsd:string" />
-				<xsd:attribute name="counter" type="xsd:integer" />
-			</xsd:extension>
-		</xsd:complexContent>		
-	</xsd:complexType>
-   
-   <xsd:complexType name="nameonly">
-		<xsd:attribute name="name" />   
-   </xsd:complexType>
-   
-   <xsd:complexType name="pathonly">
-		<xsd:attribute name="path" />   
-   </xsd:complexType>
-   
-	<xsd:complexType name="pargroup">
-		<xsd:choice minOccurs="1" maxOccurs="unbounded">
-			<xsd:element name="parameter" type="parametertype" />
-			<xsd:element name="reference" type="nameonly" />
-		</xsd:choice>
-		<xsd:attribute name="name" />
-	</xsd:complexType>
-  
-	
-	<xsd:complexType name="parbasetype">
-		<xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="section" type="nameonly"/>
-			</xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="replace" type="nameonly"/>
-			</xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="parameter" type="parametertype" />
-			</xsd:sequence>
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">				
-				<xsd:element name="option" minOccurs="0">
-					<xsd:complexType>
-						<xsd:complexContent>
-							<xsd:extension base="parbasetype">
-								<xsd:attribute name="value" type="xsd:string" use="required" />
-								<xsd:attribute name="label" type="xsd:string" use="optional" />
-								<xsd:attribute name="default" type="xsd:boolean"/>
-							</xsd:extension>
-						</xsd:complexContent>
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:choice>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="reference" type="nameonly" />
-			</xsd:sequence>
-			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="help" type="helptype"/>	
-			</xsd:sequence>
-		</xsd:sequence>
-		
-		<xsd:attribute name="type" use="required">
-		     <xsd:simpleType>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="integer" />
-					<xsd:enumeration value="integer+" />
-					<xsd:enumeration value="decimal" />
-					<xsd:enumeration value="path" />
-					<xsd:enumeration value="file" />
-					<xsd:enumeration value="choice" />
-					<xsd:enumeration value="alternative" />
-					<xsd:enumeration value="string" />
-					<xsd:enumeration value="combination" />
-					<xsd:enumeration value="selector" />
-				</xsd:restriction>
-			</xsd:simpleType>
-		</xsd:attribute>
-		
-		<xsd:attribute name="maximum" type="xsd:integer"/>
-		<xsd:attribute name="minimum" type="xsd:integer"/>
-		<xsd:attribute name="template" type="xsd:boolean" default="false" use="optional" />
-		<xsd:attribute name="optional" type="xsd:boolean" default="true" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="needstype">
-		<xsd:attribute name="type" type="xsd:string" use="required" />
-		<xsd:attribute name="name" type="xsd:string" use="required" />
-	
-		<xsd:attribute name="value" />
-		<xsd:attribute name="optional" type="xsd:boolean" />
-		<xsd:attribute name="minoccur" type="xsd:integer" />
-		<xsd:attribute name="maxoccur" type="xsd:string" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="baseType">
-		<xsd:sequence minOccurs="0" maxOccurs="1">
-			<xsd:element name="help" type="helptype" />		
-		</xsd:sequence>
-		<xsd:attribute name="key" type="xsd:string" use="required" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="helptype" mixed="true">
-		<xsd:choice minOccurs="0" maxOccurs="unbounded">
-			<xsd:element name="section" type="nameonly" />
-			<xsd:element name="replace" type="nameonly" />
-		</xsd:choice>
-	</xsd:complexType>
-	
-</xsd:schema>
Index: ../trunk-jpl/src/java/build/resources/default_config.xml
===================================================================
--- ../trunk-jpl/src/java/build/resources/default_config.xml	(revision 18297)
+++ ../trunk-jpl/src/java/build/resources/default_config.xml	(revision 18298)
@@ -1,1284 +0,0 @@
-<inishell_config application="ISSM prototype">
-
-<!-- mesh -->
-<parameter key ="Dimension" type="alternative" optional="false">
-     <section name="mesh" />
-     <option value="0" type="string" default="true">
-        <help> dimension is 0 </help>
-     </option>
-     <option value="3" type="string">
-        <help> dimension is 3 </help>
-       <!-- Elements and vertices of the original 2d mesh -->
-          <parameter key ="x2d" type="double" default="N/A">
-              <help> vertices x coordinate [m] </help>
-          </parameter>
-          <parameter key ="y2d" type="double" default="N/A">
-              <help> vertices y coordinate [m] </help>
-          </parameter>
-          <parameter key ="elements2d" type="double" default="N/A">
-              <help> vertex indices of the mesh elements </help>
-          </parameter>
-          <parameter key ="numberofvertices2d" type="double" default="0">
-              <help> number of vertices </help>
-          </parameter>
-          <parameter key ="numberofelements2d" type="double" default="0">
-              <help> number of elements </help>
-          </parameter>
-     </option>
-     <help> select a mesh dimension 0(default) or 3 </help>
-</parameter>
-<frame key="1" label="Elements and vertices">
-<section name="mesh" />
-  <parameter key ="numberofelements" type="double" default="0">
-     <section name="mesh" />
-     <help> number of elements </help>
-  </parameter>
-  <parameter key ="numberofvertices" type="double" default="0">
-     <section name="mesh" />
-     <help> number of verticies </help>
-  </parameter>
-  <parameter key ="elements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertex indices of the mesh elements </help>
-  </parameter>
-  <parameter key ="x" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices x coordinate [m] </help>
-  </parameter>
-  <parameter key ="y" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices y coordinate [m] </help>
-  </parameter>
-  <parameter key ="z" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices z coordinate [m] </help>
-  </parameter>
-  <parameter key ="edges" type="double" default="N/A">
-     <section name="mesh" />
-     <help> edges of the 2d mesh (vertex1 vertex2 element1 element2) </help>
-  </parameter>
-  <parameter key ="numberofedges" type="double" default="0">
-     <section name="mesh" />
-     <help> number of edges of the 2d mesh </help>
-  </parameter>
-</frame>
-<frame key="2" label="Properties">
-<section name="mesh" />
-  <parameter key ="selected dimension" type="double" default="0">
-     <section name="mesh" />
-     <help> mesh dimension </help>
-  </parameter>
-  <parameter key ="numberoflayers" type="double" default="0">
-     <section name="mesh" />
-     <help> number of extrusion layers </help>
-  </parameter>
-  <parameter key ="vertexonbed" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower vertices flags list </help>
-  </parameter>
-  <parameter key ="elementonbed" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower elements flags list </help>
-  </parameter>
-  <parameter key ="vertexonsurface" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper vertices flags list </help>
-  </parameter>
-  <parameter key ="elementonsurface" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper element flag list </help>
-  </parameter>
-  <parameter key ="uppervertex" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper vertex list (NaN for vertex on the upper surface) </help>
-  </parameter>
-  <parameter key ="upperelements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> upper element list (NaN for element on the upper layer) </help>
-  </parameter>
-  <parameter key ="lowervertex" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower vertex list (NaN for vertex on the lower surface) </help>
-  </parameter>
-  <parameter key ="lowerelements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> lower element list (NaN for element on the lower layer </help>
-  </parameter>
-  <parameter key ="vertexonboundary" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices on the boundary of the domain flag list </help>
-  </parameter>
-  <parameter key ="segments" type="double" default="N/A">
-     <section name="mesh" />
-     <help> edges on domain boundary (vertex1 vertex2 element) </help>
-  </parameter>
-  <parameter key ="segmentmarkers" type="double" default="N/A">
-     <section name="mesh" />
-     <help> number associated to each segment </help>
-  </parameter>
-  <parameter key ="vertexconnectivity" type="double" default="N/A">
-     <section name="mesh" />
-     <help> list of vertices connected to vertex_i </help>
-  </parameter>
-  <parameter key ="elementconnectivity" type="double" default="N/A">
-     <section name="mesh" />
-     <help> list of vertices connected to element_i </help>
-  </parameter>
-  <parameter key ="average_vertex_connectivity" type="double" default="25">
-     <section name="mesh" />
-     <help> average number of vertices connected to one vertex </help>
-  </parameter>
-</frame>
-<frame key="3" label="Extracted Model">
-<section name="mesh" />
-  <parameter key ="extractedvertices" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices extracted from the model </help>
-  </parameter>
-  <parameter key ="extractedelements" type="double" default="N/A">
-     <section name="mesh" />
-     <help> elements extracted from the model </help>
-  </parameter>
-</frame>
-<frame key="4" label="Projection">
-<section name="mesh" />
-  <parameter key ="lat" type="double" default="N/A">
-     <section name="mesh" />
-     <help> vertices latitude [degrees] </help>
-  </parameter>
-  <parameter key ="long" type="double" default="N/A">
-     <section name="mesh" />
-     <help> verticies longitude [degrees] </help>
-  </parameter>
-  <parameter key ="hemisphere" type="double" default="N/A">
-     <section name="mesh" />
-     <help> Indicate hemisphere 'n' or 's' </help>
-  </parameter></frame>
-
-
-<!-- mask -->
-<parameter key ="groundedice_levelset" type="double" default="NaN">
-     <section name="mask" />
-     <help> is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if &amp;lt; 0 </help>
-</parameter>
-<parameter key ="ice_levelset" type="double" default="NaN">
-     <section name="mask" />
-     <help> presence of ice if > 0, icefront position if = 0, no ice if &amp;lt; 0 </help>
-</parameter>
-
-<!-- geometry -->
-<frame key="1" label="Geometry parameters">
-<section name="geometry" />
-<parameter key ="surface" type="path" optional="false">
-     <section name="geometry" />
-     <help> surface elevation [m] </help>
-</parameter>
-<parameter key ="thickness" type="path" optional="false">
-     <section name="geometry" />
-     <help> ice thickness [m] </help>
-</parameter>
-<parameter key ="bed" type="path" optional="false">
-     <section name="geometry" />
-     <help> bed elevation [m] </help>
-</parameter>
-<parameter key ="bathymetry" type="double" default="N/A">
-     <section name="geometry" />
-     <help> bathymetry elevation [m] </help>
-</parameter>
-<parameter key ="hydrostatic_ratio" type="double" default="N/A">
-     <section name="geometry" />
-     <help> coefficient for ice shelves; thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro </help>
-</parameter></frame>
-
-
-<!-- constants -->
-<parameter key ="g" type="double" default="9.81">
-     <section name="constants" />
-     <help> gravitational acceleration [m/s^2] </help>
-</parameter>
-<parameter key ="yts" type="double" default="31536000">
-     <section name="constants" />
-     <help> number of seconds in a year [s/yr] </help>
-</parameter>
-<parameter key ="referencetemperature" type="double" default="223.15">
-     <section name="constants" />
-     <help> reference temperature used in the enthalpy model [K] </help>
-</parameter>
-
-<!-- surfaceforcings(SMB) -->
-<parameter key ="mass_balance" type="double" default="NaN">
-     <section name="surfaceforcings(SMB)" />
-     <help> surface mass balance [m/yr ice eq] </help>
-</parameter>
-
-<!-- basalforcings -->
-<parameter key ="melting_rate" type="double" default="NaN">
-     <section name="basalforcings" />
-     <help> basal melting rate (positive if melting) [m/yr] </help>
-</parameter>
-<parameter key ="melting_rate_correction" type="double" default="NaN">
-     <section name="basalforcings" />
-     <help> additional melting applied to compensate for dh/dt [m/yr] </help>
-</parameter>
-<parameter key ="geothermalflux" type="double" default="NaN">
-     <section name="basalforcings" />
-     <help> geothermal heat flux [W/m^2] </help>
-</parameter>
-
-<!-- materials -->
-<parameter key ="rho_ice" type="double" default="917">
-     <section name="materials" />
-     <help> ice density [kg/m^3] </help>
-</parameter>
-<parameter key ="rho_water" type="double" default="1023">
-     <section name="materials" />
-     <help> ocean water density [kg/m^3] </help>
-</parameter>
-<parameter key ="rho_freshwater" type="double" default="1000">
-     <section name="materials" />
-     <help> fresh water density [kg/m^3] </help>
-</parameter>
-<parameter key ="mu_water" type="double" default="0.001787">
-     <section name="materials" />
-     <help> water viscosity [N s/m^2] </help>
-</parameter>
-<parameter key ="heatcapacity" type="double" default="2093">
-     <section name="materials" />
-     <help> heat capacity [J/kg/K] </help>
-</parameter>
-<parameter key ="latentheat" type="double" default="334000">
-     <section name="materials" />
-     <help> latent heat of fusion [J/kg] </help>
-</parameter>
-<parameter key ="thermalconductivity" type="double" default="2.4">
-     <section name="materials" />
-     <help> ice thermal conductivity [W/m/K] </help>
-</parameter>
-<parameter key ="temperateiceconductivity" type="double" default="0.24">
-     <section name="materials" />
-     <help> temperate ice thermal conductivity [W/m/K] </help>
-</parameter>
-<parameter key ="meltingpoint" type="double" default="273.15">
-     <section name="materials" />
-     <help> melting point of ice at 1atm in K </help>
-</parameter>
-<parameter key ="beta" type="double" default="9.8e-08">
-     <section name="materials" />
-     <help> rate of change of melting point with pressure [K/Pa] </help>
-</parameter>
-<parameter key ="mixed_layer_capacity" type="double" default="3974">
-     <section name="materials" />
-     <help> mixed layer capacity [W/kg/K] </help>
-</parameter>
-<parameter key ="thermal_exchange_velocity" type="double" default="0.0001">
-     <section name="materials" />
-     <help> thermal exchange velocity [m/s] </help>
-</parameter>
-<parameter key ="rheology_B" type="double" default="N/A">
-     <section name="materials" />
-     <help> flow law parameter [Pa/s^(1/n)] </help>
-</parameter>
-<parameter key ="rheology_n" type="double" default="N/A">
-     <section name="materials" />
-     <help> Glens flow law exponent </help>
-</parameter>
-<parameter key ="rheology_law" type="char" default="'Paterson'">
-     <section name="materials" />
-     <help> law for the temperature dependance of the rheology: "None", "Paterson",  "Arrhenius" or "LliboutryDuval" </help>
-</parameter>
-<parameter key ="lithosphere_shear_modulus" type="double" default="67000000000">
-     <section name="materials" />
-     <help> Lithosphere shear modulus [Pa] </help>
-</parameter>
-<parameter key ="lithosphere_density" type="double" default="3.32">
-     <section name="materials" />
-     <help> Lithosphere density [g/cm^-3] </help>
-</parameter>
-<parameter key ="mantle_shear_modulus" type="double" default="145000000000">
-     <section name="materials" />
-     <help> Mantle shear modulus [Pa] </help>
-</parameter>
-<parameter key ="mantle_density" type="double" default="3.34">
-     <section name="materials" />
-     <help> Mantle density [g/cm^-3] </help>
-</parameter>
-
-
-<!-- damage -->
-<!-- Note: this class depends on different input of law -->
-<parameter key ="law" type="alternative" optional="false">
-	<section name="damage" />
-	<option value="undamage" type="string" default="true">
-		<help> law = undamage </help>
-	</option>
-	<option value="pralong" type="string" default="false">
-		<help> law = pralong </help>
-		<parameter key ="stress_threshold" type="double" default="0">
-			<help> damage stress threshold [Pa] </help>
-		</parameter>
-		<parameter key ="c1" type="double" default="0">
-			<help> damage parameter 1 </help>
-		</parameter>
-		<parameter key ="c2" type="double" default="0">
-			<help> damage parameter 2 </help>
-		</parameter>
-		<parameter key ="c3" type="double" default="0">
-			<help> damage parameter 3 [W/m^2] </help>
-		</parameter>
-		<parameter key ="c4" type="double" default="0">
-			<help> damage parameter 4 </help>
-		</parameter>
-		<parameter key ="healing" type="double" default="0">
-			<help> damage healing parameter 1 </help>
-		</parameter>
-		<parameter key ="equiv_stress" type="double" default="0">
-			<help> 0: von Mises </help>
-		</parameter>
-		<parameter key ="requested_outputs" type="cell" default="{'default'}">
-			<help> additional outputs requested </help>
-		</parameter>
-	</option>
-	<help> damage law (string) from {"undamaged","pralong"} </help>
-</parameter>
-<parameter key ="D" type="double" default="0">
-     <section name="damage" />
-     <help> damage tensor (scalar) </help>
-</parameter>
-<parameter key ="law" type="char" default="undamaged">
-     <section name="damage" />
-     <help> damage law (string) from {"undamaged","pralong"} </help>
-</parameter>
-<parameter key ="spcdamage" type="double" default="NaN">
-     <section name="damage" />
-     <help> damage constraints (NaN means no constraint) </help>
-</parameter>
-<parameter key ="max_damage" type="double" default="0.99999">
-     <section name="damage" />
-     <help> maximum possible damage (0&amp;lt;=max_damage&amp;lt;1) </help>
-</parameter>
-<parameter key ="stabilization" type="double" default="2">
-     <section name="damage" />
-     <help> 0: no, 1: artificial_diffusivity, 2: SUPG </help>
-</parameter>
-<parameter key ="maxiter" type="double" default="100">
-     <section name="damage" />
-     <help> maximum number of non linear iterations </help>
-</parameter>
-<parameter key ="penalty_lock" type="double" default="0">
-     <section name="damage" />
-     <help> stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization) </help>
-</parameter>
-<parameter key ="penalty_threshold" type="double" default="0">
-     <section name="damage" />
-     <help> threshold to declare convergence of damage evolution solution (default is 0) </help>
-</parameter>
-<parameter key ="penalty_factor" type="double" default="3">
-     <section name="damage" />
-     <help> scaling exponent (default is 3) </help>
-</parameter>
-
-
-<!-- Friction: Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p -->
-<frame key="1" label="Friction: Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p">
-<section name="friction" />
-<parameter key ="coefficient" type="double" default="N/A">
-     <section name="friction" />
-     <help> friction coefficient [SI] </help>
-</parameter>
-<parameter key ="p" type="double" default="N/A">
-     <section name="friction" />
-     <help> p exponent </help>
-</parameter>
-<parameter key ="q" type="double" default="N/A">
-     <section name="friction" />
-     <help> q exponent </help>
-</parameter></frame>
-
-
-<!-- flowequation -->
-<frame key="1" label="Flow equation parameters">
-<section name="flowequation" />
-<parameter key ="isSIA" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the Shallow Ice Approximation (SIA) used ? </help>
-</parameter>
-<parameter key ="isSSA" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the Shelfy-Stream Approximation (SSA) used ? </help>
-</parameter>
-<parameter key ="isL1L2" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the L1L2 approximation used ? </help>
-</parameter>
-<parameter key ="isHO" type="double" default="0">
-     <section name="flowequation" />
-     <help> is the Higher-Order (HO) approximation used ? </help>
-</parameter>
-<parameter key ="isFS" type="double" default="0">
-     <section name="flowequation" />
-     <help> are the Full-FS (FS) equations used ? </help>
-</parameter>
-<parameter key ="fe_SSA" type="char" default="'P1'">
-     <section name="flowequation" />
-     <help> Finite Element for SSA  "P1", "P1bubble" "P1bubblecondensed" "P2" </help>
-</parameter>
-<parameter key ="fe_HO" type="char" default="'P1'">
-     <section name="flowequation" />
-     <help> Finite Element for HO   "P1" "P1bubble" "P1bubblecondensed" "P1xP2" "P2xP1" "P2" </help>
-</parameter>
-<parameter key ="fe_FS" type="char" default="'MINIcondensed'">
-     <section name="flowequation" />
-     <help> Finite Element for FS   "P1P1" (debugging only) "P1P1GLS" "MINIcondensed" "MINI" "TaylorHood" </help>
-</parameter>
-<parameter key ="vertex_equation" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> flow equation for each vertex </help>
-</parameter>
-<parameter key ="element_equation" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> flow equation for each element </help>
-</parameter>
-<parameter key ="borderSSA" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> vertices on SSAs border (for tiling) </help>
-</parameter>
-<parameter key ="borderHO" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> vertices on HOs border (for tiling) </help>
-</parameter>
-<parameter key ="borderFS" type="double" default="N/A">
-     <section name="flowequation" />
-     <help> vertices on FS border (for tiling) </help>
-</parameter></frame>
-
-
-<!-- Timestepping -->
-<parameter key ="start_time" type="double" default="0">
-     <section name="timestepping" />
-     <help> simulation starting time [yr] </help>
-</parameter>
-<parameter key ="final_time" type="double" default="5">
-     <section name="timestepping" />
-     <help> final time to stop the simulation [yr] </help>
-</parameter>
-<parameter key ="time_step" type="double" default="0.5">
-     <section name="timestepping" />
-     <help> length of time steps [yr] </help>
-</parameter>
-<parameter key ="time_adapt" type="double" default="0">
-     <section name="timestepping" />
-     <help> use cfl condition to define time step ? (0 or 1)  </help>
-</parameter>
-<parameter key ="cfl_coefficient" type="double" default="0.5">
-     <section name="timestepping" />
-     <help> coefficient applied to cfl condition </help>
-</parameter>
-
-
-<!-- initialization -->
-<frame key="1" label="Initial field values">
-<section name="initialization" />
-<parameter key ="vx" type="double" default="NaN">
-     <section name="initialization" />
-     <help> x component of velocity [m/yr] </help>
-</parameter>
-<parameter key ="vy" type="double" default="NaN">
-     <section name="initialization" />
-     <help> y component of velocity [m/yr] </help>
-</parameter>
-<parameter key ="vz" type="double" default="NaN">
-     <section name="initialization" />
-     <help> z component of velocity [m/yr] </help>
-</parameter>
-<parameter key ="vel" type="double" default="NaN">
-     <section name="initialization" />
-     <help> velocity norm [m/yr] </help>
-</parameter>
-<parameter key ="pressure" type="double" default="NaN">
-     <section name="initialization" />
-     <help> pressure field [Pa] </help>
-</parameter>
-<parameter key ="temperature" type="double" default="NaN">
-     <section name="initialization" />
-     <help> fraction of water in the ice </help>
-</parameter>
-<parameter key ="waterfraction" type="double" default="NaN">
-     <section name="initialization" />
-     <help> ice thickness [m] </help>
-</parameter>
-<parameter key ="sediment_head" type="double" default="NaN">
-     <section name="initialization" />
-     <help> sediment water head of subglacial system [m] </help>
-</parameter>
-<parameter key ="epl_head" type="double" default="NaN">
-     <section name="initialization" />
-     <help> epl water head of subglacial system [m] </help>
-</parameter>
-<parameter key ="watercolumn" type="double" default="NaN">
-     <section name="initialization" />
-     <help> thickness of subglacial water [m] </help>
-</parameter></frame>
-
-
-<!-- rifts -->
-<parameter key ="riftstruct" type="double" default="NaN">
-     <section name="rifts" />
-     <help> structure containing all rift information (vertices coordinates, segments, type of melange, ...) </help>
-</parameter>
-<parameter key ="riftproperties" type="double" default="NaN">
-     <section name="rifts" />
-     <help> N/A </help>
-</parameter>
-
-
-<!-- Debug -->
-<parameter key ="valgrind" type="logical" optional="false">
-     <section name="debug" />
-        <option value="false" type="string" default="true"></option>
-     <help> use Valgrind to debug (0 or 1) </help>
-</parameter>
-<parameter key ="gprof" type="logical" optional="false">
-     <section name="debug" />
-        <option value="false" type="string" default="true"></option>
-     <help> use gnu-profiler to find out where the time is spent </help>
-</parameter>
-<parameter key ="profiling" type="logical" optional="false">
-     <section name="debug" />
-        <option value="false" type="string" default="true"></option>
-     <help> enables profiling (memory, flops, time) </help>
-</parameter>
-
-<!-- verbose -->
-<parameter key ="mprocessor" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="module" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="solution" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="true" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="solver" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="convergence" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="control" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="true" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="qmu" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="true" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-<parameter key ="autodiff" type="logical" optional="false">
-     <section name="verbose" />
-        <option value="false" type="string" default="true"></option>
-     <help>  </help>
-</parameter>
-
-<!-- settings -->
-<parameter key ="results_on_nodes" type="double" default="0">
-     <section name="settings" />
-     <help> results are output for all the nodes of each element </help>
-</parameter>
-<parameter key ="io_gather" type="double" default="1">
-     <section name="settings" />
-     <help> I/O gathering strategy for result outputs (default 1) </help>
-</parameter>
-<parameter key ="lowmem" type="double" default="0">
-     <section name="settings" />
-     <help> is the memory limited ? (0 or 1) </help>
-</parameter>
-<parameter key ="output_frequency" type="double" default="1">
-     <section name="settings" />
-     <help> frequency at which results are saved in all solutions with multiple time_steps </help>
-</parameter>
-<parameter key ="waitonlock" type="double" default="Inf">
-     <section name="settings" />
-     <help> maximum number of minutes to wait for batch results (NaN to deactivate) </help>
-</parameter>
-<parameter key ="upload_server" type="char" default="N/A">
-     <section name="settings" />
-     <help> server hostname where model should be uploaded </help>
-</parameter>
-<parameter key ="upload_path" type="char" default="N/A">
-     <section name="settings" />
-     <help> path on server where model should be uploaded </help>
-</parameter>
-<parameter key ="upload_login" type="char" default="N/A">
-     <section name="settings" />
-     <help> server login </help>
-</parameter>
-<parameter key ="upload_port" type="double" default="0">
-     <section name="settings" />
-     <help> port login (default is 0) </help>
-</parameter>
-<parameter key ="upload_filename" type="char" default="N/A">
-     <section name="settings" />
-     <help> unique id generated when uploading the file to server </help>
-</parameter>
-
-<!-- generic -->
-<parameter key ="name" type="char" default="'XPS'">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="login" type="char" default="N/A">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="np" type="double" default="1">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="port" type="double" default="0">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="codepath" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/bin">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="executionpath" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/execution">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="etcpath" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/etc">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="valgrind" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/externalpackages/valgrind/install/bin/valgrind">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="valgrindlib" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/externalpackages/valgrind/install/lib/libmpidebug.so">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="valgrindsup" type="char" default=":/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk:/home/casper/work/issm/trunk/externalpackages/valgrind/issm.supp">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-<parameter key ="verbose" type="double" default="1">
-     <section name="cluster" />
-     <help> N/A </help>
-</parameter>
-
-<!-- balancethickness -->
-<parameter key ="spcthickness" type="double" default="N/A">
-     <section name="balancethickness" />
-     <help> thickness constraints (NaN means no constraint) [m] </help>
-</parameter>
-<parameter key ="thickening_rate" type="double" default="N/A">
-     <section name="balancethickness" />
-     <help> ice thickening rate used in the mass conservation (dh/dt) [m/yr] </help>
-</parameter>
-<parameter key ="stabilization" type="double" default="1">
-     <section name="balancethickness" />
-     <help> 0: None, 1: SU, 2: SSAs artificial diffusivity, 3:DG </help>
-</parameter>
-
-<!-- StressBalance solution parameters: -->
-<frame key="1" label="Convergence criteria">
-<section name="stressbalance" />
-<parameter key ="restol" type="double" default="0.0001">
-     <section name="stressbalance" />
-     <help> mechanical equilibrium residual convergence criterion </help>
-</parameter>
-<parameter key ="reltol" type="double" default="0.01">
-     <section name="stressbalance" />
-     <help> velocity relative convergence criterion, NaN: not applied </help>
-</parameter>
-<parameter key ="abstol" type="double" default="10">
-     <section name="stressbalance" />
-     <help> velocity absolute convergence criterion, NaN: not applied </help>
-</parameter>
-<parameter key ="isnewton" type="double" default="0">
-     <section name="stressbalance" />
-     <help> 0: Picards fixed point, 1: Newtons method, 2: hybrid </help>
-</parameter>
-<parameter key ="maxiter" type="double" default="100">
-     <section name="stressbalance" />
-     <help> maximum number of nonlinear iterations </help>
-</parameter>
-<parameter key ="viscosity_overshoot" type="double" default="0">
-     <section name="stressbalance" />
-     <help> over-shooting constant new=new+C*(new-old) </help>
-</parameter>
-</frame>
-<frame key="2" label="Boundary conditions">
-<section name="stressbalance" />
-<parameter key ="spcvx" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> x-axis velocity constraint (NaN means no constraint) [m/yr] </help>
-</parameter>
-<parameter key ="spcvy" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> y-axis velocity constraint (NaN means no constraint) [m/yr] </help>
-</parameter>
-<parameter key ="spcvz" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> z-axis velocity constraint (NaN means no constraint) [m/yr] </help>
-</parameter>
-</frame>
-<frame key="3" label="Rift options">
-<section name="stressbalance" />
-<parameter key ="rift_penalty_threshold" type="double" default="0">
-     <section name="stressbalance" />
-     <help> threshold for instability of mechanical constraints </help>
-</parameter>
-<parameter key ="rift_penalty_lock" type="double" default="10">
-     <section name="stressbalance" />
-     <help> number of iterations before rift penalties are locked </help>
-</parameter>
-</frame>
-<frame key="4" label="Other">
-<section name="stressbalance" />
-<parameter key ="shelf_dampening" type="double" default="0">
-     <section name="stressbalance" />
-     <help> use dampening for floating ice ? Only for FS model </help>
-</parameter>
-<parameter key ="FSreconditioning" type="double" default="10000000000000">
-     <section name="stressbalance" />
-     <help> multiplier for incompressibility equation. Only for FS model </help>
-</parameter>
-<parameter key ="referential" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> local referential </help>
-</parameter>
-<parameter key ="loadingforce" type="double" default="N/A">
-     <section name="stressbalance" />
-     <help> loading force applied on each point [N/m^3] </help>
-</parameter>
-<parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="stressbalance" />
-     <help> additional outputs requested </help>
-</parameter>
-</frame>
-
-
-<!-- groundingline -->
-<frame key="1" label="Grounding line migration parameters">
-<section name="groundingline" />
-<parameter key ="migration" type="char" default="'None'">
-     <section name="groundingline" />
-     <help> type of grounding line migration: "SoftMigration","AgressiveMigration" or "None" </help>
-</parameter>
-<parameter key ="melting_rate" type="double" default="0">
-     <section name="groundingline" />
-     <help> melting rate applied when previously grounded parts start floating [m/yr] </help>
-</parameter></frame>
-
-
-<!-- Hydrology -->
-<frame key="1" label="Hydrologyshreve solution parameters">
-<section name="hydrologyshreve" />
-<parameter key ="spcwatercolumn" type="double" default="N/A">
-     <section name="hydrologyshreve" />
-     <help> water thickness constraints (NaN means no constraint) [m] </help>
-</parameter>
-<parameter key ="n" type="double" default="0.02">
-     <section name="hydrologyshreve" />
-     <help> Manning roughness coefficient </help>
-</parameter>
-<parameter key ="CR" type="double" default="0.01">
-     <section name="hydrologyshreve" />
-     <help> tortuosity parameter </help>
-</parameter>
-<parameter key ="p" type="double" default="2">
-     <section name="hydrologyshreve" />
-     <help> dimensionless exponent in Manning velocity formula </help>
-</parameter>
-<parameter key ="q" type="double" default="1">
-     <section name="hydrologyshreve" />
-     <help> dimensionless exponent in Manning velocity formula </help>
-</parameter>
-<parameter key ="kn" type="double" default="0">
-     <section name="hydrologyshreve" />
-     <help> parameter in effective pressure formula </help>
-</parameter>
-<parameter key ="stabilization" type="double" default="1">
-     <section name="hydrologyshreve" />
-     <help> artificial diffusivity (default is 1). can be more than 1 to increase diffusivity. </help>
-</parameter>
-</frame>
-<!-- masstransport -->
-<frame key="1" label="Masstransport solution parameters">
-<section name="masstransport" />
-  <parameter key ="spcthickness" type="double" default="N/A">
-     <section name="masstransport" />
-     <help> thickness constraints (NaN means no constraint) [m] </help>
-  </parameter>
-  <parameter key ="calvingrate" type="double" default="N/A">
-     <section name="masstransport" />
-     <help> calving rate at given location [m/a] </help>
-  </parameter>
-  <parameter key ="isfreesurface" type="double" default="0">
-     <section name="masstransport" />
-     <help> do we use free surfaces (FS only) are mass conservation </help>
-  </parameter>
-  <parameter key ="min_thickness" type="double" default="1">
-     <section name="masstransport" />
-     <help> minimum ice thickness allowed [m] </help>
-  </parameter>
-  <parameter key ="hydrostatic_adjustment" type="char" default="'Absolute'">
-     <section name="masstransport" />
-     <help> adjustment of ice shelves surface and bed elevations: 'Incremental' or 'Absolute'  </help>
-  </parameter>
-  <parameter key ="stabilization" type="double" default="1">
-     <section name="masstransport" />
-     <help> 0: no, 1:  artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin </help>
-  </parameter>
-</frame>
-<frame key="2" label="Penalty options">
-<section name="masstransport" />
-  <parameter key ="vertex_pairing" type="double" default="N/A">
-     <section name="masstransport" />
-     <help> offset used by penalties: penalty = Kmax*10^offset </help>
-  </parameter>
-  <parameter key ="penalty_factor" type="double" default="3">
-     <section name="masstransport" />
-     <help> pairs of vertices that are penalized </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="masstransport" />
-     <help> additional outputs requested </help>
-  </parameter>
-</frame>
-<!-- thermal -->
-<frame key="1" label="Thermal solution parameters">
-<section name="thermal" />
-  <parameter key ="spctemperature" type="double" default="N/A">
-     <section name="thermal" />
-     <help> temperature constraints (NaN means no constraint) [K] </help>
-  </parameter>
-  <parameter key ="penalty_threshold" type="double" default="0">
-     <section name="thermal" />
-     <help> 0: no, 1: artificial_diffusivity, 2: SUPG </help>
-  </parameter>
-  <parameter key ="stabilization" type="double" default="1">
-     <section name="thermal" />
-     <help> maximum number of non linear iterations </help>
-  </parameter>
-  <parameter key ="maxiter" type="double" default="100">
-     <section name="thermal" />
-     <help> stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization) </help>
-  </parameter>
-  <parameter key ="penalty_lock" type="double" default="0">
-     <section name="thermal" />
-     <help> threshold to declare convergence of thermal solution (default is 0)  </help>
-  </parameter>
-  <parameter key ="penalty_factor" type="double" default="3">
-     <section name="thermal" />
-     <help> scaling exponent (default is 3) </help>
-  </parameter>
-  <parameter key ="isenthalpy" type="double" default="0">
-     <section name="thermal" />
-     <help> use an enthalpy formulation to include temperate ice (default is 0) </help>
-  </parameter>
-  <parameter key ="isdynamicbasalspc" type="double" default="0">
-     <section name="thermal" />
-     <help> enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)  </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="thermal" />
-     <help> additional outputs requested </help>
-  </parameter>
-</frame>
-<!-- steadystate -->
-<frame key="1" label="steadystate solution parameters">
-<section name="steadystate" />
-  <parameter key ="reltol" type="double" default="0.01">
-     <section name="steadystate" />
-     <help> relative tolerance criterion [K] </help>
-  </parameter>
-  <parameter key ="maxiter" type="double" default="100">
-     <section name="steadystate" />
-     <help> maximum number of iterations </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="steadystate" />
-     <help> additional requested outputs </help>
-  </parameter>
-</frame>
-<!-- transient -->
-<frame key="1" label="transient solution parameters">
-<section name="transient" />
-  <parameter key ="ismasstransport" type="double" default="1">
-     <section name="transient" />
-     <help> indicates whether a masstransport solution is used in the transient </help>
-  </parameter>
-  <parameter key ="isstressbalance" type="double" default="1">
-     <section name="transient" />
-     <help> indicates whether a stressbalance solution is used in the transient </help>
-  </parameter>
-  <parameter key ="isthermal" type="double" default="1">
-     <section name="transient" />
-     <help> indicates whether a thermal solution is used in the transient </help>
-  </parameter>
-  <parameter key ="isgroundingline" type="double" default="0">
-     <section name="transient" />
-     <help> indicates whether a groundingline migration is used in the transient </help>
-  </parameter>
-  <parameter key ="isgia" type="double" default="0">
-     <section name="transient" />
-     <help> indicates whether a postglacial rebound model is used in the transient </help>
-  </parameter>
-  <parameter key ="isdamage" type="double" default="0">
-     <section name="transient" />
-     <help> indicates whether damage evolution is used in the transient </help>
-  </parameter>
-  <parameter key ="islevelset" type="double" default="0">
-     <section name="transient" />
-     <help> LEVEL SET DESCRIPTION...  </help>
-  </parameter>
-  <parameter key ="requested_outputs" type="cell" default="{'default'}">
-     <section name="transient" />
-     <help> list of additional outputs requested </help>
-  </parameter>
-</frame>
-<!-- gia -->
-<frame key="1" label="gia parameters">
-<section name="gia" />
-  <parameter key ="mantle_viscosity" type="double" default="N/A">
-     <section name="gia" />
-     <help> mantle viscosity[Pa s] </help>
-  </parameter>
-  <parameter key ="lithosphere_thickness" type="double" default="N/A">
-     <section name="gia" />
-     <help> lithosphere thickness (km) </help>
-  </parameter>
-  <parameter key ="cross_section_shape" type="double" default="1">
-     <section name="gia" />
-     <help> 1: square-edged (default). 2: elliptical.  See iedge in GiaDeflectionCore </help>
-  </parameter>
-</frame>
-<!-- autodiff -->
-<frame key="1" label="automatic differentiation parameters">
-<section name="autodiff" />
-  <parameter key ="isautodiff" type="logical" optional="false">
-     <section name="autodiff" />
-         <option value="false" type="string" default="true"></option>
-     <help> indicates if the automatic differentiation is activated </help>
-  </parameter>
-  <parameter key ="dependents" type="cell" default="(0x0)">
-     <section name="autodiff" />
-     <help> list of dependent variables </help>
-  </parameter>
-  <parameter key ="independents" type="cell" default="(0x0)">
-     <section name="autodiff" />
-     <help> list of independent variables </help>
-  </parameter>
-  <parameter key ="driver" type="char" default="'fos_forward'">
-     <section name="autodiff" />
-     <help> ADOLC driver ('fos_forward' or 'fov_forward') </help>
-  </parameter>
-  <parameter key ="obufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of operations per buffer (==OBUFSIZE in usrparms.h)  </help>
-  </parameter>
-  <parameter key ="lbufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of locations per buffer (==LBUFSIZE in usrparms.h) </help>
-  </parameter>
-  <parameter key ="cbufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of values per buffer (==CBUFSIZE in usrparms.h) </help>
-  </parameter>
-  <parameter key ="tbufsize" type="double" default="524288">
-     <section name="autodiff" />
-     <help> Number of taylors per buffer (&amp;lt;=TBUFSIZE in usrparms.h) </help>
-  </parameter>
-  <parameter key ="gcTriggerRatio" type="double" default="2">
-     <section name="autodiff" />
-     <help> free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio </help>
-  </parameter>
-  <parameter key ="gcTriggerRatio" type="double" default="2">
-     <section name="autodiff" />
-     <help> free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize </help>
-  </parameter>
-</frame>
-<!-- flaim -->
-<frame key="1" label="Input:">
-<section name="flaim" />
-  <parameter key ="targets" type="char" default="N/A">
-     <section name="flaim" />
-     <help> name of kml output targets file </help>
-  </parameter>
-  <parameter key ="tracks" type="char" default="N/A">
-     <section name="flaim" />
-     <help> name of kml input tracks file </help>
-  </parameter>
-  <parameter key ="flightreqs" type="struct" default="N/A">
-     <section name="flaim" />
-     <help> structure of kml flight requirements (not used yet) </help>
-  </parameter>
-  <parameter key ="criterion" type="double" default="N/A">
-     <section name="flaim" />
-     <help> element or nodal criterion for flight path evaluation (metric) </help>
-  </parameter>
-</frame>
-<frame key="2" label="Arguments:">
-<section name="flaim" />
-  <parameter key ="gridsatequator" type="double" default="200000">
-     <section name="flaim" />
-     <help> number of grids at equator (determines resolution) </help>
-  </parameter>
-  <parameter key ="usevalueordering" type="logical" optional="false">
-     <section name="flaim" />
-         <option value="true" type="string" default="true"></option>
-     <help> flag to consider target values for flight path evaluation </help>
-  </parameter>
-  <parameter key ="split_antimeridian" type="logical" optional="false">
-     <section name="flaim" />
-         <option value="true" type="string" default="true"></option>
-     <help> flag to split polygons on the antimeridian </help>
-  </parameter>
-</frame>
-<frame key="3" label="Optimization:">
-<section name="flaim" />
-  <parameter key ="path_optimize" type="logical" optional="false">
-     <section name="flaim" />
-         <option value="false" type="string" default="true"></option>
-     <help> optimize? (default false) </help>
-  </parameter>
-  <parameter key ="opt_ndir" type="double" default="1">
-     <section name="flaim" />
-     <help> number of directions to test when moving a point.  If this value = 1, a random direction is tested. A value > 1 results in directions equally spaced from [0, 2*PI] being tested. For example, 4 would result in directions [0, PI/2, PI, 3PI/2] </help>
-  </parameter>
-  <parameter key ="opt_dist" type="double" default="25">
-     <section name="flaim" />
-     <help> specifies the distance in km (default 25) to move a randomly selected path point on each iteration </help>
-  </parameter>
-  <parameter key ="opt_niter" type="double" default="30000">
-     <section name="flaim" />
-     <help> number of iterations (default 30,000) to run for flightplan optimization, i.e. the number of times to randomly select a point and move it. </help>
-  </parameter>
-</frame>
-<frame key="4" label="Output:">
-<section name="flaim" />
-  <parameter key ="solution" type="char" default="N/A">
-     <section name="flaim" />
-     <help> name of kml solution file </help>
-  </parameter>
-  <parameter key ="quality" type="double" default="0">
-     <section name="flaim" />
-     <help> quality of kml solution </help>
-  </parameter>
-</frame>
-<!-- inversion -->
-<frame key="1" label="inversion parameters">
-<section name="inversion" />
-  <parameter key ="iscontrol" type="double" default="0">
-     <section name="inversion" />
-     <help> is inversion activated? </help>
-  </parameter>
-  <parameter key ="incomplete_adjoint" type="double" default="1">
-     <section name="inversion" />
-     <help> 1: linear viscosity, 0: non-linear viscosity </help>
-  </parameter>
-  <parameter key ="control_parameters" type="cell" default="{'FrictionCoefficient'}">
-     <section name="inversion" />
-     <help> ex: {'FrictionCoefficient'}, or {'MaterialsRheologyBbar'} </help>
-  </parameter>
-  <parameter key ="nsteps" type="double" default="20">
-     <section name="inversion" />
-     <help> number of optimization searches </help>
-  </parameter>
-  <parameter key ="cost_functions" type="double" default="101">
-     <section name="inversion" />
-     <help> indicate the type of response for each optimization step  </help>
-  </parameter>
-  <parameter key ="cost_functions_coefficients" type="double" default="N/A">
-     <section name="inversion" />
-     <help> cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter </help>
-  </parameter>
-  <parameter key ="cost_function_threshold" type="double" default="N/A">
-     <section name="inversion" />
-     <help> misfit convergence criterion. Default is 1%, NaN if not applied </help>
-  </parameter>
-  <parameter key ="maxiter_per_step" type="double" default="(20x1)">
-     <section name="inversion" />
-     <help> maximum iterations during each optimization step  </help>
-  </parameter>
-  <parameter key ="gradient_scaling" type="double" default="(20x1)">
-     <section name="inversion" />
-     <help> scaling factor on gradient direction during optimization, for each optimization step </help>
-  </parameter>
-  <parameter key ="step_threshold" type="double" default="(20x1)">
-     <section name="inversion" />
-     <help> decrease threshold for misfit, default is 30% </help>
-  </parameter>
-  <parameter key ="min_parameters" type="double" default="N/A">
-     <section name="inversion" />
-     <help> absolute minimum acceptable value of the inversed parameter on each vertex </help>
-  </parameter>
-  <parameter key ="max_parameters" type="double" default="N/A">
-     <section name="inversion" />
-     <help> absolute maximum acceptable value of the inversed parameter on each vertex </help>
-  </parameter>
-  <parameter key ="vx_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed velocity x component [m/yr] </help>
-  </parameter>
-  <parameter key ="vy_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed velocity y component [m/yr]  </help>
-  </parameter>
-  <parameter key ="vel_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed velocity magnitude [m/yr] </help>
-  </parameter>
-  <parameter key ="thickness_obs" type="double" default="N/A">
-     <section name="inversion" />
-     <help> observed thickness [m]) </help>
-  </parameter>
-</frame>
-<frame key="2" label="Available cost functions">
-<section name="inversion" />
-  <parameter key ="SurfaceAbsVelMisfit" type="string" default="101">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="SurfaceRelVelMisfit" type="string" default="102">
-     <section name="inversion" />
-     <help>   </help>
-  </parameter>
-  <parameter key ="SurfaceLogVelMisfit" type="string" default="103">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="SurfaceLogVxVyMisfit" type="string" default="104">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="SurfaceAverageVelMisfit" type="string" default="105">
-     <section name="inversion" />
-     <help>   </help>
-  </parameter>
-  <parameter key ="ThicknessAbsMisfit" type="string" default="106">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="DragCoefficientAbsGradient" type="string" default="107">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="RheologyBbarAbsGradient" type="string" default="108">
-     <section name="inversion" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="ThicknessAbsGradient" type="string" default="109">
-     <section name="inversion" />
-     <help> </help>
-  </parameter>
-</frame>
-<!-- qmu -->
-<frame key="1" label="qmu parameters">
-<section name="qmu" />
-  <parameter key ="isdakota" type="double" default="0">
-     <section name="qmu" />
-     <help> is qmu analysis activated? </help>
-  </parameter>
-  <parameter key ="variables" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (arrays of each variable class) </help>
-  </parameter>
-  <parameter key ="responses" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (arrays of each response class) </help>
-  </parameter>
-  <parameter key ="numberofresponses" type="double" default="0">
-     <section name="qmu" />
-     <help> number of responses </help>
-  </parameter>
-  <parameter key ="params" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (array of method-independent parameters)  </help>
-  </parameter>
-  <parameter key ="results" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> (information from dakota files) </help>
-  </parameter>
-  <parameter key ="partition" type="double" default="N/A">
-     <section name="qmu" />
-     <help> user provided mesh partitioning, defaults to metis if not specified </help>
-  </parameter>
-  <parameter key ="numberofpartitions" type="double" default="0">
-     <section name="qmu" />
-     <help> number of partitions for semi-discrete qmu  </help>
-  </parameter>
-  <parameter key ="variabledescriptors" type="cell" default="(0x0)">
-     <section name="qmu" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="responsedescriptors" type="cell" default="(0x0)">
-     <section name="qmu" />
-     <help> use an enthalpy formulation to include temperate ice (default is 0) </help>
-  </parameter>
-  <parameter key ="method" type="struct" default="N/A">
-     <section name="qmu" />
-     <help> array of dakota_method class </help>
-  </parameter>
-  <parameter key ="mass_flux_profile_directory" type="double" default="N/A">
-     <section name="qmu" />
-     <help> directory for mass flux profiles </help>
-  </parameter>
-  <parameter key ="mass_flux_profiles" type="double" default="N/A">
-     <section name="qmu" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="mass_flux_segments" type="cell" default="(0x0)">
-     <section name="qmu" />
-     <help>  </help>
-  </parameter>
-  <parameter key ="adjacency" type="double" default="N/A">
-     <section name="qmu" />
-     <help> additional outputs requested </help>
-  </parameter>
-  <parameter key ="vertex_weight" type="double" default="N/A">
-     <section name="qmu" />
-     <help> weight applied to each mesh vertex </help>
-  </parameter>
-</frame>
-<!-- outputdefinition -->
-<frame key="1" label="outputdefinition">
-<section name="outputdefinition" />
-  <parameter key ="definitions" type="cell" default="(0x0)">
-     <section name="outputdefinition" />
-     <help> list of potential outputs that can be requested, but which need additional data to be defined </help>
-  </parameter>
-</frame>
-<!-- miscellaneous -->
-<frame key="1" label="miscellaneous parameters">
-<section name="miscellaneous" />
-  <parameter key ="notes" type="char" default="N/A">
-     <section name="miscellaneous" />
-     <help> notes in a cell of strings </help>
-  </parameter>
-  <parameter key ="name" type="char" default="N/A">
-     <section name="miscellaneous" />
-     <help> model name </help>
-  </parameter>
-  <parameter key ="dummy" type="struct" default="N/A">
-     <section name="miscellaneous" />
-     <help> empty field to store some data </help>
-  </parameter>
-</frame>
-
-
-</inishell_config>
\ No newline at end of file
Index: ../trunk-jpl/src/java/build/resources/icons/kghostview.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/file_ops.xcf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/filesave.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/viewmag.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/ini_open.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/fileopen.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/xml_open.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/filesaveas.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/opensettings.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/reset.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/advancedsettings.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/mydocuments.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/resources/icons/readme.txt
===================================================================
--- ../trunk-jpl/src/java/build/resources/icons/readme.txt	(revision 18297)
+++ ../trunk-jpl/src/java/build/resources/icons/readme.txt	(revision 18298)
@@ -1,10 +0,0 @@
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-This copyright and license notice covers the images in this directory.
-************************************************************************
-
-TITLE:	Crystal Project Icons
-AUTHOR:	Everaldo Coelho
-SITE:	http://www.everaldo.com
-CONTACT: everaldo@everaldo.com
-
-Copyright (c)  2006-2007  Everaldo Coelho.
Index: ../trunk-jpl/src/java/build/resources/config_schema-0.1.1.xsd
===================================================================
--- ../trunk-jpl/src/java/build/resources/config_schema-0.1.1.xsd	(revision 18297)
+++ ../trunk-jpl/src/java/build/resources/config_schema-0.1.1.xsd	(revision 18298)
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-*   
-*	This file is part of INIshell.
-*
-*   INIshell is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   INIshell is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with INIshell.  If not, see <http://www.gnu.org/licenses/>.
-*    	
-* -->
-<xsd:schema version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <xsd:element name="inishell_config" type="general" />
-  
-  <xsd:complexType name="general">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="parameter" type="parametertype" />
-      <xsd:element name="parametergroup" type="pargroup" />
-      <xsd:element name="include" type="pathonly" /> 
-      <xsd:element name="frame" type="framegroup" /> 
-    </xsd:choice>
-    <xsd:attribute name="application" />
-  </xsd:complexType>
-
-  <xsd:complexType name="framegroup">
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
-      <xsd:element name="parameter" type="parametertype" />
-      <xsd:element name="reference" type="nameonly" />
-      <xsd:element name="section" type="nameonly"/>
-    </xsd:choice>
-    <xsd:attribute name="key" />
-    <xsd:attribute name="label" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="parametertype">
-    <xsd:complexContent>
-      <xsd:extension base="parbasetype">
-		<xsd:attribute name="key" type="xsd:string" use="required"/> 
-		<xsd:attribute name="default" type="xsd:string" />
-		<xsd:attribute name="counter" type="xsd:integer" />
-      </xsd:extension>
-    </xsd:complexContent>		
-  </xsd:complexType>
-  
-  <xsd:complexType name="nameonly">
-	<xsd:attribute name="name" />   
-  </xsd:complexType>
-
-  <xsd:complexType name="optionvalue">
-	<xsd:attribute name="value" />   
-  </xsd:complexType>
-
-  <xsd:complexType name="pathonly">
-	<xsd:attribute name="path" />   
-  </xsd:complexType>
-  
-  <xsd:complexType name="pargroup">
-	<xsd:choice minOccurs="1" maxOccurs="unbounded">
-	  <xsd:element name="parameter" type="parametertype" />
-	  <xsd:element name="reference" type="nameonly" />
-	  <xsd:element name="option" type="optionvalue" />
-	  <xsd:element name="frame" type="framegroup" /> 
-	</xsd:choice>
-	<xsd:attribute name="name" />
-  </xsd:complexType>
-
-  <xsd:complexType name="parbasetype">
-	<xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="section" type="nameonly"/>
-	  </xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="replace" type="nameonly"/>
-	  </xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="parameter" type="parametertype" />
-	  </xsd:sequence>
-	  <xsd:choice minOccurs="0" maxOccurs="unbounded">				
-		<xsd:element name="option" minOccurs="0">
-		  <xsd:complexType>
-			<xsd:complexContent>
-			  <xsd:extension base="parbasetype">
-				<xsd:attribute name="value" type="xsd:string" use="required" />
-				<xsd:attribute name="label" type="xsd:string" use="optional" />
-				<xsd:attribute name="default" type="xsd:boolean" use="optional"/>
-			  </xsd:extension>
-			</xsd:complexContent>
-		  </xsd:complexType>
-		</xsd:element>
-	  </xsd:choice>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="reference" type="nameonly" />
-	  </xsd:sequence>
-	  <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-		<xsd:element name="help" type="helptype"/>	
-	  </xsd:sequence>
-	</xsd:sequence>
-	
-	<xsd:attribute name="type" use="required">
-	  <xsd:simpleType>
-		<xsd:restriction base="xsd:string">
-		  <xsd:enumeration value="integer" />
-		  <xsd:enumeration value="integer+" />
-		  <xsd:enumeration value="decimal" />
-		  <xsd:enumeration value="path" />
-		  <xsd:enumeration value="file" />
-		  <xsd:enumeration value="choice" />
-		  <xsd:enumeration value="alternative" />
-		  <xsd:enumeration value="dropdown" />
-		  <xsd:enumeration value="string" />
-		  <xsd:enumeration value="combination" />
-		  <xsd:enumeration value="selector" />
-		</xsd:restriction>
-	  </xsd:simpleType>
-	</xsd:attribute>
-	
-	<xsd:attribute name="maximum" type="xsd:integer"/>
-	<xsd:attribute name="minimum" type="xsd:integer"/>
-	<xsd:attribute name="template" type="xsd:boolean" default="false" use="optional" />
-	<xsd:attribute name="optional" type="xsd:boolean" default="true" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="needstype">
-	<xsd:attribute name="type" type="xsd:string" use="required" />
-	<xsd:attribute name="name" type="xsd:string" use="required" />
-	
-	<xsd:attribute name="value" />
-	<xsd:attribute name="optional" type="xsd:boolean" />
-	<xsd:attribute name="minoccur" type="xsd:integer" />
-	<xsd:attribute name="maxoccur" type="xsd:string" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="baseType">
-	<xsd:sequence minOccurs="0" maxOccurs="1">
-	  <xsd:element name="help" type="helptype" />		
-	</xsd:sequence>
-	<xsd:attribute name="key" type="xsd:string" use="required" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="helptype" mixed="true">
-	<xsd:choice minOccurs="0" maxOccurs="unbounded">
-	  <xsd:element name="section" type="nameonly" />
-	  <xsd:element name="replace" type="nameonly" />
-	</xsd:choice>
-  </xsd:complexType> 
-</xsd:schema>
Index: ../trunk-jpl/src/java/build/gui_elements/CheckBoxPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$Type.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/TextfieldPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/FramePanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/PathPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/IntegerPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/DecimalPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/GUIBuildException.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$1.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/ControlledPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/DuplicatorPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/OptionPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/AlternativePanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/SelectorPanel.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/gui_elements/ColorCellRenderer.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/main/GUIBuilder$1.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/main/PanelControl.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/main/XMLHelper.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/main/GUI.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/main/PanelNode.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/build/main/GUIBuilder.class
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ../trunk-jpl/src/java/License.txt
===================================================================
--- ../trunk-jpl/src/java/License.txt	(revision 18297)
+++ ../trunk-jpl/src/java/License.txt	(revision 18298)
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Index: ../trunk-jpl/src/java/inishell.sh
===================================================================
--- ../trunk-jpl/src/java/inishell.sh	(revision 18297)
+++ ../trunk-jpl/src/java/inishell.sh	(revision 18298)
@@ -1,8 +0,0 @@
-#/bin/bash
-#This is just the necessary command line to run a jar file
-
-#recover file name: 
-xmlfilename=$1
-
-#call inishell
-java -jar dist/inishell.jar $xmlfilename
