Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ES_MOON.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ES_MOON.fcm	(revision 4482)
+++ 	(revision )
@@ -1,18 +1,0 @@
-%COMPILER            esmpif90
-%LINK                esmpif90
-%AR                  esar
-%ARFLAGS             rs
-%MAKE                gmake
-%FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MATHKEISAN
-%BASE_FFLAGS         -P stack -Wf,-pvctl res=whole,-A dbl4,-ptr byte -EP -R5 -float0 -dw -Wf,"-pvctl loopcnt=999999 fullmsg noassume"
-%PROD_FFLAGS         -C vopt
-%DEV_FFLAGS          -C vsafe -gv -Wf,-init stack=nan,-init heap=nan
-%DEBUG_FFLAGS        -C debug -eC -Wf,-init stack=nan,-init heap=nan
-%MPI_FFLAGS
-%OMP_FFLAGS          -P openmp
-%BASE_LD             -lblas -lfft
-%MPI_LD
-%OMP_LD              -P openmp  -Wl,"-ZL 3G"
-
-
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-IA64_PLATINE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-IA64_PLATINE.fcm	(revision 4482)
+++ 	(revision )
@@ -1,16 +1,0 @@
-%COMPILER            mpif90
-%LINK                mpif90
-%AR                  ar
-%ARFLAGS             rs
-%MAKE                gmake
-%FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
-%BASE_FFLAGS         -i4 -r8 -automatic -align all -I${MKLROOT}/include
-%PROD_FFLAGS         -O3
-%DEV_FFLAGS          -p -g -O3 -traceback
-%DEBUG_FFLAGS        -p -g -traceback
-%MPI_FFLAGS
-%OMP_FFLAGS          -openmp
-%BASE_LD             -p -i4 -r8 -automatic $MKL_LIBS
-%MPI_LD
-%OMP_LD              -openmp
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-PW6_VARGAS.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-PW6_VARGAS.fcm	(revision 4482)
+++ 	(revision )
@@ -1,16 +1,0 @@
-%COMPILER            xlf_r
-%LINK                mpxlf_r
-%AR                  ar
-%ARFLAGS             rs
-%MAKE                gmake
-%FPP_FLAGS           -P -I/usr/local/pub/FFTW/3.2/include
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_FFTW
-%BASE_FFLAGS         -qautodbl=dbl4 -qxlf90=autodealloc -qmaxmem=-1 -qzerosize -I/usr/local/pub/FFTW/3.2/include
-%PROD_FFLAGS         -O3
-%DEV_FFLAGS          -O2 -qfullpath -qinitauto=7FBFFFFF -qfloat=nans -qflttrap=overflow:zerodivide:invalid:enable -qsigtrap
-%DEBUG_FFLAGS        -g -qfullpath -qnooptimize -qinitauto=7FBFFFFF  -qfloat=nans -qflttrap=overflow:zerodivide:invalid:enable -qsigtrap -qcheck
-%MPI_FFLAGS          -I/usr/lpp/ppe.poe/include/thread64
-%OMP_FFLAGS          -qsmp=omp
-%BASE_LD             -lessl -L/usr/local/pub/FFTW/3.2/lib -lfftw3
-%MPI_LD              
-%OMP_LD              -qsmp=omp
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_BRODIE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_BRODIE.fcm	(revision 4482)
+++ 	(revision )
@@ -1,17 +1,0 @@
-%COMPILER            sxmpif90
-%LINK                sxmpif90
-%AR                  sxar
-%ARFLAGS             rs
-%MAKE                sxgmake
-%FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MATHKEISAN
-%BASE_FFLAGS         -P stack -Wf,-pvctl res=whole,-A dbl4,-ptr byte -EP -R5 -float0 -dw -Wf,"-pvctl loopcnt=999999 fullmsg noassume"
-%PROD_FFLAGS         -C vopt
-%DEV_FFLAGS          -C vsafe -gv -Wf,-init stack=nan,-init heap=nan
-%DEBUG_FFLAGS        -C debug -eR -Wf,-init stack=nan,-init heap=nan
-%MPI_FFLAGS
-%OMP_FFLAGS          -P openmp
-%BASE_LD             -lblas -lfft
-%MPI_LD
-%OMP_LD              -P openmp  -Wl,"-ZL 3G"
-
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_BRODIE.opt
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_BRODIE.opt	(revision 4482)
+++ 	(revision )
@@ -1,12 +1,0 @@
-%INLINE -pi auto exp=swtt1_lmdar4,swtt_lmdar4,swde_lmdar4,lwttm_lmdar4,lwtt_lmdar4,swr_lmdar4,swclr_lmdar4 noexp=SW_LMDAR4,SWU_LMDAR4,SW1S_LMDAR4,SW2S_LMDAR4,LW_LMDAR4,LWU_LMDAR4,LWBV_LMDAR4,LWC_LMDAR4,LWB_LMDAR4,LWV_LMDAR4,LWVB_LMDAR4,LWVD_LMDAR4,LWVN_LMDAR4 line=2000
-
-bld::tool::fflags::phys::readaerosol         %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt -pi auto
-bld::tool::fflags::phys::aeropt_2bands       %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR
-bld::tool::fflags::phys::radiation_AR4       %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt -Wf,-O,extendreorder %INLINE
-bld::tool::fflags::phys::radiation_AR4_param %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt %INLINE
-bld::tool::fflags::phys::fisrtilp            %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::phys::cv30_routines       %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -Wf,-O,extendreorder
-bld::tool::fflags::phys::cvltr               %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::phys::clouds_gno          %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::dyn::vlsplt_p             %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::dyn::groupeun_p           %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_MERCURE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_MERCURE.fcm	(revision 4482)
+++ 	(revision )
@@ -1,16 +1,0 @@
-%COMPILER            sxmpif90
-%LINK                sxmpif90
-%AR                  sxar
-%ARFLAGS             rs
-%MAKE                make
-%FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MATHKEISAN
-%BASE_FFLAGS         -P stack -Wf,-pvctl res=whole,-A dbl4,-ptr byte -EP -R5 -float0 -size_t64 -dw -Wf,"-pvctl loopcnt=999999 fullmsg noassume"
-%PROD_FFLAGS         -C vopt
-%DEV_FFLAGS          -C vsafe -gv -Wf,-init stack=nan,-init heap=nan
-%DEBUG_FFLAGS        -C debug -eC -Wf,-init stack=nan,-init heap=nan
-%MPI_FFLAGS
-%OMP_FFLAGS          -P openmp
-%BASE_LD             -size_t64 -lblas -lfft
-%MPI_LD
-%OMP_LD              -P openmp  -Wl,"-ZL 3G"
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_MERCURE.opt
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-SX8_MERCURE.opt	(revision 4482)
+++ 	(revision )
@@ -1,12 +1,0 @@
-%INLINE -pi auto exp=swtt1_lmdar4,swtt_lmdar4,swde_lmdar4,lwttm_lmdar4,lwtt_lmdar4,swr_lmdar4,swclr_lmdar4 noexp=SW_LMDAR4,SWU_LMDAR4,SW1S_LMDAR4,SW2S_LMDAR4,LW_LMDAR4,LWU_LMDAR4,LWBV_LMDAR4,LWC_LMDAR4,LWB_LMDAR4,LWV_LMDAR4,LWVB_LMDAR4,LWVD_LMDAR4,LWVN_LMDAR4 line=2000
-
-bld::tool::fflags::phys::readaerosol         %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt -pi auto
-bld::tool::fflags::phys::aeropt_2bands       %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR
-bld::tool::fflags::phys::radiation_AR4       %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt -Wf,-O,extendreorder %INLINE
-bld::tool::fflags::phys::radiation_AR4_param %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt %INLINE
-bld::tool::fflags::phys::fisrtilp            %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::phys::cv30_routines       %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -Wf,-O,extendreorder
-bld::tool::fflags::phys::cvltr               %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::phys::clouds_gno          %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::dyn::vlsplt_p             %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
-bld::tool::fflags::dyn::groupeun_p           %BASE_FFLAGS %PARA_FFLAGS %PROD_FFLAGS  %INCDIR -C hopt
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-SX9_MERCURE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-SX9_MERCURE.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-SX9_MERCURE.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            sxmpif90
 %LINK                sxmpif90
