Ignore:
Timestamp:
05/16/17 17:54:30 (4 years ago)
Author:
yushan
Message:

branch merged with trunk r1130

Location:
XIOS/dev/branch_yushan_merged/arch
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan_merged/arch/arch-GCC_LINUX.env

    r395 r1134  
    1 export HDF5_INC_DIR=$HOME/hdf5/include 
    2 export HDF5_LIB_DIR=$HOME/hdf5/lib 
    31 
    4 export NETCDF_INC_DIR=$HOME/netcdf4/include 
    5 export NETCDF_LIB_DIR=$HOME/netcdf4/lib 
     2export HDF5_INC_DIR=$HOME/lib/hdf5/include 
     3export HDF5_LIB_DIR=$HOME/lib/hdf5/lib 
    64 
     5export NETCDF_INC_DIR=$HOME/lib/netcdf/include 
     6export NETCDF_LIB_DIR=$HOME/lib/netcdf/lib 
     7 
  • XIOS/dev/branch_yushan_merged/arch/arch-GCC_LINUX.fcm

    r591 r1134  
    33################################################################################ 
    44 
    5 %CCOMPILER      mpicc 
    6 %FCOMPILER      mpif90 
    7 %LINKER         mpif90  
     5%CCOMPILER      mpicc -fopenmp -D_openmpi -D_usingEP  
     6%FCOMPILER      mpif90 -fopenmp 
     7%LINKER         mpif90 -fopenmp -D_openmpi -D_usingEP  
    88 
    99%BASE_CFLAGS    -ansi -w 
  • XIOS/dev/branch_yushan_merged/arch/arch-GCC_LINUX.path

    r475 r1134  
    1 NETCDF_INCDIR="-I $NETCDF_INC_DIR" 
    2 NETCDF_LIBDIR="-L $NETCDF_LIB_DIR" 
    3 NETCDF_LIB="-lnetcdff -lnetcdf" 
     1NETCDF_INCDIR="-I $NETCDF_INC_DIR -I $HOME/lib/netcdf_f/include" 
     2NETCDF_LIBDIR="-L $NETCDF_LIB_DIR -L $HOME/lib/netcdf_f/lib" 
     3NETCDF_LIB=" -lnetcdf" 
    44 
    5 MPI_INCDIR="" 
    6 MPI_LIBDIR="" 
     5MPI_INCDIR="-I /usr/local/include" 
     6MPI_LIBDIR="-L /usr/local/lib" 
    77MPI_LIB="" 
    88 
    99HDF5_INCDIR="-I $HDF5_INC_DIR" 
    1010HDF5_LIBDIR="-L $HDF5_LIB_DIR" 
    11 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz" 
     11HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -ldl -lcurl" 
    1212 
    1313OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1" 
  • XIOS/dev/branch_yushan_merged/arch/arch-X64_ADA.fcm

    r985 r1134  
    33################################################################################ 
    44 
    5 %CCOMPILER      mpiicc 
    6 %FCOMPILER      mpiifort  
    7 %LINKER         mpiifort  -nofor-main 
     5%CCOMPILER      mpiicc -qopenmp -D_usingEP -D_intelmpi 
     6%FCOMPILER      mpiifort -qopenmp -D_usingEP -D_intelmpi 
     7%LINKER         mpiifort  -nofor-main -qopenmp -D_usingEP -D_intelmpi 
    88 
    99%BASE_CFLAGS    -diag-disable 1125 -diag-disable 279 
  • XIOS/dev/branch_yushan_merged/arch/arch-X64_CURIE.fcm

    r1002 r1134  
    33################################################################################ 
    44 
    5 %CCOMPILER      mpicc 
    6 %FCOMPILER      mpif90 
     5%CCOMPILER      mpicc -openmp -D_openmpi -D_usingEP 
     6%FCOMPILER      mpif90 -openmp -D_openmpi -D_usingEP 
    77%LINKER         mpif90  -nofor-main 
    88 
Note: See TracChangeset for help on using the changeset viewer.