From 98b0b11046e628b4337a864106fde209287f2703 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 13 Jul 2023 12:57:54 -0600 Subject: [PATCH] clean up blank spaces --- cicecore/cicedyn/general/ice_forcing.F90 | 4 ++-- configuration/scripts/cice.batch.csh | 2 +- configuration/scripts/machines/Macros.derecho_intel | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cicecore/cicedyn/general/ice_forcing.F90 b/cicecore/cicedyn/general/ice_forcing.F90 index 851213579..9002d0448 100755 --- a/cicecore/cicedyn/general/ice_forcing.F90 +++ b/cicecore/cicedyn/general/ice_forcing.F90 @@ -2181,7 +2181,7 @@ subroutine JRA55_files(yr) ! The files will generally be of the format ! $atm_data_type/[JRA55,JRA55do,'']/8XDAILY/[JRA55,JRA55do][_$grid,'']_03hr_forcing[_$grid,'']_$year.nc ! The options defined by cnt try several versions of paths/filenames - ! As a user, + ! As a user, ! atm_data_type should be set to JRA55, JRA55do, JRA55_xxx, or JRA55do_xxx ! where xxx can be any set of characters. The _xxx if included will be ignored. ! Historically, these were set to JRA55_gx1 and so forth but the _gx1 is no longer needed @@ -2189,7 +2189,7 @@ subroutine JRA55_files(yr) ! is atm_data_type with _ and everything after _ removed. ! atm_data_dir should be set to ${CICE_DATA_root}/forcing/$grid/[JRA55,JRA55do,''] ! The [JRA55,JRA55do] at the end of the atm_data_dir is optional to provide backwards - ! compatibility and if not included, will be appended automaticaly using + ! compatibility and if not included, will be appended automaticaly using ! the atm_data_type_prefix value. The grid is typically gx1, gx3, tx1, or similar. ! In general, we recommend using the following format ! atm_data_type = [JRA55,JRA55do] diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh index d1a531de0..5a47decf1 100755 --- a/configuration/scripts/cice.batch.csh +++ b/configuration/scripts/cice.batch.csh @@ -41,7 +41,7 @@ cat >> ${jobfile} << EOFB #PBS -A ${acct} #PBS -l select=${nnodes}:ncpus=${corespernode}:mpiprocs=${taskpernodelimit}:ompthreads=${nthrds} #PBS -l walltime=${batchtime} -#PBS -j oe +#PBS -j oe #PBS -W umask=022 #PBS -o ${ICE_CASEDIR} ###PBS -M username@domain.com diff --git a/configuration/scripts/machines/Macros.derecho_intel b/configuration/scripts/machines/Macros.derecho_intel index 1ea4fe30c..df0d2320e 100644 --- a/configuration/scripts/machines/Macros.derecho_intel +++ b/configuration/scripts/machines/Macros.derecho_intel @@ -35,7 +35,7 @@ LD:= $(FC) NETCDF_PATH := $(NETCDF) -PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs +#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs PNETCDF_PATH := $(PNETCDF) #PNETCDF_PATH := /glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib @@ -49,10 +49,10 @@ LIB_NETCDF := $(NETCDF)/lib #SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -ifeq ($(ICE_THREADED), true) - LDFLAGS += -qopenmp - CFLAGS += -qopenmp - FFLAGS += -qopenmp +ifeq ($(ICE_THREADED), true) + LDFLAGS += -qopenmp + CFLAGS += -qopenmp + FFLAGS += -qopenmp endif #ifeq ($(ICE_IOTYPE), pio1)