Commit cddd2370 authored by Thomas Dubos's avatar Thomas Dubos
Browse files

Converge some non-source files

parent 12d40922
......@@ -4,8 +4,8 @@
%AR ar
%MAKE gmake
%FPP_FLAGS -P
%FPP_DEF KEY_NONE CPP_NETCDF4
%BASE_FFLAGS -fPIC -i4 -r8 -auto -align all -assume realloc_lhs -I${MKLROOT}/include
%FPP_DEF KEY_NONE CPP_NETCDF4 CPP_USING_MPI_NEW
%BASE_FFLAGS -fPIC -i4 -r8 -auto -align all -I${MKLROOT}/include -assume realloc_lhs
%PROD_FFLAGS -g -traceback -O3
%DEV_FFLAGS -g -O1 -traceback
%DEBUG_FFLAGS -g -traceback -check bounds -fp-model strict
......
......@@ -37,16 +37,16 @@ function cmd_src_mv()
function cmd_dir()
{
DIR=$1
DIR=${DIR#*/}
SAME=""
DIFFERENT=""
for FILE in $(cd trunk2master/$DIR ; find . -type f | sort) ; do
FILE=$(basename $FILE)
NAME=$DIR/$FILE
for FILE in $(cd trunk2master ; find $DIR -type f | sort) ; do
NAME=$FILE
if [ -e "devel2master/$NAME" ] ; then
if diff -q trunk2master/$NAME devel2master/$NAME > /dev/null ; then
DIFFERENT="$DIFFERENT $FILE"
SAME="$SAME $NAME"
else
SAME="$SAME $FILE"
DIFFERENT="$DIFFERENT $NAME"
fi
fi
done
......
......@@ -4,3 +4,5 @@ module load intel/15.0.6.233
module load openmpi/1.6.5-ifort
module load hdf5/1.8.18-parallel-ifort
module load netcdf4/4.4.1.1-parallel-ifort
module load python/3.6-anaconda50
......@@ -5,12 +5,12 @@
%MAKE gmake
%FPP_FLAGS -P
%FPP_DEF KEY_NONE CPP_NETCDF4 CPP_USING_MPI_NEW
%BASE_FFLAGS -i4 -r8 -auto -align all -I${MKLROOT}/include -assume realloc_lhs
%BASE_FFLAGS -fPIC -i4 -r8 -auto -align all -I${MKLROOT}/include -assume realloc_lhs
%PROD_FFLAGS -g -traceback -O3
%DEV_FFLAGS -g -O1 -traceback
%DEBUG_FFLAGS -g -traceback -check bounds -fp-model strict
%MPI_FFLAGS
%OMP_FFLAGS -openmp -openmp-threadprivate compat
%BASE_LD -i4 -r8 -auto -L${MKLROOT}/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lm
%BASE_LD -fPIC -i4 -r8 -auto ${MKL_LIBDIR} ${MKL_LIB}
%MPI_LD
%OMP_LD -openmp
NETCDF_INCDIR=$(nf-config --fflags)
NETCDF_LIBDIR=$(nf-config --flibs)
NETCDF_LIB=""
MPI_INCDIR=""
MPI_LIBDIR=""
MPI_LIB=""
......@@ -8,10 +9,16 @@ HDF5_INCDIR=""
HDF5_LIBDIR=""
HDF5_LIB=""
XIOS_INCDIR="-I$PWD/../XIOS/inc"
XIOS_LIBDIR="-L$PWD/../XIOS/lib"
XIOS_ROOTDIR=$(cd -P ../XIOS ; pwd)
XIOS_INCDIR="-I$XIOS_ROOTDIR/inc"
XIOS_LIBDIR="-L$XIOS_ROOTDIR/lib"
XIOS_LIB="-lxios -lstdc++"
IOIPSL_INCDIR="-I $PWD/../IOIPSL/inc"
IOIPSL_LIBDIR="-L $PWD/../IOIPSL/lib"
IOIPSL_LIB="-lioipsl"
export MKL_LIBDIR="-L $MKLROOT/lib/intel64"
export MKL_INCDIR="-I $MKLROOT/include"
export MKL_LIB="-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lm"
CURRENT_ARCH=ifort_CICLAD
#!/bin/bash
cd doc
DOC=$PWD
REV=$1
cd ..
svn info --xml | grep revision | head -n 1 > revinfo.xml
sed -i "s/>//g" revinfo.xml
. revinfo.xml
REV="r$revision"
rm revinfo.xml
cd $DOC
DOXYFILE="Doxyfile.$REV"
EXCL="src\/dimensions.f90 src\/geometry.f90 src\/trace.f90 src\/mpipara.f90"
#EXCL="src\/dimensions.f90 src\/geometry.f90 src\/trace.f90 src\/mpipara.f90"
sed "s/rXXX/$REV/g" Doxyfile > $DOXYFILE
sed -i "s/EXCLUDED_F90/$EXCL/g" $DOXYFILE
#sed -i "s/EXCLUDED_F90/$EXCL/g" $DOXYFILE
rm -rf src html latex
mkdir src
cp ../src/*.f90 ../ppsrc/src/*.f90 src
cp ../src/*.f90 ../src/*/*.f90 ../ppsrc/src/*.f90 ../ppsrc/*/*.f90 src
doxygen $DOXYFILE
rm $DOXYFILE
set -x
time lftp dubos@ftp.lmd.polytechnique.fr -e "mirror -R html perso/DYNAMICO/$REV ; exit"
mv html ../public
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment