Ignore:
Timestamp:
Feb 19, 2020, 3:09:20 PM (5 years ago)
Author:
lguez
Message:

Revert to trunk changes that should not have been done in revision 3605.

Location:
LMDZ6/branches/Ocean_skin
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_ADA.fcm

    r3605 r3635  
    1111%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug -ftz
    1212%MPI_FFLAGS
    13 %OMP_FFLAGS          -qopenmp
    14 %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/FFTW/3.3.3_dyn/lib
    15 %MPI_LD              -L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem
    16 %OMP_LD              -qopenmp
     13%OMP_FFLAGS          -openmp
     14%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
     15%MPI_LD             
     16%OMP_LD              -openmp
    1717

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_ADA.path

    r3605 r3635  
    11NETCDF_LIBDIR="${NETCDF_LDFLAGS:--L/smplocal/pub/NetCDF/4.1.3/mpi/lib -lnetcdff -lnetcdf -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz}"
    22NETCDF_INCDIR="${NETCDF_FFLAGS:--I/smplocal/pub/HDF5/1.8.9/par/include -I/smplocal/pub/NetCDF/4.1.3/mpi/include}"
    3 IOIPSL_INCDIR=${workdir}/build/IOIPSL_trunk_ifort_fast
    4 IOIPSL_LIBDIR=${workdir}/build/IOIPSL_trunk_ifort_fast
     3IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     4IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
    55XIOS_INCDIR=$LMDGCM/../XIOS/inc
    66XIOS_LIBDIR=$LMDGCM/../XIOS/lib

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.fcm

    r3626 r3635  
    1414%OMP_FFLAGS          -qopenmp
    1515%BASE_LD             -i4 -r8 -auto -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
    16 %MPI_LD             
     16%MPI_LD
    1717%OMP_LD              -qopenmp

  • LMDZ6/branches/Ocean_skin/arch/arch-gfortran.path

    r3605 r3635  
    1 NETCDF_LIBDIR="-lnetcdff -lnetcdf"
    2 NETCDF_INCDIR=-I/usr/include
    3 IOIPSL_INCDIR=/home/guez/Downloads/Compil_prod/IOIPSL
    4 IOIPSL_LIBDIR=/home/guez/Downloads/Compil_prod/IOIPSL
     1NETCDF_LIBDIR="-L/usr/local/lib -lnetcdf"
     2NETCDF_INCDIR=-I/usr/local/include
     3IOIPSL_INCDIR=$LMDGCM/../../lib
     4IOIPSL_LIBDIR=$LMDGCM/../../lib
    55ORCH_INCDIR=$LMDGCM/../../lib
    66ORCH_LIBDIR=$LMDGCM/../../lib

  • LMDZ6/branches/Ocean_skin/bld.cfg

    r3605 r3635  
    4747dir::root            %CONFIG_PATH
    4848#dir::lib             %BASE_CONFIG_PATH
    49 dir::bin             %LIBO
     49dir::bin             %ROOT_PATH/bin
    5050
    5151#search_src           1

  • LMDZ6/branches/Ocean_skin/makelmdz_fcm

    r3605 r3635  
    4545
    4646LMDGCM=`/bin/pwd`
    47 LIBOGCM=$WORK/build/LMDZ_ocean_skin
     47LIBOGCM=$LMDGCM/libo
    4848LIBFGCM=$LMDGCM/libf
    4949DYN_COMMON_PATH=$LIBFGCM/dyn3d_common
Note: See TracChangeset for help on using the changeset viewer.