Merge remote-tracking branch 'origin/master' into adrien

CMake/luc.cmake

-# Copyright 2020 University of Liège
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#defining generator
-SET(CMAKE_GENERATOR  "Visual Studio 11 Win64" CACHE INTERNAL "" FORCE)
-
-#Libs Directory
-STRING(REGEX REPLACE "\\\\" "/" MYLIBS $ENV{METAFORLIBS})
-
-#Libs
-SET(SWIG_EXECUTABLE "${MYLIBS}/swigwin/swig.exe" CACHE FILEPATH "" FORCE)
-
-SET(PYTHON_INCLUDE_DIR   "${MYLIBS}/Python/include"             CACHE PATH "" FORCE)
-SET(PYTHON_LIBRARY       "${MYLIBS}/Python/Libs/python27.lib"   CACHE FILEPATH "" FORCE)
-SET(PYTHON_DEBUG_LIBRARY "${MYLIBS}/Python/Libs/python27_d.lib" CACHE FILEPATH "" FORCE)
-
-SET(MKL_LIB_PATH      "${MYLIBS}/intel/mkl/lib/intel64" "${MYLIBS}/intel/compiler/lib/intel64" CACHE PATH "" FORCE)
-SET(MKL_INCLUDE_PATH  "${MYLIBS}/intel/mkl/include"  CACHE PATH "" FORCE)

fdtd/tests/fdtd1d_1.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

fdtd/tests/fdtd1d_1b.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

fdtd/tests/fdtd1d_1c.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

fdtd/tests/fdtd1d_1d.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

fdtd/tests/projethpc.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

flow/validation/agard.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8; -*-
 
 # Copyright 2020 University of Liège

scripts/format_code.py

-#! /usr/bin/env python3
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # This script runs "clang-format" recursively on all C/C++ files

sph/louis/build.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

tbox/tests/basicops.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

tbox/tests/gmshio.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

tboxVtk/tests/vtkio.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Copyright 2020 University of Liège

waves/broken/cas1.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # TODO: il manque une source...
@@ -17,7 +17,7 @@ def main():
     nl=60
     Le=L/nl
     c=1500.0
-    dt=Le/c/2;
+    dt=Le/c/2
 
     scheme = w.ForwardEuler(msh, pbl)
     scheme.ttot = 0.2*100

waves/broken/geuz/geophysique.py

-#! /usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # TODO: marche pas/plus