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

New NCAR hobart changes #210

Merged
merged 2 commits into from
Aug 1, 2018
Merged

New NCAR hobart changes #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abe929b
New NCAR hobart changes
dabail10 Jul 24, 2018
5e0bc40
Add back in dynamics_nml
dabail10 Aug 1, 2018
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
81 changes: 40 additions & 41 deletions configuration/scripts/icepack_in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@
phi_i_mushy = 0.85
/

&dynamics_nml
kstrength = 1
krdg_partic = 1
krdg_redist = 1
mu_rdg = 3
Cf = 17.
/

&shortwave_nml
shortwave = 'dEdd'
albedo_type = 'ccsm3'
Expand Down Expand Up @@ -76,6 +68,46 @@
pndaspect = 0.8
/

&forcing_nml
formdrag = .false.
atmbndy = 'default'
calc_strair = .true.
calc_Tsfc = .true.
highfreq = .false.
natmiter = 5
ustar_min = 0.0005
fbot_xfer_type = 'constant'
update_ocn_f = .false.
l_mpond_fresh = .false.
tfrz_option = 'mushy'
oceanmixed_ice = .true.
restore_ocn = .false.
trestore = 90
precip_units = 'mks'
default_season = 'spring'
atm_data_type = 'clim'
ocn_data_type = 'SHEBA'
bgc_data_type = 'default'
fyear_init = 2015
ycycle = 1
data_dir = '/Users/ftuser/Desktop/CICE-Consortium/ICEPACK_DATA/'
atm_data_file = 'unknown_atm_data_file'
ocn_data_file = 'unknown_ocn_data_file'
bgc_data_file = 'unknown_bgc_data_file'
ice_data_file = 'open_clos_lindsay.dat'
atm_data_format = 'bin'
ocn_data_format = 'bin'
bgc_data_format = 'bin'
/

&dynamics_nml
kstrength = 1
krdg_partic = 1
krdg_redist = 1
mu_rdg = 3
Cf = 17.
/

&zbgc_nml
tr_brine = .false.
tr_zaero = .false.
Expand Down Expand Up @@ -221,36 +253,3 @@
ratio_C2N_proteins = 7.0
/

&forcing_nml
formdrag = .false.
atmbndy = 'default'
calc_strair = .true.
calc_Tsfc = .true.
highfreq = .false.
natmiter = 5
ustar_min = 0.0005
fbot_xfer_type = 'constant'
update_ocn_f = .false.
l_mpond_fresh = .false.
tfrz_option = 'mushy'
oceanmixed_ice = .true.
restore_ocn = .false.
trestore = 90
precip_units = 'mks'
default_season = 'spring'
atm_data_type = 'clim'
ocn_data_type = 'SHEBA'
bgc_data_type = 'default'
fyear_init = 2015
ycycle = 1
data_dir = '/Users/ftuser/Desktop/CICE-Consortium/ICEPACK_DATA/'
atm_data_file = 'unknown_atm_data_file'
ocn_data_file = 'unknown_ocn_data_file'
bgc_data_file = 'unknown_bgc_data_file'
ice_data_file = 'open_clos_lindsay.dat'
atm_data_format = 'bin'
ocn_data_format = 'bin'
bgc_data_format = 'bin'
/


2 changes: 0 additions & 2 deletions configuration/scripts/machines/Macros.hobart_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ else
LD := ifort
endif

SLIBS := -Wl,-rpath,/usr/local/intel-cluster-15.0.2.164/composer_xe_2015.2.164/compiler/lib/intel64 -lifcore

ifeq ($(DITTO), yes)
CPPDEFS := $(CPPDEFS) -DREPRODUCIBLE
endif
4 changes: 1 addition & 3 deletions configuration/scripts/machines/Macros.hobart_nag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ else
LD := nagfor
endif

LIB_NETCDF := $(NETCDF_PATH)/lib

SLIBS := -L/usr/local/nag-6.2/lib/NAG_Fortran
SLIBS := -L$(COMPILER_PATH)/lib/NAG_Fortran

ifeq ($(DITTO), yes)
CPPDEFS := $(CPPDEFS) -DREPRODUCIBLE
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.hobart_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source /usr/share/Modules/init/csh

module load compiler/intel/default
module load compiler/intel/18.0.3

setenv ICE_MACHINE_ENVNAME hobart
setenv ICE_MACHINE_COMPILER nag
Expand Down
1 change: 0 additions & 1 deletion configuration/scripts/machines/env.hobart_nag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
source /usr/share/Modules/init/csh

module load compiler/nag/6.2
module load mpi/nag/mvapich2-2.2rc1

setenv ICE_MACHINE_ENVNAME hobart
setenv ICE_MACHINE_COMPILER nag
Expand Down