Merge pull request #210 from dabail10/hobart3

New NCAR hobart changes
CICE-Consortium · Aug 1, 2018 · fd52cb1 · fd52cb1
2 parents f747621 + 5e0bc40
commit fd52cb1
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 48 deletions.
diff --git a/configuration/scripts/icepack_in b/configuration/scripts/icepack_in
@@ -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'
@@ -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.
@@ -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'
-/
-
-
diff --git a/configuration/scripts/machines/Macros.hobart_intel b/configuration/scripts/machines/Macros.hobart_intel
@@ -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
diff --git a/configuration/scripts/machines/Macros.hobart_nag b/configuration/scripts/machines/Macros.hobart_nag
@@ -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

diff --git a/configuration/scripts/machines/env.hobart_intel b/configuration/scripts/machines/env.hobart_intel
@@ -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

diff --git a/configuration/scripts/machines/env.hobart_nag b/configuration/scripts/machines/env.hobart_nag
@@ -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