From 9ce6c5f45786422e75acd55d861f65c12610e3d8 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Wed, 15 Oct 2014 14:23:19 +0200 Subject: [PATCH] Changed License to Bioforsk Open Source License --- .../model/applescabmodel/texts.properties | 32 +++++++++---------- .../model/applescabmodel/texts_nb.properties | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts.properties b/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts.properties index a5e6fff..1efbf20 100644 --- a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts.properties +++ b/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts.properties @@ -1,19 +1,19 @@ -# Copyright (C) 2014 Bioforsk -# -# This file is part of VIPS/AppleScabModel -# -# VIPS/AppleScabModel is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# VIPS/AppleScabModel 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with VIPS/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. +# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. +# +# This file is part of AppleScabModel. +# AppleScabModel is free software: you can redistribute it and/or modify +# it under the terms of the Bioforsk Open Source License as published by +# Bioforsk, either version 1 of the License, or (at your option) any +# later version. +# +# AppleScabModel 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 +# Bioforsk Open Source License for more details. +# +# You should have received a copy of the Bioforsk Open Source License +# along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. +# name=Apple Scab Model usage=Description of required input parameters:\nstartDateAscosporeMaturity - The date for when to start calculation of ascospore maturity. It normally coincides with the date for "Green tip" (See description of model)\ntimeZone - What timezone the calculation is for. Necessary to calculate daily values from the provided hourly values. See this list of time zones: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones (Column "TZ")\nobservations - list of weather data. The following parameters are required:\n* TM - Average temperature (Degrees Celcius)\n* BT - Leaf wetness (Minutes/hour) (IF you don't have leaf wetness, you must provide UM (relative humidity). Then we will calculate the leaf wetness.\n* RR - Precipitation (Millimeters)\nThese should all be complete timeseries of hourly data from the same time period.\nstartDateAscosporeMaturity must be within the timeseries of weather data. diff --git a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts_nb.properties b/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts_nb.properties index a44c9be..6b2b49b 100644 --- a/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts_nb.properties +++ b/src/main/resources/no/bioforsk/vips/model/applescabmodel/texts_nb.properties @@ -1,19 +1,19 @@ -# Copyright (C) 2014 Bioforsk -# -# This file is part of VIPS/AppleScabModel -# -# VIPS/AppleScabModel is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# VIPS/AppleScabModel 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with VIPS/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. +# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. +# +# This file is part of AppleScabModel. +# AppleScabModel is free software: you can redistribute it and/or modify +# it under the terms of the Bioforsk Open Source License as published by +# Bioforsk, either version 1 of the License, or (at your option) any +# later version. +# +# AppleScabModel 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 +# Bioforsk Open Source License for more details. +# +# You should have received a copy of the Bioforsk Open Source License +# along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. +# name=Epleskurvmodell -- GitLab