Index: LMDZ6/trunk/arch/arch-X64_ADASTRA-GNU.fcm
===================================================================
--- LMDZ6/trunk/arch/arch-X64_ADASTRA-GNU.fcm	(revision 5234)
+++ LMDZ6/trunk/arch/arch-X64_ADASTRA-GNU.fcm	(revision 5235)
@@ -9,5 +9,5 @@
 %FPP_DEF             NC_DOUBLE
 
-%BASE_FFLAGS         -cpp -ffree-line-length-0 -fdefault-real-8 -DNC_DOUBLE -fallow-argument-mismatch -fimplicit-none -march=native -fPIC
+%BASE_FFLAGS         -cpp -ffree-line-length-0 -fdefault-real-8 -DNC_DOUBLE -fallow-argument-mismatch  # -fimplicit-none  # re-add fimplicit-none after merge of Amaury commits
 %BASE_CFLAGS         -w -std=c++11 -D__XIOS_EXCEPTION  # xios
 # /!\ LD must be written in Makefile syntax
@@ -15,11 +15,11 @@
 %BASE_INC            -D__NONE__  # xios
 
-%PROD_FFLAGS         -O3
+%PROD_FFLAGS         -O3 -march=native -fPIC
 %PROD_CFLAGS         -O3 -DBOOST_DISABLE_ASSERTS  # xios
 
-%DEV_FFLAGS          -Wall -fbounds-check -fallow-argument-mismatch
+%DEV_FFLAGS          -Wall -fbounds-check
 %DEV_CFLAGS          -g -O2  # xios
 
-%DEBUG_FFLAGS        -g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all -fbacktrace -finit-real=snan -fallow-argument-mismatch
+%DEBUG_FFLAGS        -g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all -fbacktrace -finit-real=snan
 %DEBUG_CFLAGS        -g -DBZ_DEBUG # xios
 
Index: LMDZ6/trunk/arch/arch-local-gfortran-parallel.fcm
===================================================================
--- LMDZ6/trunk/arch/arch-local-gfortran-parallel.fcm	(revision 5234)
+++ LMDZ6/trunk/arch/arch-local-gfortran-parallel.fcm	(revision 5235)
@@ -9,5 +9,5 @@
 %FPP_DEF             NC_DOUBLE
 
-%BASE_FFLAGS         -cpp -ffree-line-length-0 -fdefault-real-8 -DNC_DOUBLE -fallow-argument-mismatch -fimplicit-none
+%BASE_FFLAGS         -cpp -ffree-line-length-0 -fdefault-real-8 -DNC_DOUBLE -fallow-argument-mismatch  # -fimplicit-none  # re-add fimplicit-none after merge of Amaury commits
 %BASE_CFLAGS         -w -std=c++11 -D__XIOS_EXCEPTION  # xios
 # /!\ LD must be written in Makefile syntax
@@ -15,5 +15,5 @@
 %BASE_INC            -D__NONE__  # xios
 
-%PROD_FFLAGS         -O3 -march=native
+%PROD_FFLAGS         -O3 -march=native -fPIC
 %PROD_CFLAGS         -O3 -DBOOST_DISABLE_ASSERTS  # xios
 
@@ -30,4 +30,2 @@
 
 %CPP                 cpp  # xios
-
-
Index: LMDZ6/trunk/arch/arch-local-gfortran.fcm
===================================================================
--- LMDZ6/trunk/arch/arch-local-gfortran.fcm	(revision 5234)
+++ LMDZ6/trunk/arch/arch-local-gfortran.fcm	(revision 5235)
@@ -7,6 +7,6 @@
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE
-%BASE_FFLAGS         -cpp -ffree-line-length-0 -fdefault-real-8 -DNC_DOUBLE -fallow-argument-mismatch -fimplicit-none
-%PROD_FFLAGS         -O3 -march=native
+%BASE_FFLAGS         -cpp -ffree-line-length-0 -fdefault-real-8 -DNC_DOUBLE -fallow-argument-mismatch  # -fimplicit-none  # re-add fimplicit-none after merge of Amaury commits
+%PROD_FFLAGS         -O3 -march=native -fPIC
 %DEV_FFLAGS          -Wall -fbounds-check
 %DEBUG_FFLAGS        -g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all -fbacktrace -finit-real=snan