M serial/ice_boundary.F90

 - added missing ice_HaloUpdate_stress routine

A       ice.log.Linux.LANL.conejo
 - sample output

M       source/ice_therm_itd.F90
 - bug fix to prevent aerosol divide by zero

M       bld/Macros.Linux.LANL.conejo
M       bld/Macros.Linux.NCAR.yellowstone
M       bld/Macros.Darwin.CPOM.mi2
M       bld/Macros.Darwin.LANL.bigsuze
M       bld/Macros.Linux.ORNL.jaguar
M       bld/Macros.Linux.Ubuntu
M       comp_ice
 - changed preprocessing directive NETCDF to IO_TYPE

D       bld/Macros.Linux.LANL.mustang
D       input_templates/run_ice.Linux.LANL.mustang
 - same as conejo

M       doc/cicedoc.pdf
 - the latest-n-greatest

M       input_templates/gx1/iced_gx1_v5.nc
 - restart file after 20-year spinup from no ice

M       drivers/cice/CICE_RunMod.F90_debug
 - updated with changes to CICE_RunMod.F90

D       bld/Macros.Linux.NCAR.bangkok
D       bld/Macros.AIX.NAVO.kraken
D       bld/Macros.AIX.NCAR.bluevista
D       bld/Macros.Linux.LLNL.atlas
D       input_templates/run_ice.AIX.NAVO.kraken
D       input_templates/run_ice.AIX.NCAR.bluevista
D       input_templates/run_ice.Linux.LLNL.atlas
 - obsolete

bld/Macros.Darwin.CPOM.mi2

@@ -39,16 +39,14 @@ ifeq ($(DITTO), yes)
    CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
 endif
 
-ifeq ($(NETCDF), yes)
+ifeq ($(IO_TYPE), netcdf)
    CPPDEFS :=  $(CPPDEFS) -Dncdf
    INCLDIR := -I/opt/netcdf/include/ $(INCLDIR) 
    SLIBS   := /opt/netcdf/lib/libnetcdf.a -lcurl $(SLIBS)
 #   INCLDIR := $(INCLDIR) -I/usr/projects/climate/bzhao/netcdf-3.6.1/include
 #   SLIBS   := $(SLIBS) -L/usr/projects/climate/bzhao/netcdf-3.6.1/lib -lnetcdf
 endif
 
-#ifeq ($(USE_ESMF), yes)
-#   CPPDEFS :=  $(CPPDEFS) -Duse_esmf
-#   INCLDIR :=  $(INCLDIR) -I /net/bob1/ESMF/esmf/mod/modO/Linux.intel.64.mauve
-#   SLIBS   :=  $(SLIBS) -L /net/bob1/ESMF/esmf/lib/libO/Linux.intel.64.mauve -lesmf -lcprts -lrt -ldl
-#endif
+### note this file does not include PIO capability
+### see Macros.Linux.LANL.conejo
+

bld/Macros.Darwin.LANL.bigsuze

@@ -39,14 +39,14 @@ ifeq ($(DITTO), yes)
    CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
 endif
 
-ifeq ($(NETCDF), yes)
+ifeq ($(IO_TYPE), netcdf)
    CPPDEFS :=  $(CPPDEFS) -Dncdf
    INCLDIR := $(INCLDIR) -I/Users/akt/Work/libraries/netcdf/netcdf/include
    SLIBS   := $(SLIBS) -L/Users/akt/Work/libraries/netcdf/netcdf/lib -lnetcdff
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
-ifeq ($(NETCDF), pio)
+ifeq ($(IO_TYPE), pio)
    INCLDIR := $(INCLDIR) -I/usr/projects/climate/SHARED_CLIMATE/software/conejo/intel_openmpi/pio-1.4.0
    SLIBS   := $(SLIBS) -L/usr/projects/climate/SHARED_CLIMATE/software/conejo/intel_openmpi/pio-1.4.0 -lpio
 

bld/Macros.Linux.LANL.conejo

@@ -42,18 +42,16 @@ ifeq ($(DITTO), yes)
    CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
 endif
 
-ifeq ($(NETCDF), yes)
+ifeq ($(IO_TYPE), netcdf)
    CPPDEFS :=  $(CPPDEFS) -Dncdf
+#   INCLDIR := $(INCLDIR) $(NETCDF)/include
+#   SLIBS   := $(SLIBS) $(NETCDF)/lib -lnetcdf
    INCLDIR := $(INCLDIR) -I/usr/projects/climate/SHARED_CLIMATE/software/conejo/intel_openmpi/netcdf-3.6.3/include
    SLIBS   := $(SLIBS) -L/usr/projects/climate/SHARED_CLIMATE/software/conejo/intel_openmpi/netcdf-3.6.3/lib -lnetcdf
