Ignore:
Timestamp:
Oct 19, 2023, 4:02:57 PM (9 months ago)
Author:
idelkadi
Message:

Merged trunk changes -r4488:4726 LMDZ_ECRad branch

Location:
LMDZ6/branches/LMDZ_ECRad
Files:
10 deleted
21 edited
5 copied

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/LMDZ_ECRad

  • LMDZ6/branches/LMDZ_ECRad/arch/arch-SX9_MERCURE.fcm

    r3045 r4727  
    11%COMPILER            sxmpif90
    22%LINK                sxmpif90
     3%FPP                 sxcpp
    34%AR                  sxar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.fcm

    r3979 r4727  
    11%COMPILER            mpif90
    22%LINK                mpif90
     3%FPP                 mpif90 -E
    34%AR                  ar
    45%ARFLAGS             rs
    56%MAKE                gmake
    6 %FPP_FLAGS           -P -traditional
     7%FPP_FLAGS           
    78%FPP_DEF             NC_DOUBLE FFT_MKL
    89%BASE_FFLAGS         -i4 -r8 -auto -align all -I$(MKL_INCDIR) -I$(MKL_INCDIR)/intel64/lp64
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE-AMD.path

    r4482 r4727  
     1
    12NETCDF_INCDIR="-I$NETCDFFORTRAN_INCDIR"
    23NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR"
    34NETCDF_LIB="-lnetcdff -lnetcdf"
    45
    5 NETCDF95_INCDIR=-I$LMDGCM/../../include/NetCDF95
    6 NETCDF95_LIBDIR=-L$LMDGCM/../../lib
     6NETCDF95_INCDIR=-I$NETCDF95_INCDIR
     7NETCDF95_LIBDIR=-L$NETCDF95_LIBDIR
    78NETCDF95_LIB=-lnetcdf95
    89
     
    2526INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
    2627INCA_LIB="-lchimie"
    27 
    28 
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.fcm

    r3979 r4727  
    11%COMPILER            mpif90
    22%LINK                mpif90
     3%FPP                 mpif90 -E
    34%AR                  ar
    45%ARFLAGS             rs
    56%MAKE                gmake
    6 %FPP_FLAGS           -P -traditional
     7%FPP_FLAGS           
    78%FPP_DEF             NC_DOUBLE FFT_MKL
    89#%BASE_FFLAGS        -recursive -xHost -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64
     
    1314%MPI_FFLAGS
    1415%OMP_FFLAGS          -qopenmp
    15 %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
     16%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
    1617%MPI_LD
    1718%OMP_LD              -qopenmp
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_IRENE.path

    r4482 r4727  
    44NETCDF_LIB="-lnetcdff -lnetcdf"
    55
    6 NETCDF95_INCDIR=-I$LMDGCM/../../include/NetCDF95
    7 NETCDF95_LIBDIR=-L$LMDGCM/../../lib
     6NETCDF95_INCDIR=-I$NETCDF95_INCDIR
     7NETCDF95_LIBDIR=-L$NETCDF95_LIBDIR
    88NETCDF95_LIB=-lnetcdf95
    99
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.env

    r3615 r4727  
    44module load netcdf/4.7.2-mpi
    55module load netcdf-fortran/4.5.2-mpi
     6module load netcdf95
    67
    78module load gcc/6.5.0
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.fcm

    r3589 r4727  
    22%COMPILER            mpiifort
    33%LINK                mpiifort
     4%FPP                 mpiifort -E
    45%AR                  ar
    56%ARFLAGS             rs
    67%MAKE                gmake
    7 %FPP_FLAGS           -P -traditional
     8%FPP_FLAGS           
    89%FPP_DEF             NC_DOUBLE FFT_MKL
    910%BASE_FFLAGS         -i4 -r8 -auto -align all -fp-model strict
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_JEANZAY.path

    r4482 r4727  
    66NETCDF_LIB="-lnetcdff -lnetcdf"
    77
    8 NETCDF95_INCDIR=-I$LMDGCM/../../include/NetCDF95
    9 NETCDF95_LIBDIR=-L$LMDGCM/../../lib
     8NETCDF95_INCDIR=-I$NETCDF95_ROOT/include/NetCDF95
     9NETCDF95_LIBDIR=-L$NETCDF95_ROOT/lib
    1010NETCDF95_LIB=-lnetcdf95
    1111
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-X64_OCCIGEN.fcm

    r3045 r4727  
    11%COMPILER            mpif90
    22%LINK                mpif90
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-g95.fcm

    r3045 r4727  
    11%COMPILER            g95
    22%LINK                g95
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran.fcm

    r4482 r4727  
    11%COMPILER            mpifort
    22%LINK                mpifort
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
     
    67%FPP_FLAGS           -P -traditional
    78%FPP_DEF             NC_DOUBLE FFT_FFTW
    8 %BASE_FFLAGS         -c -fdefault-real-8 -frecursive -ffree-line-length-0
     9%BASE_FFLAGS         -c -fdefault-real-8 -frecursive -ffree-line-length-0 -fallow-argument-mismatch
    910%PROD_FFLAGS         -O3
    1011%DEV_FFLAGS          -O
    1112%DEBUG_FFLAGS        -ffpe-trap=invalid,zero,overflow -fbounds-check -g3 -O0 -fstack-protector-all
    12 %MPI_FFLAGS -fcray-pointer -fallow-argument-mismatch
     13%MPI_FFLAGS -fcray-pointer
    1314%OMP_FFLAGS      -fopenmp   
    1415%BASE_LD      -lfftw3
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-gfortran_CICLAD.fcm

    r3045 r4727  
    11%COMPILER            $MPI_BIN/mpif90
    22%LINK                $MPI_BIN/mpif90
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_CICLAD.fcm

    r3045 r4727  
    11%COMPILER            $MPI_BIN/mpif90
    22%LINK                $MPI_BIN/mpif90
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.fcm

    r4102 r4727  
    11%COMPILER            mpif90
    22%LINK                mpif90
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_LSCE.path

    r4200 r4727  
    1 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"
    2 NETCDF_INCDIR=-I/usr/local/install/netcdf-4.3.2p/include
    3 NETCDF95_INCDIR=$LMDGCM/../../include
    4 NETCDF95_LIBDIR=$LMDGCM/../../lib
    5 IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
    6 IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
    7 ORCH_INCDIR=$LMDGCM/../../lib
    8 ORCH_LIBDIR=$LMDGCM/../../lib
    9 OASIS_INCDIR=
    10 OASIS_LIBDIR=
    11 INCA_LIBDIR=$LMDGCM/../INCA/config/lib
    12 INCA_INCDIR=$LMDGCM/../INCA/config/inc
    13 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    14 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1NETCDF_INCDIR="-I/usr/local/install/netcdf-4.3.2p/include"
     2NETCDF_LIBDIR="-L/usr/local/install/netcdf-4.3.2p/lib -L/usr/local/install/hdf5-1.8.9p/lib"
     3NETCDF_LIB="-lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
     4
     5NETCDF95_INCDIR=-I/home/orchideeshare/igcmg/Tools/NetCDF95.intel-fcomp.2020/include/NetCDF95
     6NETCDF95_LIBDIR=-L/home/orchideeshare/igcmg/Tools/NetCDF95.intel-fcomp.2020/lib
     7NETCDF95_LIB=-lnetcdf95
     8
     9IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     10IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib"
     11IOIPSL_LIB="-lioipsl"
     12
     13XIOS_INCDIR="-I$LMDGCM/../XIOS/inc"
     14XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib"
     15XIOS_LIB="-lxios -lstdc++"
     16
     17ORCH_INCDIR="-I$LMDGCM/../../lib"
     18ORCH_LIBDIR="-L$LMDGCM/../../lib"
     19ORCH_LIB=
     20
     21OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
     22OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib"
     23OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
     24
     25INCA_INCDIR="-I$LMDGCM/../INCA/build/inc"
     26INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib"
     27INCA_LIB="-lchimie"
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.env

    r4482 r4727  
    88module load netcdf-fortran/4.5.3-mpi
    99module load netcdf-c/4.7.4-mpi
    10 
     10module load netcdf95
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.fcm

    r4482 r4727  
    11%COMPILER            mpif90
    22%LINK                mpif90
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-ifort_MESOIPSL.path

    r4482 r4727  
    11NETCDF_INCDIR="-I $NETCDF_FORTRAN_ROOT/include -I${HDF5_ROOT}/include"
    22NETCDF_LIBDIR="-L${NETCDF_FORTRAN_ROOT}/lib -L${NETCDF_C_ROOT}/lib -L${HDF5_ROOT}"
    3 NETCDF_LIB="-lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz -lcurl -lstdc++"
     3NETCDF_LIB="-lnetcdff -lnetcdf"
     4
     5NETCDF95_INCDIR=-I$NETCDF95_ROOT/include/NetCDF95
     6NETCDF95_LIBDIR=-L$NETCDF95_ROOT/lib
     7NETCDF95_LIB=-lnetcdf95
    48
    59IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-linux-32bit.fcm

    r3045 r4727  
    11%COMPILER            pgf95
    22%LINK                pgf95
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
  • LMDZ6/branches/LMDZ_ECRad/arch/arch-pgf_CICLAD.fcm

    r3045 r4727  
    11%COMPILER            $MPI_BIN/mpif90
    22%LINK                $MPI_BIN/mpif90
     3%FPP                 cpp
    34%AR                  ar
    45%ARFLAGS             rs
Note: See TracChangeset for help on using the changeset viewer.