Changeset 591 for XIOS/trunk/make_xios


Ignore:
Timestamp:
04/29/15 14:46:01 (6 years ago)
Author:
rlacroix
Message:

Remove leftovers from the XMLIO age.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/make_xios

    r475 r591  
    113113   then 
    114114     ln -s $PWD/.void_dir $PWD/extern/netcdf4 
    115      XMLIO_CPPKEY="$XMLIO_CPPKEY USING_NETCDF_PAR" 
     115     XIOS_CPPKEY="$XIOS_CPPKEY USING_NETCDF_PAR" 
    116116elif [[ "$netcdf_lib" == "netcdf4_seq" ]] 
    117117  then  
     
    120120  then  
    121121    ln -s $PWD/extern/src_netcdf4 $PWD/extern/netcdf4 
    122     XMLIO_CPPKEY="$XMLIO_CPPKEY USING_NETCDF_PAR USING_NETCDF_INTERNAL" 
     122    XIOS_CPPKEY="$XIOS_CPPKEY USING_NETCDF_PAR USING_NETCDF_INTERNAL" 
    123123    export NETCDF_INCDIR="-I${PWD}/extern/netcdf4" 
    124124    export NETCDF_LIBDIR="" 
     
    133133    if [[ "$oasis" == "oasis3_mct" ]] 
    134134    then 
    135         XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OMCT" 
     135        XIOS_CPPKEY="$XIOS_CPPKEY USE_OMCT" 
    136136    elif [[ "$oasis" == "oasis3"  ]] 
    137137    then 
    138         XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OASIS" 
     138        XIOS_CPPKEY="$XIOS_CPPKEY USE_OASIS" 
    139139        OASIS_INCDIR="-I$PWD/../../prism/X64/build/lib/psmile.MPI1" 
    140140        OASIS_LIBDIR="-L$PWD/../../prism/X64/lib" 
     
    145145    fi 
    146146    NETCDF_LIB="-lnetcdff -lnetcdf" 
    147     XMLIO_FINCDIR="$OASIS_INCDIR $XMLIO_FINCDIR" 
    148     XMLIO_LIB="$OASIS_LIBDIR $OASIS_LIB $XMLIO_LIB" 
     147    XIOS_FINCDIR="$OASIS_INCDIR $XIOS_FINCDIR" 
     148    XIOS_LIB="$OASIS_LIBDIR $OASIS_LIB $XIOS_LIB" 
    149149fi  
    150150 
    151151if [[ "$use_memtrack" == "true" ]] 
    152152   then 
    153    XMLIO_LIB="$ADDR2LINE_LIBDIR $ADDR2LINE_LIB $XMLIO_LIB" 
    154    XMLIO_CPPKEY="$XMLIO_CPPKEY XIOS_MEMTRACK" 
     153   XIOS_LIB="$ADDR2LINE_LIBDIR $ADDR2LINE_LIB $XIOS_LIB" 
     154   XIOS_CPPKEY="$XIOS_CPPKEY XIOS_MEMTRACK" 
    155155fi  
    156156 
    157 XMLIO_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR" 
    158 XMLIO_FINCDIR="$XMLIO_FINCDIR $MPI_INCDIR" 
     157XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR" 
     158XIOS_FINCDIR="$XIOS_FINCDIR $MPI_INCDIR" 
    159159 
    160 XMLIO_LIB="$XMLIO_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB" 
     160XIOS_LIB="$XIOS_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB" 
    161161 
    162162rm -f config.fcm 
    163163echo "%COMPIL_CFLAGS $COMPIL_CFLAGS" >> config.fcm 
    164164echo "%COMPIL_FFLAGS $COMPIL_FFLAGS" >> config.fcm 
    165 echo "%CPP_KEY       $XMLIO_CPPKEY"  >> config.fcm 
     165echo "%CPP_KEY       $XIOS_CPPKEY"   >> config.fcm 
    166166 
    167 echo "%CBASE_INC     $XMLIO_CINCDIR" >> config.fcm      
    168 echo "%FBASE_INC     $XMLIO_FINCDIR" >> config.fcm 
    169 echo "%ARCH_LD       $XMLIO_LIB" >> config.fcm  
     167echo "%CBASE_INC     $XIOS_CINCDIR" >> config.fcm      
     168echo "%FBASE_INC     $XIOS_FINCDIR" >> config.fcm 
     169echo "%ARCH_LD       $XIOS_LIB"    >> config.fcm  
    170170 
    171171echo "=> Using "$compil_mode" mode for compiling under architecture \""$arch"\" !" 
     
    182182export PATH=$PWD/tools/FCM/bin:$PATH 
    183183 
    184 #$make_dir/tools/preprocess_cpp $make_dir/src/xmlio/iface/interface.cpp      $make_dir/src/xmlio/iface/interface.cpp.in 
    185 #$make_dir/tools/preprocess_f03 $make_dir/src/xmlio/fortran/ixmlioserver.f90 $make_dir/src/xmlio/fortran/ixmlioserver.f03.in 
    186  
    187184if [[ "$compil_full" == "true" ]] 
    188185   then 
     
    197194  then 
    198195  set nothing 
    199 #    cd $WORKDIR/XMLIO_NEMO_COUPLE/modeles/NEMO/WORK 
    200 #    cd $WORKDIR/XMLIO_NEMO/modeles/NEMO/WORK 
     196#    cd $WORKDIR/XIOS_NEMO_COUPLE/modeles/NEMO/WORK 
     197#    cd $WORKDIR/XIOS_NEMO/modeles/NEMO/WORK 
    201198#    make 
    202199fi 
Note: See TracChangeset for help on using the changeset viewer.