Skip to content
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

Jump to bottom

Gadi transition #44

Merged
merged 8 commits into from
Feb 17, 2020
Merged

Gadi transition #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b37ea14
Updated modules for gadi
aidanheerdegen Dec 1, 2019
c4cca23
Document reproducibility flags
penguian Dec 20, 2019
d3e8bdf
revert https://github.com/COSIMA/cice5/commit/ab473434 to investigate…
aekiss Dec 20, 2019
a49e30f
Compile setting changes to build on Gadi.
nichannah Jan 10, 2020
bbda368
Correct comment
penguian Jan 13, 2020
5ec8ff8
Merge pull request #43 from COSIMA/use-repro-flags-for-gadi
aekiss Jan 13, 2020
365bdc1
Use OpenMPI/4.0.2 - https://github.com/COSIMA/access-om2/issues/157
aekiss Jan 16, 2020
5f85e70
Merge fixes
nichannah Feb 17, 2020
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
14 changes: 8 additions & 6 deletions bld/Macros.nci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#==============================================================================
# Makefile macros for xe.nci.org.au, an SGI ALTIX system running Linux
# Note: Use the -mp flag if precision is critical. It slows down the
# code by 25% (or more).
# Makefile macros for gadi.nci.org.au
#==============================================================================

INCLDIR := -I.
Expand All @@ -16,11 +14,15 @@ CFLAGS := -c -O2
FIXEDFLAGS := -132
FREEFLAGS :=

NCI_INTEL_FLAGS := -r8 -i4 -traceback -w -fpe0 -ftz -convert big_endian -assume byterecl -check noarg_temp_created
NCI_REPRO_FLAGS := -fp-model precise -fp-model source -align all
ifeq ($(DEBUG), 1)
FFLAGS := -r8 -i4 -O0 -traceback -g -debug all -check all -no-vec -align all -w -fpe0 -ftz -convert big_endian -assume byterecl -assume nobuffered_io -check noarg_temp_created
CPPDEFS := $(CPPDEFS) -DDEBUG=$(DEBUG)
NCI_DEBUG_FLAGS := -g3 -O0 -debug all -check all -no-vec -assume nobuffered_io
FFLAGS := $(NCI_INTEL_FLAGS) $(NCI_REPRO_FLAGS) $(NCI_DEBUG_FLAGS)
CPPDEFS := $(CPPDEFS) -DDEBUG=$(DEBUG)
else
FFLAGS := -r8 -i4 -O2 -traceback -g -align all -xHost -fpe0 -w -ftz -convert big_endian -assume byterecl -assume buffered_io -check noarg_temp_created
NCI_OPTIM_FLAGS := -g3 -O2 -axCORE-AVX2 -debug all -check none -qopt-report=5 -qopt-report-annotate -assume buffered_io
FFLAGS := $(NCI_INTEL_FLAGS) $(NCI_REPRO_FLAGS) $(NCI_OPTIM_FLAGS)
endif

MOD_SUFFIX := mod
Expand Down
8 changes: 3 additions & 5 deletions bld/config.nci.auscom.1440x1080
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ setenv BLCKY `expr $NYGLOB / 40` # y-dimension of blocks ( ghost cells

source /etc/profile.d/nf_csh_modules
module purge
module load intel-fc/17.0.1.132
module load intel-cc/17.0.1.132
module load netcdf/4.3.2
module load openmpi/1.10.2

module load intel-compiler/2019.5.281
module load netcdf/4.7.1
module load openmpi/4.0.2
7 changes: 3 additions & 4 deletions bld/config.nci.auscom.3600x2700
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ setenv BLCKY `expr $NYGLOB / 90` # y-dimension of blocks ( ghost cells

source /etc/profile.d/nf_csh_modules
module purge
module load intel-fc/17.0.1.132
module load intel-cc/17.0.1.132
module load netcdf/4.3.2
module load openmpi/1.10.2
module load intel-compiler/2019.5.281
module load netcdf/4.7.1
module load openmpi/4.0.2
9 changes: 4 additions & 5 deletions bld/config.nci.auscom.360x300
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ set NYGLOB = `echo $RES | sed s/.\*x//`
setenv BLCKX `expr $NXGLOB / 24` # x-dimension of blocks ( not including )
setenv BLCKY `expr $NYGLOB / 1` # y-dimension of blocks ( ghost cells )

source /etc/profile.d/nf_csh_modules
source /etc/profile.d/modules.csh
module purge
module load intel-fc/17.0.1.132
module load intel-cc/17.0.1.132
module load netcdf/4.3.2
module load openmpi/1.10.2
module load intel-compiler/2019.5.281
module load netcdf/4.7.1
module load openmpi/4.0.2
2 changes: 1 addition & 1 deletion drivers/auscom/CICE_InitMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ subroutine cice_init(accessom2)
call accessom2%sync_config(coupler)

! Use accessom2 configuration
call input_data(accessom2%get_cur_exp_date_array(), &
call input_data(accessom2%get_forcing_start_date_array(), &
accessom2%get_seconds_since_cur_exp_year(), &
accessom2%get_total_runtime_in_seconds(), &
accessom2%get_ice_ocean_timestep(), &
Expand Down