WSL/SLF GitLab Repository

Commit 2dfc4a02 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

Added all missing keys in MeteoIO and Snowpack, bumped version number to 2.0.2

parent e8d92f8e
......@@ -76,6 +76,7 @@ INIshell include file for MeteoIO filters
<reference name="PROC_PSUM_DISTRIBUTE"/>
<reference name="PROC_SHADE"/>
<reference name="PROC_RHWATERTOICE"/>
<reference name="PROC_TRANSFORMWINDVECTOR"/>
</parameter>
<reference name="METEOPARAMETERS"/>
</parameter>
......@@ -836,11 +837,22 @@ INIshell include file for MeteoIO filters
<!-- PROC RHWATERTOICE -->
<parametergroup name="PROC_RHWATERTOICE">
<option caption="Relative humidity over water correction" value="RHWATERTOICE" color="#459a4a">
<option caption="Relative humidity over water correction" value="RHWATERTOICE" type="string" color="#459a4a">
<reference name="ID_RESTRICT"/>
<help>&lt;a href=&quot;https://models.slf.ch/docserver/meteoio/doc/html/classmio_1_1ProcRHWaterToIce.html&quot;&gt;Relative humidity over water or ice&lt;/a&gt;. This corrects relative humidity over water for the full temperature range to relative humidity over ice when the air temperature is below the triple point and over water otherwise. For example useful for weather stations that report relative humidity with respect to water for the full temperature range.</help>
</option>
</parametergroup>
<!-- PROC TRANSFORMWINDVECTOR -->
<parametergroup name="PROC_TRANSFORMWINDVECTOR">
<option caption="Wind reprojection" value="TRANSFORMWINDVECTOR" type="string" color="#459a4a">
<parameter key="%::ARG#::COORDPARAM" type="text" size="small">
<help>Target EPSG code for transformation (default: COORDPARAM from the [Input] section)</help>
</parameter>
<reference name="ID_RESTRICT"/>
<help>&lt;a href=&quot;https://models.slf.ch/docserver/meteoio/doc/html/classmio_1_1ProcTransformWindVector.html&quot;&gt;Project wind direction, and/or wind speed components, from WGS84 to a PROJ4 supported coordinate system&lt;/a&gt;, defined by an EPSG code (requires PROJ4). It assumes the wind direction and/or the U and V wind speed components are defined in WGS84 (i.e, north/south is parallel to longitude, and east/west is parallel to latitude). After transformation to a PROJ4 supported coordinate system defined by an EPSG code, the wind direction is defined such that north/south is parallel to northing, and east/west is parallel to easting.</help>
</option>
</parametergroup>
<!-- SHORTCUTS -->
<parametergroup name="SOFT_CENTER_MIN">
......
......@@ -263,7 +263,10 @@ Please include meteoio_parametergroups before use!
<help>header line number to interpret as columns headers</help>
</parameter>
<parameter key="CSV_FIELDS" type="text" size="large">
<help>Provide a column header (if none is present or to overwrite it) such as &lt;code&gt;DATE TIME TA&lt;/code&gt;</help>
<help>Provide a column header (if none is present or to overwrite it) such as &lt;code&gt;DATE TIME ID TA&lt;/code&gt;, see below for special field names related to Date/Time handling.</help>
</parameter>
<parameter key="CSV_FILTER_ID" type="text" size="large">
<help>if the data contains an "ID" column, which ID should be kept (all others will be rejected); default: station ID</help>
</parameter>
<parameter key="CSV_SKIP_FIELDS" type="text" size="large">
<help>A space-delimited list of field to skip (first field is numbered 1). Keep in mind that when using parameters such as &lt;code&gt;UNITS_OFFSET&lt;/code&gt;, the skipped field MUST be taken into consideration (since even if a field is skipped, it is still present in the file!)</help>
......@@ -274,7 +277,10 @@ Please include meteoio_parametergroups before use!
</frame>
<frame caption="Date/Time handling" color="#c4c4c4">
<parameter key="CSV_TIMESTAMP" type="alternative" optional="false">
<parameter type="helptext" wrap="true">
<help>Date/Time information is either provided as strings that will be parsed (as one combined timestamp or as a date and a time field, see below) or as separate components: then the fields must be named (either from the headers or through the CSV_FIELDS key) as YEAR, JDAY (number of days since the begining of the year), MONTH, DAY, NTIME (numerical representation of time, for example 952 for 09:52), HOURS, MINUTES, SECONDS (if minutes or seconds are missing, they will be assumed to be zero).</help>
</parameter>
<parameter key="CSV_TIMESTAMP" type="alternative">
<option value="COMBINED">
<parameter key="CSV_DATETIME_SPEC" type="text" optional="false">
<help>Mixed date and time format specification, such as &lt;code&gt;YYYY-MM-DDTHH24:MI:SS&lt;/code&gt;</help>
......@@ -370,7 +376,10 @@ Please include meteoio_parametergroups before use!
<help>header line number to interpret as columns headers</help>
</parameter>
<parameter key="CSV#_FIELDS" type="text" size="large">
<help>Provide a column header (if none is present or to overwrite it) such as &lt;code&gt;DATE TIME TA&lt;/code&gt;</help>
<help>Provide a column header (if none is present or to overwrite it) such as &lt;code&gt;DATE TIME ID TA&lt;/code&gt;</help>
</parameter>
<parameter key="CSV#_FILTER_ID" type="text" size="large">
<help>if the data contains an "ID" column, which ID should be kept (all others will be rejected); default: station ID</help>
</parameter>
<parameter key="CSV#_SKIP_FIELDS" type="text" size="large">
<help>A space-delimited list of field to skip (first field is numbered 1). Keep in mind that when using parameters such as &lt;code&gt;UNITS_OFFSET&lt;/code&gt;, the skipped field MUST be taken into consideration (since even if a field is skipped, it is still present in the file!)</help>
......
......@@ -267,6 +267,16 @@ https://models.slf.ch/p/snowpack
</option>
<help>Water transport model to use in soil: simple bucket model or Richards equation solver. Note that Richards equation solver uses the grain size of the layer to determine the soil type, as listed at: http://models.slf.ch/p/snowpack/page/Soil-with-Richards-equation/.</help>
</parameter>
<parameter key="SOIL_EVAP_MODEL" type="alternative" default="EVAP_RESISTANCE" longlabel="true">
<option value="EVAP_RESISTANCE"><help>Resistance Approach</help></option>
<option value="RELATIVE_HUMIDITY"><help>Relative Humidity Approach</help></option>
<option value="NONE"><help>Assume saturation pressure and no extra resistance</help></option>
</parameter>
<parameter key="SOIL_THERMAL_CONDUCTIVITY" type="alternative" default="FITTED" longlabel="true">
<option value="FITTED"><help>Use fit values for soil thermal conductivity</help></option>
<option value="RAW"><help>Use the relative weights of the thermal conductivity of soil, water and ice</help></option>
</parameter>
<frame caption="Degree-day model">
<parameter type="helptext" wrap="true" section="SnowpackAdvanced">
<help>For models intercomparisons, it is possible to replace the energy balance model by a degree-day model during the melt phases. This degree-day model provides the energy fluxes at the surface as: &lt;center&gt;temp_index_degree_day*(T&lt;sub&gt;air&lt;/sub&gt; - T&lt;sub&gt;surface&lt;/sub&gt;) + temp_index_swr_factor*SW&lt;sub&gt;net&lt;/sub&gt;&lt;/center&gt;</help>
......
......@@ -44,7 +44,7 @@ CONFIG(debug) { #in release, we try everything
QMAKE_CXXFLAGS += -Wall -lto
}
VERSION = "2.0.1"
VERSION = "2.0.2"
VERSION_PE_HEADER = "2.0"
DEFINES += APP_VERSION_STR=\\\"$$VERSION\\\"
QMAKE_TARGET_COMPANY = "WSL Institute for Snow and Avalanche Research"
......
......@@ -85,7 +85,7 @@ void AboutWindow::setAboutText(QTextBrowser *textbox)
{ //hardcoded for easy access to version
textbox->setHtml("<a href=\"https://models.slf.ch/p/inishell-ng/\"><center><img src=\":/icons/inishell_192.ico\" height=\"92\" width=\"92\"></a></center> \
<center><b>INIshell version " + QString(APP_VERSION_STR) + "</b><br> \
&copy; WSL-Institut für Schnee-und Lawinenforschung <a href=\"https://www.slf.ch\">SLF</a> 2019<br> \
&copy; WSL-Institut für Schnee-und Lawinenforschung <a href=\"https://www.slf.ch\">SLF</a> 2019-2020<br> \
<a href=\"https://models.slf.ch/p/inishell-ng/\">Project page</a> &middot; <a href=\"https://models.slf.ch/p/inishell-ng/issues/\">Bug tracker</a> &middot; <a href=\"https://models.slf.ch/p/inishell-ng/source/tree/master/\">Source code</a><br></center> \
Original version: <i>Michael Reisecker, 2019 - 2020</i><br> \
Inspired by INIshell v1: <i>Mathias Bavay, Thomas Egger & Daniela Korhammer, 2011</i><br> \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment