Ignore:
Timestamp:
Sep 4, 2023, 10:17:16 AM (15 months ago)
Author:
Laurent Fairhead
Message:

Merged with trunk revision 4586 corresponding to june 2023 testing

Location:
LMDZ6/branches/LMDZ_cdrag_LSCE
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/LMDZ_cdrag_LSCE

  • LMDZ6/branches/LMDZ_cdrag_LSCE/arch/arch-X64_IRENE-AMD.path

    r4489 r4669  
     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_cdrag_LSCE/arch/arch-X64_IRENE.env

    r4510 r4669  
    1212module load c++/gnu/8.3.0
    1313module load c/gnu/8.3.0
     14module load netcdf95
  • LMDZ6/branches/LMDZ_cdrag_LSCE/arch/arch-X64_IRENE.path

    r4515 r4669  
    44NETCDF_LIB="-lnetcdff -lnetcdf"
    55
    6 NETCDF95_INCDIR=-I/ccc/cont003/home/igcmg/igcmg/Tools/irene/include/NetCDF95
    7 NETCDF95_LIBDIR=-L/ccc/cont003/home/igcmg/igcmg/Tools/irene/lib
     6NETCDF95_INCDIR=-I$NETCDF95_INCDIR
     7NETCDF95_LIBDIR=-L$NETCDF95_LIBDIR
    88NETCDF95_LIB=-lnetcdf95
    99
  • LMDZ6/branches/LMDZ_cdrag_LSCE/arch/arch-X64_JEANZAY.env

    r4385 r4669  
    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_cdrag_LSCE/arch/arch-X64_JEANZAY.path

    r4499 r4669  
    66NETCDF_LIB="-lnetcdff -lnetcdf"
    77
    8 NETCDF95_INCDIR=-I/gpfswork/rech/lmd/rdzt899/build/Libraries_release/NetCDF95/modules
    9 NETCDF95_LIBDIR=-L/gpfswork/rech/lmd/rdzt899/build/Libraries_release/NetCDF95
     8NETCDF95_INCDIR=-I$NETCDF95_ROOT/include/NetCDF95
     9NETCDF95_LIBDIR=-L$NETCDF95_ROOT/lib
    1010NETCDF95_LIB=-lnetcdf95
    1111
  • LMDZ6/branches/LMDZ_cdrag_LSCE/arch/arch-ifort_LSCE.path

    r4489 r4669  
    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_cdrag_LSCE/arch/arch-ifort_MESOIPSL.env

    r4305 r4669  
    88module load netcdf-fortran/4.5.3-mpi
    99module load netcdf-c/4.7.4-mpi
    10 
     10module load netcdf95
  • LMDZ6/branches/LMDZ_cdrag_LSCE/arch/arch-ifort_MESOIPSL.path

    r4428 r4669  
    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"
Note: See TracChangeset for help on using the changeset viewer.