diff --git a/README.md b/README.md index 25f7b1b38..627802994 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,4 @@ Neither the name of Los Alamos National Security, LLC, Los Alamos National Labor THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Use of software in any private development branches of the CICE repository shall be conducted under the distribution policy of the CICE Consortium (see DistributionPolicy.pdf). + diff --git a/configuration/scripts/tests/cice.10day.csh b/configuration/scripts/tests/cice.10day.csh index 06d95d340..6eafe7b90 100755 --- a/configuration/scripts/tests/cice.10day.csh +++ b/configuration/scripts/tests/cice.10day.csh @@ -77,24 +77,16 @@ EOFB else if (${CICE_MACHINE} =~ wolf*) then cat >> ${jobfile} << EOFB -#MSUB -A climateacme -#MSUB -l walltime=01:00:00 -#MSUB -l nodes=1:ppn=4 -#MSUB -N cice +#SBATCH -J ${CICE_CASENAME} +#SBATCH -t 0:10:00 +#SBATCH -A ${acct} +#SBATCH -N ${nnodes} +#SBATCH -e slurm%j.err +#SBATCH -o slurm%j.out +#SBATCH --mail-type FAIL +#SBATCH --mail-user=eclare@lanl.gov +#SBATCH --qos=low EOFB -#cat >> ${jobfile} << EOFB -##SBATCH -J ${CICE_CASENAME} -####SBATCH -p tossdev -##SBATCH -t 0:45:00 -##SBATCH -A ${acct} -##SBATCH -N ${nnodes} -####SBATCH -L SCRATCH -####SBATCH -C haswell -##SBATCH -e slurm%j.err -##SBATCH -o slurm%j.out -####SBATCH --mail-type FAIL -####SBATCH --mail-user username@domain.com -#EOFB endif diff --git a/configuration/scripts/tests/cice.annual.csh b/configuration/scripts/tests/cice.annual.csh index 04e256c90..45717964e 100755 --- a/configuration/scripts/tests/cice.annual.csh +++ b/configuration/scripts/tests/cice.annual.csh @@ -77,24 +77,16 @@ EOFB else if (${CICE_MACHINE} =~ wolf*) then cat >> ${jobfile} << EOFB -#MSUB -A climateacme -#MSUB -l walltime=01:00:00 -#MSUB -l nodes=1:ppn=4 -#MSUB -N cice +#SBATCH -J ${CICE_CASENAME} +#SBATCH -t 0:10:00 +#SBATCH -A ${acct} +#SBATCH -N ${nnodes} +#SBATCH -e slurm%j.err +#SBATCH -o slurm%j.out +#SBATCH --mail-type FAIL +#SBATCH --mail-user=eclare@lanl.gov +#SBATCH --qos=low EOFB -#cat >> ${jobfile} << EOFB -##SBATCH -J ${CICE_CASENAME} -####SBATCH -p tossdev -##SBATCH -t 0:45:00 -##SBATCH -A ${acct} -##SBATCH -N ${nnodes} -####SBATCH -L SCRATCH -####SBATCH -C haswell -##SBATCH -e slurm%j.err -##SBATCH -o slurm%j.out -####SBATCH --mail-type FAIL -####SBATCH --mail-user username@domain.com -#EOFB endif diff --git a/configuration/scripts/tests/cice.smoke.csh b/configuration/scripts/tests/cice.smoke.csh index d44240e80..a4be7df39 100755 --- a/configuration/scripts/tests/cice.smoke.csh +++ b/configuration/scripts/tests/cice.smoke.csh @@ -77,24 +77,16 @@ EOFB else if (${CICE_MACHINE} =~ wolf*) then cat >> ${jobfile} << EOFB -#MSUB -A climateacme -#MSUB -l walltime=01:00:00 -#MSUB -l nodes=1:ppn=4 -#MSUB -N cice +#SBATCH -J ${CICE_CASENAME} +#SBATCH -t 0:10:00 +#SBATCH -A ${acct} +#SBATCH -N ${nnodes} +#SBATCH -e slurm%j.err +#SBATCH -o slurm%j.out +#SBATCH --mail-type FAIL +#SBATCH --mail-user=eclare@lanl.gov +#SBATCH --qos=low EOFB -#cat >> ${jobfile} << EOFB -##SBATCH -J ${CICE_CASENAME} -####SBATCH -p tossdev -##SBATCH -t 0:45:00 -##SBATCH -A ${acct} -##SBATCH -N ${nnodes} -####SBATCH -L SCRATCH -####SBATCH -C haswell -##SBATCH -e slurm%j.err -##SBATCH -o slurm%j.out -####SBATCH --mail-type FAIL -####SBATCH --mail-user username@domain.com -#EOFB endif