Skip to content

Allow debug mode in coupled app #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeniseWorthen merged 1 commit into from
Jan 16, 2020
Merged

Allow debug mode in coupled app #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions lanl_cice/bld/Macros.Linux.NEMS.cheyenne
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,24 @@
# For use with intel compiler with MPT
#==============================================================================

DEBUG =

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL -DCICE_NEMS
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
FREEFLAGS := -FR
#FFLAGS := -g -O0 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost -I$(NETCDF)/include
FFLAGS := -O2 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost -I$(NETCDF)/include
FFLAGS_DEBUG := -g -O0 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -link_mpi=dbg -xHost -I$(NETCDF)/include
FFLAGS_OPT := -O2 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost -I$(NETCDF)/include
FFLAGS_NOOPT:= -O0

ifdef DEBUG
FFLAGS += $(FFLAGS_DEBUG)
else
FFLAGS += $(FFLAGS_OPT)
endif

ifeq ($(COMMDIR), mpi)
FC := mpif90 -f90=ifort
else
Expand Down
12 changes: 10 additions & 2 deletions lanl_cice/bld/Macros.Linux.NEMS.hera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
# For use with intel compiler with IntelMPI
#==============================================================================

DEBUG=

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL -DCICE_NEMS
CFLAGS := -c -O2 -fp-model precise -xHost

FIXEDFLAGS := -132
FREEFLAGS := -FR
#FFLAGS := -g -O0 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost -I$(NETCDF)/include
FFLAGS := -O2 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost -I$(NETCDF)/include
FFLAGS_DEBUG := -g -O0 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -link_mpi=dbg -xHost -I$(NETCDF)/include
FFLAGS_OPT := -O2 -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -xHost -I$(NETCDF)/include
FFLAGS_NOOPT:= -O0

ifeq ($(COMMDIR), mpi)
Expand All @@ -20,6 +22,12 @@ else
FC := ifort
endif

ifdef DEBUG
FFLAGS += $(FFLAGS_DEBUG)
else
FFLAGS += $(FFLAGS_OPT)
endif

MPICC:= mpiicc

MPIFC:= mpiifort
Expand Down
4 changes: 2 additions & 2 deletions lanl_cice/source/ice_therm_itd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@ subroutine linear_itd (nx_block, ny_block, &
j = indxj(ij)

if (hicen_init(ij,n) > puny .and. &
hicen_init(ij,n+1) > puny) then
hicen_init(ij,n+1) > puny .and. &
hicen_init(ij,n+1) - hicen_init(ij,n) > puny) then
! interpolate between adjacent category growth rates
slope = (dhicen(ij,n+1) - dhicen(ij,n)) / &
(hicen_init(ij,n+1) - hicen_init(ij,n))
Expand Down Expand Up @@ -677,7 +678,6 @@ subroutine linear_itd (nx_block, ny_block, &
l_stop, &
istop, jstop)


! maintain qsno negative definiteness
do n = 1, ncat
do k = nt_qsno, nt_qsno+nslyr-1
Expand Down
2 changes: 2 additions & 0 deletions lanl_cice_cap/cice_cap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,7 @@ subroutine ModelAdvance_slow(gcomp, rc)
j1 = j - jlo + 1
#ifdef CMEPS
rhoa (i,j,iblk) = dataPtr_rhoabot(i1,j1) ! import directly from mediator
if(dataPtr_pbot(i1,j1) .gt. 0.0) &
potT (i,j,iblk) = dataPtr_Tbot (i1,j1) * (100000./dataPtr_pbot(i1,j1))**0.286 ! Potential temperature (K)
Tair (i,j,iblk) = dataPtr_Tbot (i1,j1) ! near surface temp, maybe lowest level (K)
Qa (i,j,iblk) = dataPtr_qbot (i1,j1) ! near surface humidity, maybe lowest level (kg/kg)
Expand All @@ -1096,6 +1097,7 @@ subroutine ModelAdvance_slow(gcomp, rc)
ss_tlty(i,j,iblk) = dataPtr_sssm (i1,j1)
#else
rhoa (i,j,iblk) = dataPtr_rhoabot(i1,j1,iblk) ! import directly from mediator
if(dataPtr_pbot(i1,j1,iblk) .gt. 0.0) &
potT (i,j,iblk) = dataPtr_Tbot (i1,j1,iblk) * (100000./dataPtr_pbot(i1,j1,iblk))**0.286 ! Potential temperature (K)
Tair (i,j,iblk) = dataPtr_Tbot (i1,j1,iblk) ! near surface temp, maybe lowest level (K)
Qa (i,j,iblk) = dataPtr_qbot (i1,j1,iblk) ! near surface humidity, maybe lowest level (kg/kg)
Expand Down