Skip to content

Commit

Permalink
updates for cice bfb, fix build, remove dead cpps (CICE-Consortium#256)
Browse files Browse the repository at this point in the history
  • Loading branch information
@apcraig
apcraig authored Mar 16, 2019
1 parent 69d1f48 commit ac6195d
Show file tree
Hide file tree
Showing 33 changed files with 33 additions and 72 deletions.
1 change: 1 addition & 0 deletions columnphysics/icepack_intfc.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module icepack_intfc
use icepack_kinds, only: icepack_char_len_long => char_len_long
use icepack_kinds, only: icepack_log_kind => log_kind
use icepack_kinds, only: icepack_int_kind => int_kind
use icepack_kinds, only: icepack_int8_kind => int8_kind
use icepack_kinds, only: icepack_real_kind => real_kind
use icepack_kinds, only: icepack_dbl_kind => dbl_kind
use icepack_kinds, only: icepack_r16_kind => r16_kind
Expand Down
3 changes: 2 additions & 1 deletion columnphysics/icepack_kinds.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ module icepack_kinds
char_len_long = 256, &
log_kind = kind(.true.), &
int_kind = selected_int_kind(6), &
int8_kind = selected_int_kind(13), &
real_kind = selected_real_kind(6), &
dbl_kind = selected_real_kind(13), &
r16_kind = selected_real_kind(26)
r16_kind = selected_real_kind(33,4931)

!=======================================================================

Expand Down
10 changes: 1 addition & 9 deletions configuration/scripts/icepack.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ if !(-d ${ICE_OBJDIR}) mkdir -p ${ICE_OBJDIR}
cd ${ICE_OBJDIR}

#setenv ICE_CPPDEFS "-DNXGLOB=${ICE_NXGLOB} -DNYGLOB=${ICE_NYGLOB} -DBLCKX=${ICE_BLCKX} -DBLCKY=${ICE_BLCKY} -DMXBLCKS=${ICE_MXBLCKS} -DNICELYR=${NICELYR} -DNSNWLYR=${NSNWLYR} -DNICECAT=${NICECAT} -DTRAGE=${TRAGE} -DTRFY=${TRFY} -DTRLVL=${TRLVL} -DTRPND=${TRPND} -DTRBRI=${TRBRI} -DNTRAERO=${NTRAERO} -DTRZS=${TRZS} -DNBGCLYR=${NBGCLYR} -DTRALG=${TRALG} -DTRBGCZ=${TRBGCZ} -DTRDOC=${TRDOC} -DTRDOC=${TRDOC} -DTRDIC=${TRDIC} -DTRDON=${TRDON} -DTRFED=${TRFED} -DTRFEP=${TRFEP} -DTRZAERO=${TRZAERO} -DTRBGCS=${TRBGCS} -DNUMIN=${NUMIN} -DNUMAX=${NUMAX}"
setenv ICE_CPPDEFS "-DNXGLOB=${ICE_NXGLOB} -DNICELYR=${NICELYR} -DNSNWLYR=${NSNWLYR} -DNICECAT=${NICECAT} -DTRAGE=${TRAGE} -DTRFY=${TRFY} -DTRLVL=${TRLVL} -DTRPND=${TRPND} -DTRBRI=${TRBRI} -DNTRAERO=${NTRAERO} -DTRZS=${TRZS} -DNBGCLYR=${NBGCLYR} -DTRALG=${TRALG} -DTRBGCZ=${TRBGCZ} -DTRDOC=${TRDOC} -DTRDOC=${TRDOC} -DTRDIC=${TRDIC} -DTRDON=${TRDON} -DTRFED=${TRFED} -DTRFEP=${TRFEP} -DTRZAERO=${TRZAERO} -DTRBGCS=${TRBGCS} -DNUMIN=${NUMIN} -DNUMAX=${NUMAX}"

if ($DITTO == 'yes') then
setenv ICE_CPPDEFS "${ICE_CPPDEFS} -DREPRODUCIBLE"
endif
setenv ICE_CPPDEFS "-DNXGLOB=${ICE_NXGLOB} -DNICELYR=${NICELYR} -DNSNWLYR=${NSNWLYR} -DNICECAT=${NICECAT} -DTRAGE=${TRAGE} -DTRFY=${TRFY} -DTRLVL=${TRLVL} -DTRPND=${TRPND} -DTRBRI=${TRBRI} -DNTRAERO=${NTRAERO} -DTRZS=${TRZS} -DNBGCLYR=${NBGCLYR} -DTRALG=${TRALG} -DTRBGCZ=${TRBGCZ} -DTRDOC=${TRDOC} -DTRDOC=${TRDOC} -DTRDIC=${TRDIC} -DTRDON=${TRDON} -DTRFED=${TRFED} -DTRFEP=${TRFEP} -DTRZAERO=${TRZAERO} -DTRBGCS=${TRBGCS} "

if (${ICE_NTASKS} == 1) then
setenv ICE_COMMDIR serial
Expand Down Expand Up @@ -85,11 +81,9 @@ if (${ICE_CLEANBUILD} == 'true') then
echo "gmake clean"
if (${quiet} == "true") then
${ICE_MACHINE_MAKE} VPFILE=Filepath EXEC=${ICE_RUNDIR}/icepack \
CPPDEFS="${ICE_CPPDEFS}" \
-f ${ICE_CASEDIR}/Makefile MACFILE=${ICE_CASEDIR}/Macros.${ICE_MACHCOMP} clean >& ${ICE_BLDLOG_FILE}
else
${ICE_MACHINE_MAKE} VPFILE=Filepath EXEC=${ICE_RUNDIR}/icepack \
CPPDEFS="${ICE_CPPDEFS}" \
-f ${ICE_CASEDIR}/Makefile MACFILE=${ICE_CASEDIR}/Macros.${ICE_MACHCOMP} clean | tee ${ICE_BLDLOG_FILE}
endif
endif
Expand All @@ -98,12 +92,10 @@ echo "gmake icepack"
if (${quiet} == "true") then
echo " quiet mode on... patience"
${ICE_MACHINE_MAKE} -j ${ICE_MACHINE_BLDTHRDS} VPFILE=Filepath EXEC=${ICE_RUNDIR}/icepack \
CPPDEFS="${ICE_CPPDEFS}" \
-f ${ICE_CASEDIR}/Makefile MACFILE=${ICE_CASEDIR}/Macros.${ICE_MACHCOMP} >& ${ICE_BLDLOG_FILE}
set bldstat = ${status}
else
${ICE_MACHINE_MAKE} -j ${ICE_MACHINE_BLDTHRDS} VPFILE=Filepath EXEC=${ICE_RUNDIR}/icepack \
CPPDEFS="${ICE_CPPDEFS}" \
-f ${ICE_CASEDIR}/Makefile MACFILE=${ICE_CASEDIR}/Macros.${ICE_MACHCOMP} | tee ${ICE_BLDLOG_FILE}
set bldstat = ${status}
endif
Expand Down
6 changes: 0 additions & 6 deletions configuration/scripts/icepack.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ setenv TRFED 0 # number of dissolved iron tracers
# (up to max_fe = 2)

### Specialty code
setenv CAM_ICE no # set to yes for CAM runs (single column)
setenv DITTO no # reproducible diagnostics
setenv BARRIERS no # prevent MPI buffer overflow during gather/scatter
setenv ICE_BLDDEBUG false # build debug flags

### File unit numbers
setenv NUMIN 11 # minimum file unit number
setenv NUMAX 99 # maximum file unit number

2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.badger_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
11 changes: 1 addition & 10 deletions configuration/scripts/machines/Macros.cheyenne_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down Expand Up @@ -54,19 +54,10 @@ ifeq ($(compile_threaded), true)
FFLAGS += -qopenmp
endif

ifeq ($(DITTO), yes)
CPPDEFS := $(CPPDEFS) -DREPRODUCIBLE
endif

### if using parallel I/O, load all 3 libraries. PIO must be first!
ifeq ($(IO_TYPE), pio)
PIO_PATH:=/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib
INCLDIR += -I/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/include
SLIBS := $(SLIBS) -L$(PIO_PATH) -lpiof

CPPDEFS := $(CPPDEFS) -Dncdf
endif

ifeq ($(IO_TYPE), netcdf)
CPPDEFS := $(CPPDEFS) -Dncdf
endif
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.conrad_cray
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -e P
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -h fp0

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.conrad_gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -E
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -ffloat-store -march=native

FIXEDFLAGS := -ffixed-line-length-132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.conrad_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.conrad_pgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := pgcc -E
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -Kieee

FIXEDFLAGS := -Mextend
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.cori_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.gaffney_gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -E
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2

FIXEDFLAGS := -ffixed-line-length-132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.gaffney_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.gaffney_pgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := pgcc -Mcpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -Kieee

FIXEDFLAGS := -Mextend
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.gordon_cray
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -e P
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -h fp0

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.gordon_gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -E
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -ffloat-store -march=native

FIXEDFLAGS := -ffixed-line-length-132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.gordon_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.gordon_pgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := pgcc -Mcpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -Kieee

FIXEDFLAGS := -Mextend
Expand Down
5 changes: 1 addition & 4 deletions configuration/scripts/machines/Macros.hobart_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -qno-opt-dynamic-align -fp-model precise -std=gnu99

FIXEDFLAGS := -fixed -132
Expand All @@ -26,6 +26,3 @@ else
LD := ifort
endif

ifeq ($(DITTO), yes)
CPPDEFS := $(CPPDEFS) -DREPRODUCIBLE
endif
3 changes: 0 additions & 3 deletions configuration/scripts/machines/Macros.hobart_nag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,3 @@ endif

SLIBS := -L$(COMPILER_PATH)/lib/NAG_Fortran

ifeq ($(DITTO), yes)
CPPDEFS := $(CPPDEFS) -DREPRODUCIBLE
endif
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.koehr_gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -E
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2

FIXEDFLAGS := -ffixed-line-length-132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.koehr_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.koehr_pgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := pgcc -Mcpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -Kieee

FIXEDFLAGS := -Mextend
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.loft_gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

CPP := /usr/bin/cpp
#CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.onyx_cray
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -e P
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -h fp0

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.onyx_gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := ftn -E
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -ffloat-store -march=native

FIXEDFLAGS := -ffixed-line-length-132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.onyx_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
11 changes: 1 addition & 10 deletions configuration/scripts/machines/Macros.testmachine_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down Expand Up @@ -53,19 +53,10 @@ ifeq ($(compile_threaded), true)
FFLAGS += -openmp
endif

ifeq ($(DITTO), yes)
CPPDEFS := $(CPPDEFS) -DREPRODUCIBLE
endif

### if using parallel I/O, load all 3 libraries. PIO must be first!
ifeq ($(IO_TYPE), pio)
PIO_PATH:=/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib
INCLDIR += -I/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/include
SLIBS := $(SLIBS) -L$(PIO_PATH) -lpiof

CPPDEFS := $(CPPDEFS) -Dncdf
endif

ifeq ($(IO_TYPE), netcdf)
CPPDEFS := $(CPPDEFS) -Dncdf
endif
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.thunder_intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/Macros.travisCI_gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#==============================================================================

CPP := clang-cpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
Expand Down
1 change: 1 addition & 0 deletions doc/source/developer_guide/dg_col_phys.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ icepack_kinds module::
use icepack_kinds, only: icepack_char_len_long => char_len_long
use icepack_kinds, only: icepack_log_kind => log_kind
use icepack_kinds, only: icepack_int_kind => int_kind
use icepack_kinds, only: icepack_int8_kind => int8_kind
use icepack_kinds, only: icepack_real_kind => real_kind
use icepack_kinds, only: icepack_dbl_kind => dbl_kind
use icepack_kinds, only: icepack_r16_kind => r16_kind
Expand Down
5 changes: 3 additions & 2 deletions doc/source/icepack_index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ either Celsius or Kelvin units).
"idate", "the date at the end of the current time step (yyyymmdd)", ""
"idate0", "initial date", ""
"igrid", "interface points for vertical bio grid", ""
"int_kind", "definition of an integer", "selected_real_kind(6)"
"int_kind", "definition of an 4-byte integer", "selected_int_kind(6)"
"int8_kind", "definition of an 8-byte integer", "selected_int_kind(13)"
"istep", "local step counter for time loop", ""
"istep0", ":math:`\bullet` number of steps taken in previous run", "0"
"istep1", "total number of steps at current time step", ""
Expand Down Expand Up @@ -347,7 +348,7 @@ either Celsius or Kelvin units).
"R_pnd", ":math:`\bullet` parameter for Delta-Eddington pond albedo", ""
"R_S2N", "algal silicate to nitrate factor", "0.03 mole/mole"
"R_snw", ":math:`\bullet` parameter for Delta-Eddington snow albedo", ""
"r16_kind", "definition of quad precision", "selected_real_kind(26)", ""
"r16_kind", "definition of quad precision", "selected_real_kind(33,4931)", ""
"Rac_rapid_mode", ":math:`\bullet` critical Rayleigh number", "10"
"rdg_conv", "convergence for ridging", "1/s"
"rdg_shear", "shear for ridging", "1/s"
Expand Down
5 changes: 0 additions & 5 deletions doc/source/user_guide/ug_case_settings.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,7 @@ to support the CICE model.
"TRDON", "0,1", "number of dissolved organic nitrogen", "0"
"TRFEP", "0,1,2", "number of particulate iron tracers", "0"
"TRFED", "0,1,2", "number of dissolved iron tracers", "0"
"CAM_ICE", " ", "unused", "no"
"DITTO", " ", "unused", "no"
"BARRIERS", " ", "unused", "no"
"ICE_BLDDEBUG", "true,false", "turn on compile debug flags", "false"
"NUMIN", " ", "unused", "11"
"NUMAX", " ", "unused", "99"


.. _tabnamelist:
Expand Down

0 comments on commit ac6195d

Please sign in to comment.