machines: fix Macros file for cheyenne and testmachine

These two files used outdated environment variables for
threading ("compile_threaded") and PIO ("IO_TYPE").

Replace these with the correct variables, ICE_THREADED and
ICE_IOTYPE.

Mirrors CICE-Consortium/CICE#396

configuration/scripts/machines/Macros.cheyenne_intel

@@ -39,14 +39,14 @@ LIB_MPI := $(IMPILIBDIR)
 #SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
 SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
 
-ifeq ($(compile_threaded), true) 
+ifeq ($(ICE_THREADED), true) 
    LDFLAGS += -qopenmp 
    CFLAGS += -qopenmp 
    FFLAGS += -qopenmp 
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
-ifeq ($(IO_TYPE), pio)
+ifeq ($(ICE_IOTYPE), pio)
    PIO_PATH:=/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib
    INCLDIR += -I/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/include
    SLIBS   := $(SLIBS) -L$(PIO_PATH) -lpiof

configuration/scripts/machines/Macros.testmachine_intel

@@ -38,14 +38,14 @@ LIB_MPI := $(IMPILIBDIR)
 
 SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl
 
-ifeq ($(compile_threaded), true) 
+ifeq ($(ICE_THREADED), true) 
    LDFLAGS += -openmp 
    CFLAGS += -openmp 
    FFLAGS += -openmp 
 endif
 
 ### if using parallel I/O, load all 3 libraries.  PIO must be first!
-ifeq ($(IO_TYPE), pio)
+ifeq ($(ICE_IOTYPE), pio)
    PIO_PATH:=/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib
    INCLDIR += -I/glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/include
    SLIBS   := $(SLIBS) -L$(PIO_PATH) -lpiof