Commit 7928c392 authored by Sasa Zhang's avatar Sasa Zhang
Browse files

reformated the indentation of xml files and made some minor changes on test_suite.py

parent 09c69e3f
Pipeline #189486 passed with stage
in 1 minute and 11 seconds
......@@ -37,7 +37,7 @@ progname=`basename $0`
METRO_VERSION=3.3.3
if [[ $1 = clean ]]; then
if [[ $1 = clean ]]; then
echo "* Cleaning last METRo model build attempt if necessary..."
rm -f _macadam.so *.o macadam.py macadam_wrap.c
exit 0
......@@ -116,7 +116,7 @@ if [ -z $FC ]; then
fi
echo " Fortran compilation"
$FC -Wall -Wsurprising -W -c -fPIC $FORTRAN_DEFAULT_INTEGER lib_gen.f grille.f array2matrix.f initial.f coupla.f lib_therm.f flxsurfz.f balanc.f constPhys.f
$FC -Wall -Wsurprising -W -c -fPIC $FORTRAN_DEFAULT_INTEGER lib_gen.f grille.f array2matrix.f initial.f coupla.f lib_therm.f flxsurfz.f balanc.f constPhys.f
echo " Link"
......
......@@ -14,7 +14,6 @@
#
# $LastChangedDate$
# $LastChangedRevision$
#
########################################################################
# 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
......@@ -78,7 +77,7 @@ then
echo "Ex: ./setup.sh /usr/local/"
echo " ./setup.sh /home/user/program/"
exit 0
fi
fi
while getopts "cv" Option
......@@ -90,7 +89,7 @@ do
echo "Usage: $progname [OPTION] destination_path"
echo ""
echo "-c : Will compile the METRo physic model instead of using"
echo " the provided binary. Need gfortran compiler."
echo " the provided binary. Need gfortran compiler."
echo " DEPRECATED, no longer do anything, setup.sh will"
echo " always compile the METRo physic model."
echo ""
......@@ -136,7 +135,7 @@ if ! locate libgfortran.so.1; then
bCompile=1
fi
echo ""
mkdir -p $destination_path/usr/share/metro/model/
mkdir -p $destination_path/usr/lib/metro/
if [ $bCompile == 1 ]; then
......@@ -206,7 +205,7 @@ cd $installation_dir
mkdir -p $destination_path/usr/bin
echo "* Make link to METRo executable:"
echo " $destination_path/usr/bin/metro -> $destination_path/usr/share/metro/metro.py"
ln -sf ../share/metro/metro.py $destination_path/usr/bin/metro
ln -sf ../share/metro/metro.py $destination_path/usr/bin/metro
echo ""
echo "---------------------------------------------------"
......@@ -218,7 +217,7 @@ echo ""
echo "To test the installation of METRo"
echo "---------------------------------"
echo "Go into the METRo directory:"
echo " 'cd $destination_path/usr/bin/'"
echo " 'cd $destination_path/usr/bin/'"
echo "Launch METRo selftest:"
echo " 'python metro --selftest'"
echo "Compare the files:"
......
......@@ -55,7 +55,7 @@ _ = metro_util.init_translation('metro_config')
METRO_CONFIG_GETTEXT_PACKAGE = "metro_config"
METRO_CONFIG_GETTEXT_LOCALEDIR = "./locale"
# Constant definition
# Constant definition
CFG_METRO_VERSION = "3.3.3"
CFG_METRO_DATE = "2019-11-06"
......
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<forecast>
<header>
<filetype>forecast</filetype>
<version>1.1</version>
<station-id>180</station-id>
<production-date>2005-02-24T20:00Z</production-date>
</header>
<prediction-list>
<prediction>
<forecast-time>2005-02-24T21:00Z</forecast-time>
<at>-5</at>
<td>-9</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>8</ws>
<ap>1014</ap>
<cc>60</cc>
</prediction>
<prediction>
<forecast-time>2005-02-24T22:00Z</forecast-time>
<at>-6</at>
<td>-10</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>7</ws>
<ap>1014</ap>
<cc>60</cc>
</prediction>
<prediction>
<forecast-time>2005-02-24T23:00Z</forecast-time>
<at>-7</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>70</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T00:00Z</forecast-time>
<at>-7</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>70</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T01:00Z</forecast-time>
<at>-8</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>70</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T02:00Z</forecast-time>
<at>-8</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>80</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T03:00Z</forecast-time>
<at>-8</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>80</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T04:00Z</forecast-time>
<at>-9</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>7</ws>
<ap>1014</ap>
<cc>90</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T05:00Z</forecast-time>
<at>-9</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>8</ws>
<ap>1014</ap>
<cc>90</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T06:00Z</forecast-time>
<at>-9</at>
<td>-11</td>
<ra>0</ra>
<sn>0.2</sn>
<pi>2</pi>
<ws>9</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T07:00Z</forecast-time>
<at>-9</at>
<td>-11</td>
<ra>0</ra>
<sn>0.5</sn>
<pi>2</pi>
<ws>10</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T08:00Z</forecast-time>
<at>-9</at>
<td>-11</td>
<ra>0</ra>
<sn>0.5</sn>
<pi>2</pi>
<ws>11</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T09:00Z</forecast-time>
<at>-9</at>
<td>-10</td>
<ra>0</ra>
<sn>0.8</sn>
<pi>2</pi>
<ws>13</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T10:00Z</forecast-time>
<at>-9</at>
<td>-10</td>
<ra>0</ra>
<sn>1</sn>
<pi>2</pi>
<ws>13</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T11:00Z</forecast-time>
<at>-9</at>
<td>-10</td>
<ra>0</ra>
<sn>1.5</sn>
<pi>2</pi>
<ws>14</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T12:00Z</forecast-time>
<at>-9</at>
<td>-9</td>
<ra>0</ra>
<sn>1.5</sn>
<pi>2</pi>
<ws>15</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T13:00Z</forecast-time>
<at>-9</at>
<td>-9</td>
<ra>0</ra>
<sn>1.5</sn>
<pi>2</pi>
<ws>15</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T14:00Z</forecast-time>
<at>-9</at>
<td>-9</td>
<ra>0</ra>
<sn>1.5</sn>
<pi>2</pi>
<ws>16</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T15:00Z</forecast-time>
<at>-8</at>
<td>-8</td>
<ra>0</ra>
<sn>1.5</sn>
<pi>2</pi>
<ws>17</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T16:00Z</forecast-time>
<at>-8</at>
<td>-8</td>
<ra>0</ra>
<sn>1</sn>
<pi>2</pi>
<ws>18</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T17:00Z</forecast-time>
<at>-7</at>
<td>-8</td>
<ra>0</ra>
<sn>1</sn>
<pi>2</pi>
<ws>19</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T18:00Z</forecast-time>
<at>-6</at>
<td>-7</td>
<ra>0</ra>
<sn>0.8</sn>
<pi>2</pi>
<ws>20</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T19:00Z</forecast-time>
<at>-6</at>
<td>-8</td>
<ra>0</ra>
<sn>0.5</sn>
<pi>2</pi>
<ws>19</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T20:00Z</forecast-time>
<at>-6</at>
<td>-8</td>
<ra>0</ra>
<sn>0.2</sn>
<pi>2</pi>
<ws>18</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T21:00Z</forecast-time>
<at>-6</at>
<td>-8</td>
<ra>0</ra>
<sn>0.2</sn>
<pi>2</pi>
<ws>18</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T22:00Z</forecast-time>
<at>-7</at>
<td>-9</td>
<ra>0</ra>
<sn>0.2</sn>
<pi>2</pi>
<ws>17</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T23:00Z</forecast-time>
<at>-7</at>
<td>-9</td>
<ra>0</ra>
<sn>0.1</sn>
<pi>2</pi>
<ws>16</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T00:00Z</forecast-time>
<at>-7</at>
<td>-9</td>
<ra>0</ra>
<sn>0.1</sn>
<pi>2</pi>
<ws>16</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T01:00Z</forecast-time>
<at>-8</at>
<td>-10</td>
<ra>0</ra>
<sn>0.1</sn>
<pi>2</pi>
<ws>16</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T02:00Z</forecast-time>
<at>-8</at>
<td>-10</td>
<ra>0</ra>
<sn>0.1</sn>
<pi>2</pi>
<ws>17</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T03:00Z</forecast-time>
<at>-8</at>
<td>-10</td>
<ra>0</ra>
<sn>0.1</sn>
<pi>2</pi>
<ws>18</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T04:00Z</forecast-time>
<at>-9</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>18</ws>
<ap>1014</ap>
<cc>100</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T05:00Z</forecast-time>
<at>-9</at>
<td>-12</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>19</ws>
<ap>1014</ap>
<cc>90</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T06:00Z</forecast-time>
<at>-9</at>
<td>-12</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>19</ws>
<ap>1014</ap>
<cc>90</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T07:00Z</forecast-time>
<at>-9</at>
<td>-12</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>19</ws>
<ap>1014</ap>
<cc>90</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T08:00Z</forecast-time>
<at>-9</at>
<td>-12</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>20</ws>
<ap>1014</ap>
<cc>80</cc>
</prediction>
<prediction>
<forecast-time>2005-02-26T09:00Z</forecast-time>
<at>-9</at>
<td>-12</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>20</ws>
<ap>1014</ap>
<cc>80</cc>
</prediction>
</prediction-list>
<header>
<filetype>forecast</filetype>
<version>1.1</version>
<station-id>180</station-id>
<production-date>2005-02-24T20:00Z</production-date>
</header>
<prediction-list>
<prediction>
<forecast-time>2005-02-24T21:00Z</forecast-time>
<at>-5</at>
<td>-9</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>8</ws>
<ap>1014</ap>
<cc>60</cc>
</prediction>
<prediction>
<forecast-time>2005-02-24T22:00Z</forecast-time>
<at>-6</at>
<td>-10</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>7</ws>
<ap>1014</ap>
<cc>60</cc>
</prediction>
<prediction>
<forecast-time>2005-02-24T23:00Z</forecast-time>
<at>-7</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>70</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T00:00Z</forecast-time>
<at>-7</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>70</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T01:00Z</forecast-time>
<at>-8</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>70</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T02:00Z</forecast-time>
<at>-8</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>80</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T03:00Z</forecast-time>
<at>-8</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>6</ws>
<ap>1014</ap>
<cc>80</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T04:00Z</forecast-time>
<at>-9</at>
<td>-11</td>
<ra>0</ra>
<sn>0</sn>
<pi>2</pi>
<ws>7</ws>
<ap>1014</ap>
<cc>90</cc>
</prediction>
<prediction>
<forecast-time>2005-02-25T05:00Z</forecast-time>
<at>-9</at>
<td>-11</td>