Commit 18f1362a authored by Sasa Zhang's avatar Sasa Zhang
Browse files

first commit after python3 push: modifications on input xml files and removal...

first commit after python3 push: modifications on input xml files and removal of certain commentations
parent e0a77e80
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
#
# METRo : Model of the Environment and Temperature of Roads
# METRo is Free and is proudly provided by the Government of Canada
......@@ -37,7 +36,7 @@
Date: November 10th 2004
Description: Crer les fichiers .po correspondant au .py. Ecrit ces fichiers dans /tmp/translate pour chacun de
Description: Creer les fichiers .po correspondant au .py. Ecrit ces fichiers dans /tmp/translate pour chacun de
ces fichiers, il faut mettre la meme string qu'il y a dans msgid a l'interieur de msgstr.
Compare ensuite les fichier dans /locale/en/LC_MESSAGES/*.po avec ceux contenu dans /tmp/translate
s'il y a une difference, on fait un merge avec les fichiers dans en et fr.
......
#!/usr/bin/env python
# -*- coding: iso-8859-15 -*-
#
# METRo : Model of the Environment and Temperature of Roads
# METRo is Free and is proudly provided by the Government of Canada
......
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
#
# METRo : Model of the Environment and Temperature of Roads
# METRo is Free and is proudly provided by the Government of Canada
......@@ -38,7 +37,7 @@
Date: November 17th 2004
Description: Crer les fichiers .mo correspondant au .po dans un rpertoire.
Description: Creer les fichiers .mo correspondant au .po dans un repertoire.
"""
......
#!/usr/bin/env python
# -*- coding: iso-8859-15 -*-
#
# METRo : Model of the Environment and Temperature of Roads
# METRo is Free and is proudly provided by the Government of Canada
......
# -*- coding: iso-8859-1 -*-
# METRo : Model of the Environment and Temperature of Roads
# METRo is Free and is proudly provided by the Government of Canada
# Copyright (C) Her Majesty The Queen in Right of Canada, Environment Canada, 2006
......
# -*- coding: iso-8859-15 -*-
# METRo : Model of the Environment and Temperature of Roads
# METRo is Free and is proudly provided by the Government of Canada
# Copyright (C) Her Majesty The Queen in Right of Canada, Environment Canada, 2006
......
# # -*- coding:iso-8859-1 -*-
# METRo : Model of the Environment and Temperature of Roads
# METRo is Free and is proudly provided by the Government of Canada
# Copyright (C) Her Majesty The Queen in Right of Canada, Environment Canada, 2006
......@@ -36,7 +35,7 @@
Notes:
Author: Franois Fortin
Author: Francois Fortin
Date: Somewhere in the summer 2004
"""
......
......@@ -7,13 +7,13 @@
**
** Date: April 16, 2004
**
** Description: .h qui contient les constantes qui taient autrefois dans
** params.cdk. L'allocation dynamique tant impossible faire avec un
** pointeur cr en C et pass au Fortran, l'utilisation de constante comme
** DTMAX doit tre maintenu.
** Description: .h qui contient les constantes qui etaient autrefois dans
** params.cdk. L'allocation dynamique etant impossible a faire avec un
** pointeur cree en C et passe au Fortran, l'utilisation de constante comme
** DTMAX doit etre maintenu.
**
** TODO: Enlever les constantes mesure que le code fortran les utilisant
** est remplac par du code en C.
** TODO: Enlever les constantes a mesure que le code fortran les utilisant
** est remplace par du code en C.
**
****************************************************************************/
......@@ -23,7 +23,7 @@
#define TRUE 1
#define FALSE 0
/* Pas de temps du modle de bilan nergtique */
/* Pas de temps du modele de bilan energetique */
/* Model time step in second for the energy balance */
#define dDT 30.0
......
......@@ -15,13 +15,13 @@
<roadlayer-list>
<roadlayer>
<position>1</position>
<type>asphalt</type>
<thickness>0.1905</thickness>
</roadlayer>
<type>asphalt</type>
<thickness>0.1905</thickness>
</roadlayer>
<roadlayer>
<position>2</position>
<type>cement</type>
<thickness>0.4570</thickness>
</roadlayer>
<thickness>0.4570</thickness>
</roadlayer>
</roadlayer-list>
</station>
<?xml version="1.0"?>
<observation>
<header>
<version>1.0</version>
<road-station>rya</road-station>
</header>
<measure-list>
<measure>
<observation-time>2005-02-24T09:06Z</observation-time>
<at>-5.6</at>
<td>-6.6</td>
<pi>0</pi>
<ws>11</ws>
<sc>6</sc>
<st>-4.9</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T09:26Z</observation-time>
<at>-5.9</at>
<td>-7</td>
<pi>0</pi>
<ws>10</ws>
<sc>6</sc>
<st>-5.2</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T09:46Z</observation-time>
<at>-6.3</at>
<td>-7.2</td>
<pi>0</pi>
<ws>10</ws>
<sc>6</sc>
<st>-5.5</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T10:06Z</observation-time>
<at>-6.7</at>
<td>-7.8</td>
<pi>0</pi>
<ws>8</ws>
<sc>6</sc>
<st>-6</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T10:26Z</observation-time>
<at>-7</at>
<td>-8.3</td>
<pi>0</pi>
<ws>7</ws>
<sc>6</sc>
<st>-6.6</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T10:46Z</observation-time>
<at>-7.3</at>
<td>-8.8</td>
<pi>0</pi>
<ws>6</ws>
<sc>6</sc>
<st>-7</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T11:06Z</observation-time>
<at>-7.7</at>
<td>-9.2</td>
<pi>0</pi>
<ws>6</ws>
<sc>6</sc>
<st>-7.2</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T11:26Z</observation-time>
<at>-8.1</at>
<td>-9.6</td>
<pi>0</pi>
<ws>5</ws>
<sc>6</sc>
<st>-7.4</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T11:46Z</observation-time>
<at>-8.2</at>
<td>-9.6</td>
<pi>0</pi>
<ws>6</ws>
<sc>6</sc>
<st>-7.2</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T12:06Z</observation-time>
<at>-7.8</at>
<td>-9.6</td>
<pi>0</pi>
<ws>7</ws>
<sc>5</sc>
<st>-7.2</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T12:26Z</observation-time>
<at>-7.4</at>
<td>-9.4</td>
<pi>0</pi>
<ws>6</ws>
<sc>5</sc>
<st>-7</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T12:46Z</observation-time>
<at>-6.8</at>
<td>-8.9</td>
<pi>0</pi>
<ws>8</ws>
<sc>5</sc>
<st>-6.8</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T13:06Z</observation-time>
<at>-6.4</at>
<td>-8.6</td>
<pi>0</pi>
<ws>12</ws>
<sc>5</sc>
<st>-6.1</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T13:26Z</observation-time>
<at>-6</at>
<td>-8.4</td>
<pi>0</pi>
<ws>9</ws>
<sc>5</sc>
<st>-4.3</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T13:46Z</observation-time>
<at>-5.7</at>
<td>-8.3</td>
<pi>0</pi>
<ws>7</ws>
<sc>6</sc>
<st>-2</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T14:06Z</observation-time>
<at>-5.5</at>
<td>-8.1</td>
<pi>0</pi>
<ws>11</ws>
<sc>6</sc>
<st>-0.7</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T14:26Z</observation-time>
<at>-5.5</at>
<td>-8.6</td>
<pi>0</pi>
<ws>11</ws>
<sc>6</sc>
<st>0.6</st>
<sst>-1.3</sst>
</measure>
<measure>
<observation-time>2005-02-24T14:46Z</observation-time>
<at>-5.1</at>
<td>-8.5</td>
<pi>0</pi>
<ws>12</ws>
<sc>5</sc>
<st>3</st>
<sst>-1.3</sst>
</measure>
<measure>
<observation-time>2005-02-24T15:06Z</observation-time>
<at>-5</at>
<td>-8.9</td>
<pi>0</pi>
<ws>10</ws>
<sc>5</sc>
<st>2.9</st>
<sst>-1.3</sst>
</measure>
<measure>
<observation-time>2005-02-24T15:26Z</observation-time>
<at>-4.8</at>
<td>-8.5</td>
<pi>0</pi>
<ws>9</ws>
<sc>5</sc>
<st>4.6</st>
<sst>-1.3</sst>
</measure>
<measure>
<observation-time>2005-02-24T15:46Z</observation-time>
<at>-5</at>
<td>-8.9</td>
<pi>0</pi>
<ws>16</ws>
<sc>5</sc>
<st>6.8</st>
<sst>-1.3</sst>
</measure>
<measure>
<observation-time>2005-02-24T16:06Z</observation-time>
<at>-5.2</at>
<td>-9.4</td>
<pi>0</pi>
<ws>9</ws>
<sc>5</sc>
<st>3.8</st>
<sst>-1.3</sst>
</measure>
<measure>
<observation-time>2005-02-24T16:26Z</observation-time>
<at>-4.4</at>
<td>-9</td>
<pi>0</pi>
<ws>8</ws>
<sc>5</sc>
<st>7</st>
<sst>-1.3</sst>
</measure>
<measure>
<observation-time>2005-02-24T16:46Z</observation-time>
<at>-4.8</at>
<td>-9.3</td>
<pi>0</pi>
<ws>9</ws>
<sc>5</sc>
<st>5.9</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T17:06Z</observation-time>
<at>-5.1</at>
<td>-9</td>
<pi>0</pi>
<ws>10</ws>
<sc>5</sc>
<st>4.1</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T17:26Z</observation-time>
<at>-4.9</at>
<td>-9.4</td>
<pi>0</pi>
<ws>11</ws>
<sc>5</sc>
<st>5.8</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T17:46Z</observation-time>
<at>-5</at>
<td>-9.4</td>
<pi>0</pi>
<ws>8</ws>
<sc>5</sc>
<st>6.4</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T18:06Z</observation-time>
<at>-4.3</at>
<td>-9</td>
<pi>0</pi>
<ws>14</ws>
<sc>3</sc>
<st>10</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T18:26Z</observation-time>
<at>-4.3</at>
<td>-9.3</td>
<pi>0</pi>
<ws>11</ws>
<sc>3</sc>
<st>9.9</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T18:46Z</observation-time>
<at>-5</at>
<td>-9.4</td>
<pi>0</pi>
<ws>11</ws>
<sc>3</sc>
<st>9.3</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T19:06Z</observation-time>
<at>-5.3</at>
<td>-9.5</td>
<pi>0</pi>
<ws>7</ws>
<sc>3</sc>
<st>7.9</st>
<sst>-1</sst>
</measure>
<measure>
<observation-time>2005-02-24T19:26Z</observation-time>
<at>-5.5</at>
<td>-9.8</td>
<pi>0</pi>
<ws>10</ws>
<sc>3</sc>
<st>7.7</st>
<sst>-1</sst>
</measure>
<measure>
<observation-time>2005-02-24T19:46Z</observation-time>
<at>-5.8</at>
<td>-10</td>
<pi>0</pi>
<ws>11</ws>
<sc>3</sc>
<st>5</st>
<sst>-0.9</sst>
</measure>
<measure>
<observation-time>2005-02-24T20:06Z</observation-time>
<at>-5.7</at>
<td>-10.3</td>
<pi>0</pi>
<ws>10</ws>
<sc>3</sc>
<st>4.3</st>
<sst>-0.9</sst>
</measure>
<measure>
<observation-time>2005-02-24T20:26Z</observation-time>
<at>-5.8</at>
<td>-10.5</td>
<pi>0</pi>
<ws>9</ws>
<sc>3</sc>
<st>3.6</st>
<sst>-0.8</sst>
</measure>
<measure>
<observation-time>2005-02-24T20:46Z</observation-time>
<at>-6.1</at>
<td>-10.5</td>
<pi>0</pi>
<ws>14</ws>
<sc>3</sc>
<st>2.3</st>
<sst>-0.8</sst>
</measure>
<measure>
<observation-time>2005-02-24T21:06Z</observation-time>
<at>-6.4</at>
<td>-10.4</td>
<pi>0</pi>
<ws>10</ws>
<sc>3</sc>
<st>0.4</st>
<sst>-0.7</sst>
</measure>
<measure>
<observation-time>2005-02-24T21:26Z</observation-time>
<at>-6.7</at>
<td>-10.5</td>
<pi>0</pi>
<ws>7</ws>
<sc>3</sc>
<st>-0.9</st>
<sst>-0.7</sst>
</measure>
</measure-list>
<observation>
<header>
<version>1.0</version>
<road-station>rya</road-station>
</header>
<measure-list>
<measure>
<observation-time>2005-02-24T09:06Z</observation-time>
<at>-5.6</at>
<td>-6.6</td>
<pi>0</pi>
<ws>11</ws>
<sc>6</sc>
<st>-4.9</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T09:26Z</observation-time>
<at>-5.9</at>
<td>-7</td>
<pi>0</pi>
<ws>10</ws>
<sc>6</sc>
<st>-5.2</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T09:46Z</observation-time>
<at>-6.3</at>
<td>-7.2</td>
<pi>0</pi>
<ws>10</ws>
<sc>6</sc>
<st>-5.5</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T10:06Z</observation-time>
<at>-6.7</at>
<td>-7.8</td>
<pi>0</pi>
<ws>8</ws>
<sc>6</sc>
<st>-6</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T10:26Z</observation-time>
<at>-7</at>
<td>-8.3</td>
<pi>0</pi>
<ws>7</ws>
<sc>6</sc>
<st>-6.6</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T10:46Z</observation-time>
<at>-7.3</at>
<td>-8.8</td>
<pi>0</pi>
<ws>6</ws>
<sc>6</sc>
<st>-7</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T11:06Z</observation-time>
<at>-7.7</at>
<td>-9.2</td>
<pi>0</pi>
<ws>6</ws>
<sc>6</sc>
<st>-7.2</st>
<sst>-1.1</sst>
</measure>
<measure>
<observation-time>2005-02-24T11:26Z</observation-time>
<at>-8.1</at>
<td>-9.6</td>
<pi>0</pi>
<ws>5</ws>
<sc>6</sc>
<st>-7.4</st>
<sst>-1.2</sst>
</measure>
<measure>
<observation-time>2005-02-24T11:46Z</observation-time>