Documentation update

d90165b8 · Tor-Einar Skog · 67176949 · d90165b8 · d90165b8 · d90165b8
Commit d90165b8 authored 4 years ago by Tor-Einar Skog
--- a/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java
+++ b/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java
@@ -43,7 +43,7 @@ import no.nibio.vips.util.WeatherObservationListException;
 import no.nibio.vips.util.WeatherUtil;

 /**
- * @copyright 2016 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2016-2021 <a href="http://www.nibio.no/">NIBIO</a>
 * @author Tor J. Johansen <tor.johansen@nibio.no> (Model research)
 * @author Tor-Einar Skog <tor-einar.skog@nibio.no> (Programming)
 */
@@ -135,7 +135,7 @@ public class PsilaRosaeTempModel extends I18nImpl implements Model {

    @Override
    public String getLicense() {
-        return "Copyright (c) 2015 NIBIO <http://www.nibio.no/>. \n" +
+        return "Copyright (c) 2015-2021 NIBIO <http://www.nibio.no/>. \n" +
            "\n" +
            "This file is part of PsilaRosaeTempModel. \n" + 
            "PsilaRosaeTempModel is free software: you can redistribute it and/or modify \n" + 
@@ -154,7 +154,7 @@ public class PsilaRosaeTempModel extends I18nImpl implements Model {

    @Override
    public String getCopyright() {
-        return "(c) 2016 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
+        return "(c) 2015-2021 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
    }

    @Override
@@ -203,6 +203,7 @@ public class PsilaRosaeTempModel extends I18nImpl implements Model {
                "\t},\n" +
                "\t\"modelId\":\"" + MODEL_ID.toString() + "\",\n" +
                "\t\"configParameters\":{\n" +
+                "\t\t\"timeZone\": \"Europe/Oslo\",\n" +
                "\t\t\"observations\":[\n" +
                "\t\t{\n" +
                "\t\t\t\t\"timeMeasured\": \"2015-01-01T00:00:00+02:00\",\n" +

--- a/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts.properties
+++ b/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts.properties
@@ -16,6 +16,6 @@
 # 

 name=Carrot rust fly (Psila rosae) temperature model
-usage=TODO
+usage=Input data are timeZone and Observations. Observations are daily mean temperatures (TM)
 statusInterpretation=<h3>Explanation of the graph</h3>\n<p>The graphic presentation shows the progress of the day-degree calculation (the line: &laquo;Accumulated day-degrees with the base temperature of 5 degrees C&raquo;) that is the basis for the green, yellow and red warnings (the warning status in the table). The graph show straight horizontal lines for the threshold values. &laquo;Day-degree threshold for low likelihood of attack&raquo; corresponds to when the warning changes from green to yellow (260 day-degrees). &laquo;Day-degree threshold for high likelihood of attack &raquo; corresponds to when the warning changes from yellow to red (360 day-degrees). &laquo;Day-degree threshold for end of flight period&raquo; corresponds to when the warning changes from red to grey (560 day-degrees) and the flight period for the 1st generation is considered to be over. When the line &laquo; Accumulated day-degrees with the base temperature of 5 degrees C&raquo; intersects one of the lines for the day-degree threshold, the warning will advance to the next level and the color of the warning rectangle will change. The graph also shows the daily mean temperature for the relevant weather station.</p>\n<p>The graph is dynamic and the user can choose which parameters that are shown by clicking on the explanation below the graph.</p>\n<h3>Explanation of the table</h3>\n<p>Green warning indicates that the flight period has not yet begun.</p>\n<p>Yellow warning indicates that the flight period is beginning and that flies can be coming into the field.</p>\n<p>Red warning indicates peak flight period.</p>\n<p>Grey warning indicates that the flight period of the 1st generation is over.</p>\n<p>Be aware that in areas with field covers (plastic, single or double non-woven covers, etc.) with early crops the preceding season (either on the current field or neighboring fields), the flight period can start earlier due to higher soil temperature under the covers.</p>
 description=<p>{{filename="/images/plh-2007-0232.jpg" description="Foto: NIBIO Plantehelse"}}</p>\n<h3>Description of the model</h3>\n<p>The warning system model &laquo;Carrot rust fly temperature&raquo; is based on a Finnish temperature-based model (Markkula <em>et al</em>, 1998; Tiilikkala &amp; Ojanen, 1999; Markkula <em>et al</em>, 2000). The model determines the start of the flight period for the 1st and 2nd generation of carrot rust fly based on accumuleted degree-days (day-degrees) over a base temperature of 5,0 &deg;C. VIPS uses the model for the 1st generation only.</p>\n<p>Standard air temperature (temperature measured 2 m above ground) is used in the model. Degree-days are defined for this model as the sum of the difference between a base temperature of 5,0 &deg;C and the mean temperature for all days with a temperature &gt;5,0 &deg;C, in other words (daily mean temperature &ndash; 5,0 &deg;C) from 1 March (beginning when the ground has thawed).</p>\n<h3>Interpretation of the warning</h3>\n<p>Green rectangles indicate that the flight period has not yet begun. The accumulated day-degrees are &lt; 260 degree-days (day-degrees).</p>\n<p>Yellow rectangles indicate that the flight period is beginning and that flies can be coming into the field. The accumulated day-degrees are &ge; 260 degree-days (day-degrees).</p>\n<p>Red rectangles indicate peak flight period. The accumulated day-degrees are &ge; 360 degree-days (day-degrees).</p>\n<p>Grey rectangles indicate that the flight period of the 1st generation is over. The accumulated day-degrees are &ge; 560 degree-days (day-degrees).</p>\n<p>Be aware that in areas with field covers (plastic, single or double non-woven covers, etc.) with early crops the preceding season (either on the current field or neighboring fields), the flight period can start earlier due to higher soil temperature under the covers.</p>\n<p>The graphic presentation shows the progress of the day-degree calculation that is the basis for the green, yellow and red warnings (the line: &laquo;Accumulated day-degrees with the base temperature of 5 degrees C&raquo;). The graph show straight horizontal lines for the threshold values. &laquo;Day-degree threshold for low likelihood of attack&raquo; corresponds to when the warning changes from green to yellow (260 day-degrees). &laquo;Day-degree threshold for high likelihood of attack &raquo; corresponds to when the warning changes from yellow to red (360 day-degrees). &laquo;Day-degree threshold for end of flight period&raquo; corresponds to when the warning changes from red to grey (560 day-degrees) and the flight period for the 1st generation is considered to be over. When the line &laquo; Accumulated day-degrees with the base temperature of 5 degrees C&raquo; intersects one of the lines for the day-degree threshold, the warning will advance to the next level and the color of the warning rectangle will change. The graph also shows the daily mean temperature for the relevant weather station. The graph is dynamic and the user can choose which parameters that are shown by clicking on the explanation below the graph.</p>\n<h3>Warning season &ndash; start and end of the warning</h3>\n<p>Starting time: Shown in VIPS from 1 April (starting date for accumulation of degree-days beginning from when the ground has thawed).<br /> Ending time: When the model has reached the requirement for the end of the flight period for the 1st generation (560 day-degrees).</p>\n<h3>Testing and validation of the model</h3>\n<h4>National</h4>\n<p>The model has been tested for Norwegian conditions in the period of 2011-2015. Validation has shown that the model was accurate for most locations for the 1st generation. The model was, however, inaccurate for the 2nd generation for many locations and was totally incorrect for the district of J&aelig;ren. Based on the validation results, we have therefore chosen to remove warning of the 2nd generation of carrot rust fly from this model.</p>\n<h4>International</h4>\n<p>The model is in use in Finland. The extent to which the model has been validated in Finland is uncertain, but a validation was done in the summer of 1997. This validation showed that the model was quite accurate, but that the threshold temperature sm should be lowered to 255 day-degrees for the start of the flight period (as opposed to 260 degree-days in the original model) and 355 degree-days forthe peak flight period (as opposed to 360 degree-days in the original model) (Tiilikkala &amp; Ojanen, 1999).</p>\n<h3>Literature</h3>\n<p>Markkula, I., H. Ojanen and K. Tiilikkala. 1998. Forecasting and monitoring of the carrot fly (<em>Psila rosae</em>) in Finland. The 1998 Brighton Conference: Pests and Diseases: Conference Proceedings, Volume 2, pages 657-662.</p>\n<p>Tiilikkala, K. and H. Ojanen. 1999. Use of a geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</p>\n<p>Markkula, I., A. Hannukkala, A. Lehtinen, I. Mattila, H. Ojanen, S. Raisjio, P. Reijonen and K. Tiilikkala. 2000. Pest warnings and forecasts sent as SMS messages from models into "farmer's pocket". In publication: Pests &amp; Diseases 2000. Proceedings of an international conference held at the Brighton Hilton Metropole Hotel, UK, 13-16 November 2000. BCPC Conference Proceedings pages 285-290.</p>\n<p>&nbsp;</p>\n<p><strong>Contacts</strong></p>\n<p>Annette Folkedal Schj&oslash;ll <a href="mailto:annette.folkedal.schjoll@nibio.no">annette.folkedal.schjoll@nibio.no</a><br />Tor J. Johansen <a href="mailto:tor.johansen@nibio.no">tor.johansen@nibio.no</a></p>\n<h3>Links for more information (Norwegian only)</h3>\n<p>Plantevernleksikonet/gulrotflue <a href="https://www.plantevernleksikonet.no/l/oppslag/62/">https://www.plantevernleksikonet.no/l/oppslag/62/</a></p>\n<p>Plantevernguiden/gulrotflue: <a href="http://www.plantevernguiden.no/index.jsp?hideAlert=true&amp;crop1=10&amp;crop2=1_406&amp;pest1=3&amp;pest2=1_62&amp;preparation1=-1&amp;action=search&amp;searchString">http://www.plantevernguiden.no/index.jsp?hideAlert=true&amp;crop1=10&amp;crop2=1_406&amp;pest1=3&amp;pest2=1_62&amp;preparation1=-1&amp;action=search&amp;searchString</a></p>
--- a/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts_nb.properties
+++ b/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts_nb.properties
@@ -16,6 +16,6 @@
 # 

 name=Gulrotflue-svermetidspunktmodell
-usage=TODO
+usage=Input data are timeZone and Observations. Observations are daily mean temperatures (TM)
 statusInterpretation=<h2>Forklaring til grafen</h2>\n<p>Den grafiske presentasjonen viser utviklingen av d&oslash;gngradsberegningen (linjen: &laquo;Akkumulerte d&oslash;gngrader med basistemperatur 5 grader C&raquo;) som ligger til grunn for de gr&oslash;nne, gule og r&oslash;de varslene (varselstatus i tabellen)). Grafen viser rette horisontale linjer for terskelverdiene. &laquo;D&oslash;gngradsterskel for lav svermerisiko&raquo; tilsvarer terskelen der varsel g&aring;r fra gr&oslash;nt til gult (260 d&oslash;gngrader). &laquo;D&oslash;gngradsterskel for h&oslash;y svermerisiko&raquo; tilsvarer terskelen der varsel g&aring;r fra gult til r&oslash;dt (360 d&oslash;gngrader). &laquo;D&oslash;gngradsterskel for sverming avsluttet&raquo; tilsvarer terskelen der varsel g&aring;r fra r&oslash;dt til gr&aring;tt (560 d&oslash;gngrader) og sverming av 1. generasjon gulrotflue ansees &aring; v&aelig;re over. N&aring;r linjen &laquo;Akkumulerte d&oslash;gngrader med basistemperatur 5 grader C&raquo; krysser en av linjene for d&oslash;gngradsterskel, vil varslet n&aring; neste niv&aring; og fargen p&aring; varslingsboksene endres. I grafen vises ogs&aring; d&oslash;gnverdien for middeltemperatur for den aktuelle v&aelig;rstasjonen.</p>\n<p>Grafen er dynamisk og man kan velge hvilke parametere som skal vises ved &aring; trykke p&aring; forklaringstekstene under grafen.</p>\n<h2>Forklaring til tabellen</h2>\n<ul>\n<li>N&aring;r varselstatus er gr&oslash;nn, betyr dette at svermingen enda ikke har begynt.</li>\n<li>N&aring;r varselstatus er gul, betyr dette at svermingen er i startfasen og at man m&aring; v&aelig;re obs p&aring; at det kan komme innflyvere i &aring;keren.</li>\n<li>N&aring;r varselstatus er r&oslash;d, betyr dette at svermingen er p&aring; sitt mest aktive.</li>\n<li>N&aring;r varselstatus er gr&aring;, betyr dette at svermingen av 1. generasjon er over og varslingen er avsluttet.</li>\n</ul>\n<p>V&aelig;r klar over at i omr&aring;der med dekke (plast, enkel og dobbel fiberduk el. lign.) ved tidligproduksjon (enten p&aring; samme jorde eller nabojorder) &aring;ret f&oslash;r, kan svermingen starte tidligere p&aring; grunn av h&oslash;yere jordtemperatur under dekket.</p>
 description=<p>{{filename="/images/plh-2007-0232.jpg" description="Foto: NIBIO Plantehelse"}}</p>\n<h2>Modellbeskrivelse</h2>\n<p>Varslingsmodellen &laquo;Gulrotflue svermetidspunkt&raquo; er basert p&aring; en finsk, temperaturbasert modell (Markkula <em>et al</em>, 1998; Tiilikkala &amp; Ojanen, 1999; Markkula <em>et al</em>, 2000). Modellen beregner tidspunkt for sverming av 1. generasjon og 2. generasjon av gulrotflue basert p&aring; akkumulering av graddager (d&oslash;gngrader) over en basistemperatur p&aring; 5 &deg;C. I VIPS benyttes modellen kun for 1. generasjon.</p>\n<p>Det er standard lufttemperatur (temperatur m&aring;lt 2 m over bakken) som benyttes i modellen. Graddager er her definert som summen av differansen mellom en basistemperatur p&aring; 5 &deg;C og d&oslash;gnmiddeltemperatur for alle d&oslash;gn med temperatur &gt;5 &deg;C dvs. summen av (d&oslash;gnmiddeltemperatur - 5 &deg;C) fra 1. mars (fra det er telefritt i jorda).</p>\n<h2>Tolking av varsel</h2>\n<p>Gr&oslash;nne bokser betyr at svermingen enda ikke har begynt. Akkumulering av d&oslash;gngrader er &lt; 260 graddager (d&oslash;gngrader).</p>\n<p>Gule bokser betyr svermingen er i startfasen og at man m&aring; v&aelig;re obs p&aring; at det kan komme innflyvere i &aring;keren. Akkumulering av d&oslash;gngrader er &ge; 260 graddager (d&oslash;gngrader).</p>\n<p>R&oslash;de bokser betyr svermingen er p&aring; sitt mest aktive. Akkumulering av d&oslash;gngrader er &ge; 360 graddager (d&oslash;gngrader).</p>\n<p>Gr&aring; bokser betyr at svermingen av 1. generasjon er over og varslingen er avsluttet. Akkumulering av d&oslash;gngrader er &ge; 560 graddager (d&oslash;gngrader).</p>\n<p>V&aelig;r klar over at i omr&aring;der med dekke (plast, enkel og dobbel fiberduk el. lign.) ved tidligproduksjon (enten p&aring; samme jorde eller nabojorder) &aring;ret f&oslash;r, kan svermingen starte tidligere p&aring; grunn av h&oslash;yere jordtemperatur under dekket.</p>\n<p>Den grafiske presentasjonen viser utviklingen av d&oslash;gngradsberegningen som ligger til grunn for de gr&oslash;nne, gule og r&oslash;de varslene (linjen: &laquo;Akkumulerte d&oslash;gngrader med basistemperatur 5 grader C&raquo;). Grafen viser rette horisontale linjer for terskelverdiene. &laquo;D&oslash;gngradsterskel for lav svermerisiko&raquo; tilsvarer terskelen der varsel g&aring;r fra gr&oslash;nt til gult (260 d&oslash;gngrader). &laquo;D&oslash;gngradsterskel for h&oslash;y svermerisiko&raquo; tilsvarer terskelen der varsel g&aring;r fra gult til r&oslash;dt (360 d&oslash;gngrader). &laquo;D&oslash;gngradsterskel for sverming avsluttet&raquo; tilsvarer terskelen der varsel g&aring;r fra r&oslash;dt til gr&aring;tt (560 d&oslash;gngrader) og sverming av 1. generasjon gulrotflue ansees &aring; v&aelig;re over. N&aring;r linjen &laquo;Akkumulerte d&oslash;gngrader med basistemperatur 5 grader C&raquo; krysser en av linjene for d&oslash;gngradsterskel, vil varslet n&aring; neste niv&aring; og fargen p&aring; varslingsboksene endres. I grafen vises ogs&aring; d&oslash;gnverdien for middeltemperatur for den aktuelle v&aelig;rstasjonen. Grafen er dynamisk og man kan velge hvilke parametere som skal vises ved &aring; trykke p&aring; forklaringstekstene under grafen.</p>\n<h2>Varslingssesong &ndash; oppstart og avslutning av varsel</h2>\n<p>Starttidspunkt: Vises i VIPS fra 1. april (startdato for akkumulering av graddager fra det er telefritt) i jorda.</p>\n<p>Sluttidspunkt: N&aring;r modellen har n&aring;dd kravet til d&oslash;gngrader for avsluttet sverming av 1. generasjon (560 d&oslash;gngrader).</p>\n<h2>Utpr&oslash;ving og validering av modellen</h2>\n<h3>Nasjonalt</h3>\n<p>Modellen har v&aelig;rt testet og evaluert for norske forhold i perioden 2011-2015. Valideringen har vist at modellen stemte ganske bra for de fleste steder for 1. generasjon. Modellen stemte imidlertid d&aring;rlig for 2. generasjon for mange lokaliteter og var direkte feil for J&aelig;ren-distriktet. P&aring; bakgrunn av resultatene fra valideringen har vi derfor valgt &aring; fjerne varsling av 2. generasjon gulrotflue med denne modellen.</p>\n<h3>Internasjonalt</h3>\n<p>Modellen er i bruk i Finland. Det er usikkert hvor omfattende modellen er validert i Finland, men det er utf&oslash;rt en validering sommeren 1997. Denne valideringen tilsa at modellen stemte noks&aring; bra, men at terskeltemperatursummen burde reduseres til 255 graddager for svermingsstart (mot 260 graddager i den opprinnelige modellen) og 355 graddager for svermetoppen (mot 360 daggrader i den opprinnelige modellen) (Tiilikkala &amp; Ojanen, 1999).</p>\n<h2>Referanser</h2>\n<ul>\n<li>Markkula, I., H. Ojanen and K. Tiilikkala. 1998. Forecasting and monitoring of the carrot fly (Psila rosae) in Finland. The 1998 Brighton Conference: Pests and Diseases: Conference Proceedings, Volume 2, pages 657-662.</li>\n<li>Tiilikkala, K. and H. Ojanen. 1999. Use of a geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</li>\n<li>Markkula, I., A. Hannukkala, A. Lehtinen, I. Mattila, H. Ojanen, S. Raisjio, P. Reijonen and K. Tiilikkala. 2000. Pest warnings and forecasts sent as SMS messages from models into "farmer's pocket". In publication: Pests &amp; Diseases 2000. Proceedings of an international conference held at the Brighton Hilton Metropole Hotel, UK, 13-16 November 2000. BCPC Conference Proceedings pages 285-290.</li>\n</ul>\n<h2>Kontaktpersoner</h2>\n<ul>\n<li><a href="http://www.nibio.no/ansatte/annette_folkedalschjll" target="new">Annette Folkedal Schj&oslash;ll</a></li>\n<li><a href="http://www.nibio.no/ansatte/tor_johansen" target="new">Tor J. Johansen</a></li>\n</ul>\n<h2>Lenker til mer informasjon</h2>\n<ul>\n<li><a href="http://leksikon.nibio.no/vieworganism.php?organismId=1_62&amp;showMacroOrganisms=false" target="new">Plantevernleksikonet/gulrotflue</a></li>\n<li><a href="http://www.plantevernguiden.no/index.jsp?hideAlert=true&amp;crop1=10&amp;crop2=1_406&amp;pest1=3&amp;pest2=1_62&amp;preparation1=-1&amp;action=search&amp;searchString=" target="new">Plantevernguiden/gulrotflue</a></li>\n</ul>