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` ...@@ -37,7 +37,7 @@ progname=`basename $0`
METRO_VERSION=3.3.3 METRO_VERSION=3.3.3
if [[ $1 = clean ]]; then if [[ $1 = clean ]]; then
echo "* Cleaning last METRo model build attempt if necessary..." echo "* Cleaning last METRo model build attempt if necessary..."
rm -f _macadam.so *.o macadam.py macadam_wrap.c rm -f _macadam.so *.o macadam.py macadam_wrap.c
exit 0 exit 0
...@@ -116,7 +116,7 @@ if [ -z $FC ]; then ...@@ -116,7 +116,7 @@ if [ -z $FC ]; then
fi fi
echo " Fortran compilation" 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" echo " Link"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
# #
# $LastChangedDate$ # $LastChangedDate$
# $LastChangedRevision$ # $LastChangedRevision$
#
######################################################################## ########################################################################
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
...@@ -78,7 +77,7 @@ then ...@@ -78,7 +77,7 @@ then
echo "Ex: ./setup.sh /usr/local/" echo "Ex: ./setup.sh /usr/local/"
echo " ./setup.sh /home/user/program/" echo " ./setup.sh /home/user/program/"
exit 0 exit 0
fi fi
while getopts "cv" Option while getopts "cv" Option
...@@ -90,7 +89,7 @@ do ...@@ -90,7 +89,7 @@ do
echo "Usage: $progname [OPTION] destination_path" echo "Usage: $progname [OPTION] destination_path"
echo "" echo ""
echo "-c : Will compile the METRo physic model instead of using" 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 " DEPRECATED, no longer do anything, setup.sh will"
echo " always compile the METRo physic model." echo " always compile the METRo physic model."
echo "" echo ""
...@@ -136,7 +135,7 @@ if ! locate libgfortran.so.1; then ...@@ -136,7 +135,7 @@ if ! locate libgfortran.so.1; then
bCompile=1 bCompile=1
fi fi
echo "" echo ""
mkdir -p $destination_path/usr/share/metro/model/ mkdir -p $destination_path/usr/share/metro/model/
mkdir -p $destination_path/usr/lib/metro/ mkdir -p $destination_path/usr/lib/metro/
if [ $bCompile == 1 ]; then if [ $bCompile == 1 ]; then
...@@ -206,7 +205,7 @@ cd $installation_dir ...@@ -206,7 +205,7 @@ cd $installation_dir
mkdir -p $destination_path/usr/bin mkdir -p $destination_path/usr/bin
echo "* Make link to METRo executable:" echo "* Make link to METRo executable:"
echo " $destination_path/usr/bin/metro -> $destination_path/usr/share/metro/metro.py" 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 ""
echo "---------------------------------------------------" echo "---------------------------------------------------"
...@@ -218,7 +217,7 @@ echo "" ...@@ -218,7 +217,7 @@ echo ""
echo "To test the installation of METRo" echo "To test the installation of METRo"
echo "---------------------------------" echo "---------------------------------"
echo "Go into the METRo directory:" echo "Go into the METRo directory:"
echo " 'cd $destination_path/usr/bin/'" echo " 'cd $destination_path/usr/bin/'"
echo "Launch METRo selftest:" echo "Launch METRo selftest:"
echo " 'python metro --selftest'" echo " 'python metro --selftest'"
echo "Compare the files:" echo "Compare the files:"
......
...@@ -55,7 +55,7 @@ _ = metro_util.init_translation('metro_config') ...@@ -55,7 +55,7 @@ _ = metro_util.init_translation('metro_config')
METRO_CONFIG_GETTEXT_PACKAGE = "metro_config" METRO_CONFIG_GETTEXT_PACKAGE = "metro_config"
METRO_CONFIG_GETTEXT_LOCALEDIR = "./locale" METRO_CONFIG_GETTEXT_LOCALEDIR = "./locale"
# Constant definition # Constant definition
CFG_METRO_VERSION = "3.3.3" CFG_METRO_VERSION = "3.3.3"
CFG_METRO_DATE = "2019-11-06" CFG_METRO_DATE = "2019-11-06"
......
<?xml version="1.0"?> <?xml version="1.0" encoding="utf-8"?>
<station> <station>
<header> <header>
<version>1.0</version> <version>1.0</version>
<road-station>rya</road-station> <road-station>rya</road-station>
<time-zone>AST4ADT</time-zone> <time-zone>AST4ADT</time-zone>
<production-date>2003-09-26T15:34Z</production-date> <production-date>2003-09-26T15:34Z</production-date>
<coordinate> <coordinate>
<latitude>43.9847</latitude> <latitude>43.9847</latitude>
<longitude>-66.1222</longitude> <longitude>-66.1222</longitude>
</coordinate> </coordinate>
<station-type>road</station-type> <station-type>road</station-type>
</header> </header>
<roadlayer-list> <roadlayer-list>
<roadlayer> <roadlayer>
<position>1</position> <position>1</position>
<type>asphalt</type> <type>asphalt</type>
<thickness>0.1905</thickness> <thickness>0.1905</thickness>
</roadlayer> </roadlayer>
<roadlayer> <roadlayer>
<position>2</position> <position>2</position>
<type>cement</type> <type>cement</type>
<thickness>0.4570</thickness> <thickness>0.4570</thickness>
</roadlayer> </roadlayer>
</roadlayer-list> </roadlayer-list>
</station> </station>
<?xml version="1.0"?> <?xml version="1.0" encoding="utf-8"?>
<observation> <observation>
<header> <header>
<version>1.0</version> <version>1.0</version>
<road-station>rya</road-station> <road-station>rya</road-station>
</header> </header>
<measure-list> <measure-list>
<measure> <measure>
<observation-time>2005-02-24T09:06Z</observation-time> <observation-time>2005-02-24T09:06Z</observation-time>
<at>-5.6</at> <at>-5.6</at>
<td>-6.6</td> <td>-6.6</td>
<pi>0</pi> <pi>0</pi>
<ws>11</ws> <ws>11</ws>
<sc>6</sc> <sc>6</sc>
<st>-4.9</st> <st>-4.9</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T09:26Z</observation-time> <observation-time>2005-02-24T09:26Z</observation-time>
<at>-5.9</at> <at>-5.9</at>
<td>-7</td> <td>-7</td>
<pi>0</pi> <pi>0</pi>
<ws>10</ws> <ws>10</ws>
<sc>6</sc> <sc>6</sc>
<st>-5.2</st> <st>-5.2</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T09:46Z</observation-time> <observation-time>2005-02-24T09:46Z</observation-time>
<at>-6.3</at> <at>-6.3</at>
<td>-7.2</td> <td>-7.2</td>
<pi>0</pi> <pi>0</pi>
<ws>10</ws> <ws>10</ws>
<sc>6</sc> <sc>6</sc>
<st>-5.5</st> <st>-5.5</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T10:06Z</observation-time> <observation-time>2005-02-24T10:06Z</observation-time>
<at>-6.7</at> <at>-6.7</at>
<td>-7.8</td> <td>-7.8</td>
<pi>0</pi> <pi>0</pi>
<ws>8</ws> <ws>8</ws>
<sc>6</sc> <sc>6</sc>
<st>-6</st> <st>-6</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T10:26Z</observation-time> <observation-time>2005-02-24T10:26Z</observation-time>
<at>-7</at> <at>-7</at>
<td>-8.3</td> <td>-8.3</td>
<pi>0</pi> <pi>0</pi>
<ws>7</ws> <ws>7</ws>
<sc>6</sc> <sc>6</sc>
<st>-6.6</st> <st>-6.6</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T10:46Z</observation-time> <observation-time>2005-02-24T10:46Z</observation-time>
<at>-7.3</at> <at>-7.3</at>
<td>-8.8</td> <td>-8.8</td>
<pi>0</pi> <pi>0</pi>
<ws>6</ws> <ws>6</ws>
<sc>6</sc> <sc>6</sc>
<st>-7</st> <st>-7</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T11:06Z</observation-time> <observation-time>2005-02-24T11:06Z</observation-time>
<at>-7.7</at> <at>-7.7</at>
<td>-9.2</td> <td>-9.2</td>
<pi>0</pi> <pi>0</pi>
<ws>6</ws> <ws>6</ws>
<sc>6</sc> <sc>6</sc>
<st>-7.2</st> <st>-7.2</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T11:26Z</observation-time> <observation-time>2005-02-24T11:26Z</observation-time>
<at>-8.1</at> <at>-8.1</at>
<td>-9.6</td> <td>-9.6</td>
<pi>0</pi> <pi>0</pi>
<ws>5</ws> <ws>5</ws>
<sc>6</sc> <sc>6</sc>
<st>-7.4</st> <st>-7.4</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T11:46Z</observation-time> <observation-time>2005-02-24T11:46Z</observation-time>
<at>-8.2</at> <at>-8.2</at>
<td>-9.6</td> <td>-9.6</td>
<pi>0</pi> <pi>0</pi>
<ws>6</ws> <ws>6</ws>
<sc>6</sc> <sc>6</sc>
<st>-7.2</st> <st>-7.2</st>
<sst>-1.1</sst> <sst>-1.1</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T12:06Z</observation-time> <observation-time>2005-02-24T12:06Z</observation-time>
<at>-7.8</at> <at>-7.8</at>
<td>-9.6</td> <td>-9.6</td>
<pi>0</pi> <pi>0</pi>
<ws>7</ws> <ws>7</ws>
<sc>5</sc> <sc>5</sc>
<st>-7.2</st> <st>-7.2</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T12:26Z</observation-time> <observation-time>2005-02-24T12:26Z</observation-time>
<at>-7.4</at> <at>-7.4</at>
<td>-9.4</td> <td>-9.4</td>
<pi>0</pi> <pi>0</pi>
<ws>6</ws> <ws>6</ws>
<sc>5</sc> <sc>5</sc>
<st>-7</st> <st>-7</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T12:46Z</observation-time> <observation-time>2005-02-24T12:46Z</observation-time>
<at>-6.8</at> <at>-6.8</at>
<td>-8.9</td> <td>-8.9</td>
<pi>0</pi> <pi>0</pi>
<ws>8</ws> <ws>8</ws>
<sc>5</sc> <sc>5</sc>
<st>-6.8</st> <st>-6.8</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T13:06Z</observation-time> <observation-time>2005-02-24T13:06Z</observation-time>
<at>-6.4</at> <at>-6.4</at>
<td>-8.6</td> <td>-8.6</td>
<pi>0</pi> <pi>0</pi>
<ws>12</ws> <ws>12</ws>
<sc>5</sc> <sc>5</sc>
<st>-6.1</st> <st>-6.1</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T13:26Z</observation-time> <observation-time>2005-02-24T13:26Z</observation-time>
<at>-6</at> <at>-6</at>
<td>-8.4</td> <td>-8.4</td>
<pi>0</pi> <pi>0</pi>
<ws>9</ws> <ws>9</ws>
<sc>5</sc> <sc>5</sc>
<st>-4.3</st> <st>-4.3</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T13:46Z</observation-time> <observation-time>2005-02-24T13:46Z</observation-time>
<at>-5.7</at> <at>-5.7</at>
<td>-8.3</td> <td>-8.3</td>
<pi>0</pi> <pi>0</pi>
<ws>7</ws> <ws>7</ws>
<sc>6</sc> <sc>6</sc>
<st>-2</st> <st>-2</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T14:06Z</observation-time> <observation-time>2005-02-24T14:06Z</observation-time>
<at>-5.5</at> <at>-5.5</at>
<td>-8.1</td> <td>-8.1</td>
<pi>0</pi> <pi>0</pi>
<ws>11</ws> <ws>11</ws>
<sc>6</sc> <sc>6</sc>
<st>-0.7</st> <st>-0.7</st>
<sst>-1.2</sst> <sst>-1.2</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T14:26Z</observation-time> <observation-time>2005-02-24T14:26Z</observation-time>
<at>-5.5</at> <at>-5.5</at>
<td>-8.6</td> <td>-8.6</td>
<pi>0</pi> <pi>0</pi>
<ws>11</ws> <ws>11</ws>
<sc>6</sc> <sc>6</sc>
<st>0.6</st> <st>0.6</st>
<sst>-1.3</sst> <sst>-1.3</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T14:46Z</observation-time> <observation-time>2005-02-24T14:46Z</observation-time>
<at>-5.1</at> <at>-5.1</at>
<td>-8.5</td> <td>-8.5</td>
<pi>0</pi> <pi>0</pi>
<ws>12</ws> <ws>12</ws>
<sc>5</sc> <sc>5</sc>
<st>3</st> <st>3</st>
<sst>-1.3</sst> <sst>-1.3</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T15:06Z</observation-time> <observation-time>2005-02-24T15:06Z</observation-time>
<at>-5</at> <at>-5</at>
<td>-8.9</td> <td>-8.9</td>
<pi>0</pi> <pi>0</pi>
<ws>10</ws> <ws>10</ws>
<sc>5</sc> <sc>5</sc>
<st>2.9</st> <st>2.9</st>
<sst>-1.3</sst> <sst>-1.3</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T15:26Z</observation-time> <observation-time>2005-02-24T15:26Z</observation-time>
<at>-4.8</at> <at>-4.8</at>
<td>-8.5</td> <td>-8.5</td>
<pi>0</pi> <pi>0</pi>
<ws>9</ws> <ws>9</ws>
<sc>5</sc> <sc>5</sc>
<st>4.6</st> <st>4.6</st>
<sst>-1.3</sst> <sst>-1.3</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T15:46Z</observation-time> <observation-time>2005-02-24T15:46Z</observation-time>
<at>-5</at> <at>-5</at>
<td>-8.9</td> <td>-8.9</td>
<pi>0</pi> <pi>0</pi>
<ws>16</ws> <ws>16</ws>
<sc>5</sc> <sc>5</sc>
<st>6.8</st> <st>6.8</st>
<sst>-1.3</sst> <sst>-1.3</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T16:06Z</observation-time> <observation-time>2005-02-24T16:06Z</observation-time>
<at>-5.2</at> <at>-5.2</at>
<td>-9.4</td> <td>-9.4</td>
<pi>0</pi> <pi>0</pi>
<ws>9</ws> <ws>9</ws>
<sc>5</sc> <sc>5</sc>
<st>3.8</st> <st>3.8</st>
<sst>-1.3</sst> <sst>-1.3</sst>
</measure> </measure>
<measure> <measure>
<observation-time>2005-02-24T16:26Z</observation-time> <observation-time>2005-02-24T16:26Z</observation-time>
<at>-4.4</at> <at>-4.4</at>
<td>-9</td> <td>-9</td>
<pi>0</pi> <pi>0</pi>
<ws>8</ws> <ws>8</ws>
<sc>5</sc>