+%FPP                 sxcpp
 %AR                  sxar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_ADA.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_ADA.fcm	(revision 4482)
+++ 	(revision )
@@ -1,17 +1,0 @@
-%COMPILER            mpiifort
-%LINK                mpiifort
-%AR                  ar
-%ARFLAGS             rs
-%MAKE                gmake
-%FPP_FLAGS           -P -traditional -I/smplocal/pub/FFTW/3.3.3_dyn/include/
-%FPP_DEF             NC_DOUBLE FFT_FFTW
-%BASE_FFLAGS         -auto -recursive -mcmodel=large -integer-size 32 -real-size 64 -align all 
-%PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2
-%DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
-%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug -ftz
-%MPI_FFLAGS
-%OMP_FFLAGS          -openmp
-%BASE_LD             -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -shared-intel  -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -Wl,-rpath=/smplocal/pub/NetCDF/4.1.3/mpi/lib:/smplocal/pub/HDF5/1.8.9/par/lib:/smplocal/pub/FFTW/3.3.3_dyn/lib
-%MPI_LD              
-%OMP_LD              -openmp
-
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_CURIE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_CURIE.fcm	(revision 4482)
+++ 	(revision )
@@ -1,17 +1,0 @@
-%COMPILER            mpif90
-%LINK                mpif90
-%AR                  ar
-%ARFLAGS             rs
-%MAKE                gmake
-%FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE FFT_MKL
-#%BASE_FFLAGS        -recursive -xHost -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64
-%BASE_FFLAGS         -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64 
-%PROD_FFLAGS         -O3 -axAVX,SSE4.2 -fp-model fast=2
-%DEV_FFLAGS          -fp-model strict -p -g -O2 -traceback -fp-stack-check
-%DEBUG_FFLAGS        -fp-model strict -p -g -traceback -fp-stack-check -ftrapuv
-%MPI_FFLAGS
-%OMP_FFLAGS          -openmp
-%BASE_LD             -i4 -r8 -auto $MKL_LIBS
-%MPI_LD
-%OMP_LD              -openmp
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.fcm	(revision 4727)
@@ -1,8 +1,9 @@
 %COMPILER            mpif90
 %LINK                mpif90
