Skip to content

Commit

Permalink
clean up blank spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
apcraig committed Jul 13, 2023
1 parent 82b61fd commit 98b0b11
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions cicecore/cicedyn/general/ice_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2181,15 +2181,15 @@ 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
! but this is still allowed for backwards compatibility. atm_data_type_prefix
! 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]
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/cice.batch.csh
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
Expand Down
10 changes: 5 additions & 5 deletions configuration/scripts/machines/Macros.derecho_intel
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 98b0b11

Please sign in to comment.