diff --git a/platform/build/make.inc.OMEGA_INTEL b/platform/build/make.inc.OMEGA_INTEL index 9eb3c6f78..f1c4c2262 100644 --- a/platform/build/make.inc.OMEGA_INTEL +++ b/platform/build/make.inc.OMEGA_INTEL @@ -1,8 +1,8 @@ -#---------------------------------------------------------- -# Iris (General Atomics) -#---------------------------------------------------------- +#---------------------------------------------- +# Omega (General Atomics) +#---------------------------------------------- -IDENTITY="IRIS (ifort)" +IDENTITY="OMEGA (Intel compiler)" CORES_PER_NODE=1 NUMAS_PER_NODE=1 diff --git a/platform/build/make.inc.PPPL b/platform/build/make.inc.PPPL deleted file mode 100644 index 1725f4a18..000000000 --- a/platform/build/make.inc.PPPL +++ /dev/null @@ -1,37 +0,0 @@ -#--------------------------------------------------- -# PPPL Systems (ellis, dawson, kestrel, kite and kruskal) -# with Intel Compiler and OpenMPI -#--------------------------------------------------- -# L. Peterson (jpeterso@pppl.gov) -# D. Mikkelsen (mikk@pppl.gov) -# N. Ferraro (nferraro@pppl.gov) -# B.A. Grierson (bgriers@pppl.gov) - -IDENTITY="PPPL cluster" -CORES_PER_NODE=1 -NUMAS_PER_NODE=1 - -# Compilers (intel) and flags - -FC = mpif90 -gen-interfaces -module ${GACODE_ROOT}/modules -I${GACODE_ROOT}/modules -I${MKLROOT}/include/fftw -I$(NETCDF_FORTRAN_HOME)/include -F77 = ${FC} - -FOMP = -qopenmp -FMATH = -real-size 64 -FOPT = -O2 -FDEBUG = -check all -traceback -F2PY = f2py - -# System math libraries -LMATH = -mkl - -# NetCDF -NETCDF = -L${NETCDF_FORTRAN_HOME}/lib -lnetcdff -L${NETCDF_C_HOME}/lib -lnetcdf -NETCDF_INC =-I${NETCDF_FORTRAN_HOME}/include -I${NETCDF_C_HOME}/include - -# Mapping -%.o : %.mod - -# Archive -ARCH = ar cr - diff --git a/platform/build/make.inc.PPPL_gcc b/platform/build/make.inc.PPPL_gcc deleted file mode 100644 index 4af08f45c..000000000 --- a/platform/build/make.inc.PPPL_gcc +++ /dev/null @@ -1,36 +0,0 @@ -#--------------------------------------------------- -# PPPL Systems (ellis, dawson, kestrel, kite and kruskal) -# with gcc compiler and OpenMPI -#--------------------------------------------------- -# S. Smith (smithsp@fusion.gat.com) - -IDENTITY="PPPL cluster" -CORES_PER_NODE=1 -NUMAS_PER_NODE=1 - -# Compilers and flags - -FC = mpif90 -std=f2008 -fall-intrinsics -I$(GACODE_ROOT)/modules -J $(GACODE_ROOT)/modules -fPIC -F77 = mpif77 -I$(GACODE_ROOT)/modules -CC = gcc - -FMATH = -fdefault-real-8 -fdefault-double-8 -FOPT = -Ofast -FDEBUG = -Wall -W -fcheck=mem,bounds -g -fbacktrace -ffpe-trap=invalid,zero,overflow -F2PY = f2py -FOMP = -fopenmp - -# System math libraries -LMATH = -L$(LAPACKHOME)/lib64 -llapack -lblas -L$(FFTW_HOME)/lib -lfftw3_threads -lfftw3 -FFTW_INC = $(FFTW_HOME)/include - -# NetCDF -NETCDF = -L${NETCDF_FORTRAN_HOME}/lib -lnetcdff -L${NETCDF_C_HOME}/lib -lnetcdf -NETCDF_INC =${NETCDF_FORTRAN_HOME}/include -I${NETCDF_C_HOME}/include - -# Mapping -%.o : %.mod - -# Archive -ARCH = ar cr - diff --git a/platform/build/make.inc.PPPL_pgf b/platform/build/make.inc.PPPL_pgf deleted file mode 100644 index 86313ad4e..000000000 --- a/platform/build/make.inc.PPPL_pgf +++ /dev/null @@ -1,31 +0,0 @@ -#--------------------------------------------------- -# PPPL system with pgf compiler -# module load pgi openmpi netcdf-c netcdf-fortran -#--------------------------------------------------- - -IDENTITY="PPPL cluster" -CORES_PER_NODE=1 -NUMAS_PER_NODE=1 - -# Compilers (intel) and flags -FC = mpif90 -module $(GACODE_ROOT)/modules -F77 = mpif90 - -FOMP = -mp -FMATH = -r8 -FOPT = -fastsse -FDEBUG = -g -Ktrap=fp -Mbounds -Minform,inform - -# System math libraries -LMATH = -L${LAPACK_HOME}/lib/ -llapack -lcblas - -# NetCDF -NETCDF = -L${NETCDF_FORTRAN_HOME}/lib -lnetcdff -L${NETCDF_C_HOME}/lib -lnetcdf -NETCDF_INC =${NETCDF_FORTRAN_HOME}/include -I${NETCDF_C_HOME}/include - -# Mapping -%.o : %.mod - -# Archive -ARCH = ar cr - diff --git a/platform/env/env.PPPL b/platform/env/env.PPPL deleted file mode 100644 index e16c84982..000000000 --- a/platform/env/env.PPPL +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -module load git -module load intel -module load openmpi -module load hdf5-parallel -module load netcdf-c -module load netcdf-fortran -module load fftw diff --git a/platform/env/env.PPPL_gcc b/platform/env/env.PPPL_gcc deleted file mode 100644 index 8b1fbfa0d..000000000 --- a/platform/env/env.PPPL_gcc +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -module load mod_ntcc -module load ntcc/gcc -module load lapack -module load fftw -module load fann diff --git a/platform/exec/exec.PPPL b/platform/exec/exec.PPPL deleted file mode 100755 index 45080eb7e..000000000 --- a/platform/exec/exec.PPPL +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# GACODE Parallel execution script (PPPL) - -simdir=${1} -nmpi=${2} -exec=${3} -nomp=${4} -numa=${5} -mpinuma=${6} - -cd $simdir - -# Had to remove --oversubscribe for NEO to run for Tom Osborne -echo "export OMP_NUM_THREADS=$nomp ; mpirun -np --oversubscribe $nmpi $exec " -export OMP_NUM_THREADS=$nomp ; mpirun --oversubscribe -np $nmpi $exec -exit diff --git a/platform/exec/exec.PPPL_gcc b/platform/exec/exec.PPPL_gcc deleted file mode 100755 index bd344aef5..000000000 --- a/platform/exec/exec.PPPL_gcc +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# GACODE Parallel execution script (PPPL_gcc) - -simdir=${1} -nmpi=${2} -exec=${3} -nomp=${4} -numa=${5} -mpinuma=${6} - -cd $simdir - -# Had to remove --oversubscribe for NEO to run for Tom Osborne -echo "export OMP_NUM_THREADS=$nomp ; mpirun -np --oversubscribe $nmpi $exec " -export OMP_NUM_THREADS=$nomp ; mpirun --oversubscribe -np $nmpi $exec -exit diff --git a/platform/qsub/qsub.PPPL b/platform/qsub/qsub.PPPL deleted file mode 100644 index 48364c22b..000000000 --- a/platform/qsub/qsub.PPPL +++ /dev/null @@ -1,26 +0,0 @@ - -bfile=$SIMDIR/batch.src -echo "#!/bin/bash " > $bfile -echo "#SBATCH -J $LOCDIR" >> $bfile -echo "#SBATCH -o $SIMDIR/batch.out" >> $bfile -echo "#SBATCH -e $SIMDIR/batch.err" >> $bfile -echo "#SBATCH -t $WALLTIME" >> $bfile -echo "#SBATCH -n $cores_used" >> $bfile - -if [ -n $MEMPERNODE ] -then - echo "#SBATCH --mem $MEMNODE" >> $bfile -elif [ -n $MEMPERCPU ] - echo "#SBATCH --mem-per-cpu $MEMPERCPU" >> $bfile -fi - -if [ "$QUEUE" = "null_queue" ] -then - echo "#SBATCH -p general" >> $bfile -else - echo "#SBATCH -p $QUEUE" >> $bfile -else - echo "#SBATCH --mem-per-cpu 4GB" >> $bfile -fi - -echo "$CODE -e $LOCDIR -n $nmpi -nomp $nomp -numa $numa -mpinuma $mpinuma -p $SIMROOT" >> $bfile diff --git a/platform/qsub/qsub.PPPL_PORTAL b/platform/qsub/qsub.PPPL_PORTAL old mode 100755 new mode 100644 diff --git a/platform/qsub/qsub.PPPL_gcc b/platform/qsub/qsub.PPPL_gcc deleted file mode 100644 index a47805fc5..000000000 --- a/platform/qsub/qsub.PPPL_gcc +++ /dev/null @@ -1,25 +0,0 @@ - -bfile=$SIMDIR/batch.src -echo "#!/bin/bash " > $bfile -echo "#SBATCH -J $LOCDIR" >> $bfile -echo "#SBATCH -o $SIMDIR/batch.out" >> $bfile -echo "#SBATCH -e $SIMDIR/batch.err" >> $bfile -echo "#SBATCH -t $WALLTIME" >> $bfile -echo "#SBATCH -n $cores_used" >> $bfile - -if [ -n $MEMPERNODE ] -then - echo "#SBATCH --mem $MEMNODE" >> $bfile -elif [ -n $MEMPERCPU ] - echo "#SBATCH --mem-per-cpu $MEMPERCPU" >> $bfile -else - echo "#SBATCH --mem-per-cpu 4GB" >> $bfile -fi - -if [ "$QUEUE" = "null_queue" ] -then - echo "#SBATCH -p general" >> $bfile -else - echo "#SBATCH -p $QUEUE" >> $bfile -fi -echo "$CODE -e $LOCDIR -n $nmpi -nomp $nomp -numa $numa -mpinuma $mpinuma -p $SIMROOT" >> $bfile