+%FPP                 mpif90 -E
 %AR                  ar
 %ARFLAGS             rs
 %MAKE                gmake
-%FPP_FLAGS           -P -traditional
+%FPP_FLAGS           
 %FPP_DEF             NC_DOUBLE FFT_MKL
 %BASE_FFLAGS         -i4 -r8 -auto -align all -I$(MKL_INCDIR) -I$(MKL_INCDIR)/intel64/lp64 
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.path
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.path	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.path	(revision 4727)
@@ -1,8 +1,9 @@
+
 NETCDF_INCDIR="-I$NETCDFFORTRAN_INCDIR"
 NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR"
 NETCDF_LIB="-lnetcdff -lnetcdf"
 
-NETCDF95_INCDIR=-I$LMDGCM/../../include/NetCDF95
-NETCDF95_LIBDIR=-L$LMDGCM/../../lib
+NETCDF95_INCDIR=-I$NETCDF95_INCDIR
+NETCDF95_LIBDIR=-L$NETCDF95_LIBDIR
 NETCDF95_LIB=-lnetcdf95
 
@@ -25,4 +26,2 @@
 INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
 INCA_LIB="-lchimie"
-
-
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.env
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.env	(revision 4727)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.env	(revision 4727)
@@ -0,0 +1,14 @@
+# Compile and running environement at Irene  
+
+set +e  
+module purge
+module load intel/20.0.0
+module load mpi/openmpi/4.1.4
+module load flavor/hdf5/parallel
+module load hdf5/1.12.0
+module load netcdf-fortran/4.5.3
+module load mkl/20.0.0
+module load feature/bridge/heterogenous_mpmd
+module load c++/gnu/8.3.0
+module load c/gnu/8.3.0
+module load netcdf95
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.fcm	(revision 4727)
@@ -1,8 +1,9 @@
 %COMPILER            mpif90
 %LINK                mpif90
+%FPP                 mpif90 -E
 %AR                  ar
 %ARFLAGS             rs
 %MAKE                gmake
