Commit 5d1acfb2 authored by François Fortin's avatar François Fortin
Browse files

Merge branch 'before_final_release' into 'master'

Before final release

See merge request !11
parents ce98119d f67b7c96
Pipeline #197746 passed with stage
in 1 minute and 34 seconds
...@@ -125,7 +125,7 @@ $FC -shared macadam.o macadam_wrap.o lib_gen.o grille.o array2matrix.o initial ...@@ -125,7 +125,7 @@ $FC -shared macadam.o macadam_wrap.o lib_gen.o grille.o array2matrix.o initial
echo " Copying .so in usr/share/metro/model" echo " Copying .so in usr/share/metro/model"
if [ ! -d $destination_path/usr/share/metro/model ]; then if [ ! -d $destination_path/usr/share/metro/model ]; then
mkdir $destination_path/usr/share/metro/model mkdir -p $destination_path/usr/share/metro/model
fi fi
cp macadam.py $destination_path/usr/share/metro/model/ cp macadam.py $destination_path/usr/share/metro/model/
......
...@@ -147,7 +147,7 @@ if [ $bCompile == 1 ]; then ...@@ -147,7 +147,7 @@ if [ $bCompile == 1 ]; then
echo "to properly install METRo." echo "to properly install METRo."
echo "Please set environment variable PYTHON_INCLUDE to your" echo "Please set environment variable PYTHON_INCLUDE to your"
echo "python include directory." echo "python include directory."
echo "Ex: export PYTHON_INCLUDE=\"/usr/local/include/python2.3\"" echo "Ex: export PYTHON_INCLUDE=\"/usr/include/python3.6\""
echo "----------------------------------------------------------" echo "----------------------------------------------------------"
echo "" echo ""
fi fi
......
...@@ -107,7 +107,6 @@ def get_sf(npCloudsOctal, npTimeHour, npForecastedTime, fSunriseTimeUTC, fSunset ...@@ -107,7 +107,6 @@ def get_sf(npCloudsOctal, npTimeHour, npForecastedTime, fSunriseTimeUTC, fSunset
npCloudOctal (numpy array): array of octal value representing the cloud coverage. npCloudOctal (numpy array): array of octal value representing the cloud coverage.
fSunriseTimeUTC (float): sunrise time in UTC fSunriseTimeUTC (float): sunrise time in UTC
fSunsetTimeUT (float): sunset time in UTC fSunsetTimeUT (float): sunset time in UTC
nStartForecastTime (??):
fLat (float): latitude of emplacement fLat (float): latitude of emplacement
fLon (float): longitude of emplacement fLon (float): longitude of emplacement
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment