diff --git a/scripts/ccsm_utils/Machines/config_machines.xml b/scripts/ccsm_utils/Machines/config_machines.xml index 23b8865..4b6cc97 100755 --- a/scripts/ccsm_utils/Machines/config_machines.xml +++ b/scripts/ccsm_utils/Machines/config_machines.xml @@ -390,7 +390,7 @@ - OR-CONDO, CADES-CCSI, os is Linux, 32 pes/nodes, batch system is PBS + OR-CONDO, CADES-CCSI, os is Linux, 32 pes/nodes, batch system is SLURM LINUX gnu,intel openmpi,mpi-serial @@ -402,7 +402,7 @@ csm/$CASE /lustre/or-hydra/cades-ccsi/proj-shared/project_acme/baselines qstat -f - qsub + sbatch Fengming Yuan 4 32 diff --git a/scripts/ccsm_utils/Machines/env_mach_specific.cades b/scripts/ccsm_utils/Machines/env_mach_specific.cades index 262e14b..b12617b 100755 --- a/scripts/ccsm_utils/Machines/env_mach_specific.cades +++ b/scripts/ccsm_utils/Machines/env_mach_specific.cades @@ -65,12 +65,12 @@ setenv BLAS_LIBDIR /software/tools/spack/opt/spack/linux-x86_64/gcc-5.3.0/netlib # CMake is required for building PIO #module load linux-x86_64/cmake@3.4.0%gcc@5.3.0+ncurses-sr4jjqc -module load cmake/3.6.1 +module load cmake/3.12.0 # for PFLOTRAN setenv PETSC_DIR $USER_SOFTWARES/petsc4pf/openmpi-1.10.2-gcc-5.3 setenv PETSC_ARCH arch-orcondo-openmpi-gcc53-debug - +#setenv PERL5LIB /software/user_tools/current/cades-ccsi/perl5/lib/perl5/ setenv PETSC_LIB ${PETSC_DIR}/lib #------------------------------------------------------------------------------- diff --git a/scripts/ccsm_utils/Machines/mkbatch.cades b/scripts/ccsm_utils/Machines/mkbatch.cades index 50d29be..1de97e4 100755 --- a/scripts/ccsm_utils/Machines/mkbatch.cades +++ b/scripts/ccsm_utils/Machines/mkbatch.cades @@ -33,15 +33,13 @@ endif cat >! $file << EOF1 #!/bin/csh -f -#PBS -N ${jobname} -#PBS -q batch -#PBS -l nodes=${mppnodes}:ppn=$ppn -#PBS -l walltime=${walltime} -#PBS -j oe -#PBS -S /bin/csh -V -#PBS -W group_list=cades-ccsi -#PBS -A ccsi -#PBS -l qos=std +#SBATCH -J ${jobname} +#SBATCH -p burst +#SBATCH -N ${mppnodes} +#SBATCH --ntasks-per-node=$ppn +#SBATCH -t ${walltime} +#SBATCH --mem=128G +#SBATCH -A ccsi EOF1 ################################################################################# diff --git a/scripts/site_fullrun.py b/scripts/site_fullrun.py index d3e83f0..73f583b 100755 --- a/scripts/site_fullrun.py +++ b/scripts/site_fullrun.py @@ -265,7 +265,7 @@ output = open('./site_fullrun.pbs','w') input = open(ad_case+'/'+ad_case+'.run') for s in input: - if ("#!" in s or '#PBS' in s): + if ("#!" in s or '#SBATCH' in s): output.write(s) input.close() output.write("\n") @@ -283,5 +283,5 @@ os.system('chmod u+x site_fullrun.pbs') os.system('./site_fullrun.pbs') else: - os.system('qsub site_fullrun.pbs') + os.system('sbatch site_fullrun.pbs')