-%FPP_FLAGS           -P -traditional
+%FPP_FLAGS           
 %FPP_DEF             NC_DOUBLE FFT_MKL
 #%BASE_FFLAGS        -recursive -xHost -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64
@@ -13,5 +14,5 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -qopenmp
-%BASE_LD             -i4 -r8 -auto -L/ccc/products/mkl-17.0.4.196/intel--17.0.4.196__openmpi--2.0.2/default/17.0.4.196/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
+%BASE_LD   -i4 -r8 -auto -L/ccc/products/mkl-20.0.0/system/default/20.0.0/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
 %MPI_LD
 %OMP_LD              -qopenmp
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.path
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.path	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.path	(revision 4727)
@@ -4,6 +4,6 @@
 NETCDF_LIB="-lnetcdff -lnetcdf"
 
-NETCDF95_INCDIR=-I$LMDGCM/../../include/NetCDF95
-NETCDF95_LIBDIR=-L$LMDGCM/../../lib
+NETCDF95_INCDIR=-I$NETCDF95_INCDIR
+NETCDF95_LIBDIR=-L$NETCDF95_LIBDIR
 NETCDF95_LIB=-lnetcdf95
 
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.env
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.env	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.env	(revision 4727)
@@ -4,4 +4,5 @@
 module load netcdf/4.7.2-mpi
 module load netcdf-fortran/4.5.2-mpi
+module load netcdf95
 
 module load gcc/6.5.0
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.fcm	(revision 4727)
@@ -2,8 +2,9 @@
 %COMPILER            mpiifort
 %LINK                mpiifort
+%FPP                 mpiifort -E
 %AR                  ar
 %ARFLAGS             rs
 %MAKE                gmake
-%FPP_FLAGS           -P -traditional
+%FPP_FLAGS           
 %FPP_DEF             NC_DOUBLE FFT_MKL
 %BASE_FFLAGS         -i4 -r8 -auto -align all -fp-model strict
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.path
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.path	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.path	(revision 4727)
@@ -6,6 +6,6 @@
 NETCDF_LIB="-lnetcdff -lnetcdf"
 
-NETCDF95_INCDIR=-I$LMDGCM/../../include/NetCDF95
-NETCDF95_LIBDIR=-L$LMDGCM/../../lib
+NETCDF95_INCDIR=-I$NETCDF95_ROOT/include/NetCDF95
+NETCDF95_LIBDIR=-L$NETCDF95_ROOT/lib
 NETCDF95_LIB=-lnetcdf95
 
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY_OPENMPI.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY_OPENMPI.fcm	(revision 4727)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY_OPENMPI.fcm	(revision 4727)
@@ -0,0 +1,18 @@
+# $Id$
+%COMPILER            mpif90
+%LINK                mpif90
+%FPP                 mpif90 -E
+%AR                  ar
+%ARFLAGS             rs
+%MAKE                gmake
+%FPP_FLAGS           
+%FPP_DEF             NC_DOUBLE FFT_MKL
+%BASE_FFLAGS         -i4 -r8 -auto -align all -fp-model strict
+%PROD_FFLAGS         -O3 -xHost -qopt-zmm-usage=high
+%DEV_FFLAGS          -p -g -O2 -traceback -fp-stack-check
+%DEBUG_FFLAGS        -p -g -O0 -traceback -fp-stack-check -ftrapuv -check bounds,noarg_temp_created,pointers,stack,uninit -debug full -init=arrays -init=snan
+%MPI_FFLAGS
+%OMP_FFLAGS          -qopenmp
+%BASE_LD             -i4 -r8 -auto -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
+%MPI_LD
+%OMP_LD              -qopenmp
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY_OPENMPI.path
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY_OPENMPI.path	(revision 4727)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY_OPENMPI.path	(revision 4727)
@@ -0,0 +1,30 @@
+# $Id$
+#NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR -lnetcdf -lnetcdff"
+#NETCDF_INCDIR=-I$NETCDFFORTRAN_INCDIR
+NETCDF_INCDIR=""
+NETCDF_LIBDIR=""
+NETCDF_LIB="-lnetcdff -lnetcdf"
+
+NETCDF95_INCDIR=-I$NETCDF95_ROOT/include/NetCDF95
+NETCDF95_LIBDIR=-L$NETCDF95_ROOT/lib
+NETCDF95_LIB=-lnetcdf95
+
+IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
+IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
+XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+
+ORCH_INCDIR="-I$LMDGCM/../../lib"
+ORCH_LIBDIR="-L$LMDGCM/../../lib"
+ORCH_LIB=
+
+OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+
+INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
+INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
+INCA_LIB="-lchimie"
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_OCCIGEN.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_OCCIGEN.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_OCCIGEN.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            mpif90
 %LINK                mpif90
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_TITANE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_TITANE.fcm	(revision 4482)
+++ 	(revision )
@@ -1,16 +1,0 @@
-%COMPILER            mpif90
-%LINK                mpif90
-%AR                  ar
-%ARFLAGS             rs
-%MAKE                gmake
-%FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
-%BASE_FFLAGS         -i4 -r8 -automatic -align all -I${MKLROOT}/include
-%PROD_FFLAGS         -O3
-%DEV_FFLAGS          -p -g -O3 -traceback -fp-stack-check -ftrapuv
-%DEBUG_FFLAGS        -p -g -traceback
-%MPI_FFLAGS
-%OMP_FFLAGS          -openmp
-%BASE_LD             -p -i4 -r8 -automatic $MKL_LIBS
-%MPI_LD
-%OMP_LD              -openmp
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-g95.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-g95.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-g95.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            g95
 %LINK                g95
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            mpifort
 %LINK                mpifort
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
@@ -6,9 +7,9 @@
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE FFT_FFTW
-%BASE_FFLAGS         -c -fdefault-real-8 -frecursive -ffree-line-length-0
+%BASE_FFLAGS         -c -fdefault-real-8 -frecursive -ffree-line-length-0 -fallow-argument-mismatch
 %PROD_FFLAGS         -O3
 %DEV_FFLAGS          -O
 %DEBUG_FFLAGS        -ffpe-trap=invalid,zero,overflow -fbounds-check -g3 -O0 -fstack-protector-all