-#   INCLDIR := $(INCLDIR) -I/usr/projects/cesm/software/netcdf/intel/include
-#   SLIBS   := $(SLIBS) -L/usr/projects/cesm/software/netcdf/intel/lib -lnetcdf
-#   INCLDIR := $(INCLDIR) -I/usr/projects/climate/maltrud/local/include_coyote
-#   SLIBS   := $(SLIBS) -L/usr/projects/climate/maltrud/local/lib_coyote -lnetcdf
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
-ifeq ($(NETCDF), pio)
+ifeq ($(IO_TYPE), pio)
    INCLDIR := $(INCLDIR) -I/usr/projects/climate/SHARED_CLIMATE/software/conejo/intel_openmpi/pio-1.4.0
    SLIBS   := $(SLIBS) -L/usr/projects/climate/SHARED_CLIMATE/software/conejo/intel_openmpi/pio-1.4.0 -lpio
 

bld/Macros.Linux.NCAR.yellowstone

@@ -64,7 +64,7 @@ ifeq ($(DITTO), yes)
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
-ifeq ($(IO_METHOD), pio)
+ifeq ($(IO_TYPE), pio)
    PIO_PATH:=/glade/u/home/jedwards/pio1_6_5/pio
    INCLDIR += -I$(PIO_PATH)
    SLIBS   := $(SLIBS) -L$(PIO_PATH) -lpio

bld/Macros.Linux.ORNL.jaguar

@@ -32,15 +32,9 @@ ifeq ($(DITTO), yes)
    CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
 endif
 
-ifeq ($(NETCDF), yes)
+ifeq ($(IO_TYPE), netcdf)
    CPPDEFS := $(CPPDEFS) -Dncdf
    INCLDIR := $(INCLDIR) -I/apps/netcdf/prod/jaguar/include 
    SLIBS   := $(SLIBS) -L/apps/netcdf/prod/jaguar/lib -lnetcdf 
 endif
 
-ifeq ($(USE_ESMF), yes)
-   CPPDEFS :=  $(CPPDEFS) -Duse_esmf
-   INCLDIR :=  $(INCLDIR) -I /net/bob1/ESMF/esmf/mod/modO/Linux.intel.64.mauve
-   SLIBS   :=  $(SLIBS) -L /net/bob1/ESMF/esmf/lib/libO/Linux.intel.64.mauve -lesmf -lcprts -lrt -ldl
-endif
-

bld/Macros.Linux.Ubuntu

@@ -31,16 +31,11 @@ ifeq ($(DITTO), yes)
    CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
 endif
 
-ifeq ($(NETCDF), yes)
+ifeq ($(IO_TYPE), netcdf)
    CPPDEFS :=  $(CPPDEFS) -Dncdf
    INCLDIR := $(INCLDIR) -I/usr/include
    SLIBS   := $(SLIBS) -lnetcdf -lnetcdff
 endif
 
-#ifeq ($(USE_ESMF), yes)
-# ESMF is currently not installed
-#   CPPDEFS :=  $(CPPDEFS) -Duse_esmf
-#   INCLDIR :=  $(INCLDIR) -I /.../ESMF/...
-#   SLIBS   :=  $(SLIBS) -L /.../ESMF/... -lesmf -lcprts -lrt -ldl
-#endif
-
+### note this file does not include PIO capability
+### see Macros.Linux.LANL.conejo

comp_ice

@@ -3,8 +3,7 @@
 ### Change these to your own site and user directory! 
 ### You will need to create a Makefile Macro in bld/ and a run_ice script 
 ### in input_templates/.
-setenv SITE LANL.conejo
-#setenv SITE LANL.mustang
+setenv SITE LANL.conejo   # also works for mustang
 #setenv SITE LANL.bigsuze
 
 ### SYSTEM_USERDIR is predefined on ORNL machines
@@ -64,7 +63,7 @@ setenv TRBGCS  0          # number of skeletal layer bgc tracers
 ### Specialty code
 setenv CAM_ICE  no        # set to yes for CAM runs (single column) 
 setenv SHRDIR   csm_share # location of CCSM shared code
-setenv NETCDF   yes       # set to no if netcdf library is unavailable
+setenv IO_TYPE  netcdf    # set to none if netcdf library is unavailable
                           # set to pio for parallel netcdf
 setenv DITTO    no        # reproducible diagnostics
 setenv THRD     no        # set to yes for OpenMP threading
@@ -122,9 +121,9 @@ else
 endif
 
 setenv DRVDIR cice
-if ($NETCDF == 'yes') then
+if ($IO_TYPE == 'netcdf') then
   setenv IODIR io_netcdf
-else if ($NETCDF == 'pio') then
+else if ($IO_TYPE == 'pio') then
   setenv IODIR io_pio
 else
   setenv IODIR io_binary