-%MPI_FFLAGS -fcray-pointer -fallow-argument-mismatch
+%MPI_FFLAGS -fcray-pointer
 %OMP_FFLAGS      -fopenmp    
 %BASE_LD      -lfftw3
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran_CICLAD.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran_CICLAD.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran_CICLAD.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            $MPI_BIN/mpif90
 %LINK                $MPI_BIN/mpif90
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_CICLAD.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_CICLAD.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_CICLAD.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            $MPI_BIN/mpif90
 %LINK                $MPI_BIN/mpif90
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            mpif90
 %LINK                mpif90
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.path
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.path	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.path	(revision 4727)
@@ -1,14 +1,27 @@
-NETCDF_LIBDIR="-L/usr/local/install/netcdf-4.3.2p/lib -lnetcdff -lnetcdf -L/usr/local/install/hdf5-1.8.9p/lib -lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
-NETCDF_INCDIR=-I/usr/local/install/netcdf-4.3.2p/include
-NETCDF95_INCDIR=$LMDGCM/../../include
-NETCDF95_LIBDIR=$LMDGCM/../../lib
-IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
-IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib" 
-ORCH_INCDIR=$LMDGCM/../../lib
-ORCH_LIBDIR=$LMDGCM/../../lib
-OASIS_INCDIR=
-OASIS_LIBDIR=
-INCA_LIBDIR=$LMDGCM/../INCA/config/lib
-INCA_INCDIR=$LMDGCM/../INCA/config/inc
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+NETCDF_INCDIR="-I/usr/local/install/netcdf-4.3.2p/include"
+NETCDF_LIBDIR="-L/usr/local/install/netcdf-4.3.2p/lib -L/usr/local/install/hdf5-1.8.9p/lib"
+NETCDF_LIB="-lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
+
+NETCDF95_INCDIR=-I/home/orchideeshare/igcmg/Tools/NetCDF95.intel-fcomp.2020/include/NetCDF95
+NETCDF95_LIBDIR=-L/home/orchideeshare/igcmg/Tools/NetCDF95.intel-fcomp.2020/lib
+NETCDF95_LIB=-lnetcdf95
+
+IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
+IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
+XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+
+ORCH_INCDIR="-I$LMDGCM/../../lib"
+ORCH_LIBDIR="-L$LMDGCM/../../lib"
+ORCH_LIB=
+
+OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+
+INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
+INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
+INCA_LIB="-lchimie"
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE_2023.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE_2023.fcm	(revision 4727)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE_2023.fcm	(revision 4727)
@@ -0,0 +1,17 @@
+%COMPILER            mpif90
+%LINK                mpif90
+%FPP                 cpp
+%AR                  ar
+%ARFLAGS             rs
+%MAKE                gmake
+%FPP_FLAGS           -P -traditional
+%FPP_DEF             NC_DOUBLE 
+%BASE_FFLAGS         -i4 -r8 -auto -align all -fp-model precise -fimf-arch-consistency=true
+%PROD_FFLAGS         -O2 
+%DEV_FFLAGS          -p -g -O2 -traceback -fp-stack-check 
+%DEBUG_FFLAGS        -p -g -traceback -fp-stack-check -ftrapuv -check bounds
+%MPI_FFLAGS
+%OMP_FFLAGS          -openmp
+%BASE_LD             -i4 -r8 
+%MPI_LD
+%OMP_LD              -openmp
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE_2023.path
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE_2023.path	(revision 4727)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE_2023.path	(revision 4727)
@@ -0,0 +1,27 @@
+NETCDF_INCDIR="-I $NETCDF4_DIR/include"
+NETCDF_LIBDIR="-L $NETCDF4_DIR/lib"
+NETCDF_LIB="-lnetcdff -lnetcdf "
+
+NETCDF95_INCDIR=-I/home/orchideeshare/igcmg/Tools/NetCDF95.intel-fcomp.2020/include/NetCDF95
+NETCDF95_LIBDIR=-L/home/orchideeshare/igcmg/Tools/NetCDF95.intel-fcomp.2020/lib
+NETCDF95_LIB=-lnetcdf95
+
+IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
+IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
+XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+
+ORCH_INCDIR="-I$LMDGCM/../../lib"
+ORCH_LIBDIR="-L$LMDGCM/../../lib"
+ORCH_LIB=
+
+OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+
+INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
+INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
+INCA_LIB="-lchimie"
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.env
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.env	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.env	(revision 4727)
@@ -8,3 +8,3 @@
 module load netcdf-fortran/4.5.3-mpi
 module load netcdf-c/4.7.4-mpi
-
+module load netcdf95
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            mpif90
 %LINK                mpif90
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.path
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.path	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.path	(revision 4727)
@@ -1,5 +1,9 @@
 NETCDF_INCDIR="-I $NETCDF_FORTRAN_ROOT/include -I${HDF5_ROOT}/include"
 NETCDF_LIBDIR="-L${NETCDF_FORTRAN_ROOT}/lib -L${NETCDF_C_ROOT}/lib -L${HDF5_ROOT}"
-NETCDF_LIB="-lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz -lcurl -lstdc++"
+NETCDF_LIB="-lnetcdff -lnetcdf"
+
+NETCDF95_INCDIR=-I$NETCDF95_ROOT/include/NetCDF95
+NETCDF95_LIBDIR=-L$NETCDF95_ROOT/lib
+NETCDF95_LIB=-lnetcdf95
 
 IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-linux-32bit.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-linux-32bit.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-linux-32bit.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            pgf95
 %LINK                pgf95
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
Index: LMDZ6/branches/LMDZ_ECRad/arch/arch-pgf_CICLAD.fcm
===================================================================
--- LMDZ6/branches/LMDZ_ECRad/arch/arch-pgf_CICLAD.fcm	(revision 4482)
+++ LMDZ6/branches/LMDZ_ECRad/arch/arch-pgf_CICLAD.fcm	(revision 4727)
@@ -1,4 +1,5 @@
 %COMPILER            $MPI_BIN/mpif90
 %LINK                $MPI_BIN/mpif90
+%FPP                 cpp
 %AR                  ar
 %ARFLAGS             rs
