Update modules for corip1

Test suite: Built B1850 with intel and cray
Test baseline:
Test namelist changes:
Test status: roundoff

Fixes: [CIME Github issue #]

User interface changes?:

Code review:

ChangeLog

@@ -1,16 +1,39 @@
 ======================================================================
 
-Originator: cacraigucar
-Date: June 30, 2016
+Originator: cacraigucar, fischer-ncar
+Date: July 7, 2016
 Tag: cime4.5.21
-Answer Changes: None
+Answer Changes: Possible answer changes only on corip1
 Tests: Ran with CAM tag geotrace3_cac_n59_cam5_4_57
 Dependencies: None
 
 Brief Summary:
    Incorporating water isotopes
+   Update modules for corip1
 
 User interface changes: none
+
+Modified files: git diff --name-status
+M       ChangeLog
+M       cime_config/cesm/allactive/config_compsets.xml
+M       cime_config/cesm/allactive/config_pes.xml
+M       cime_config/cesm/allactive/testlist_allactive.xml
+M       cime_config/cesm/machines/config_machines.xml
+M       driver_cpl/bld/build-namelist
+M       driver_cpl/bld/namelist_files/namelist_definition_drv.xml
+M       driver_cpl/cime_config/config_component.xml
+A       driver_cpl/driver/mrg_mod.F90
+M       driver_cpl/driver/prep_ice_mod.F90
+M       driver_cpl/driver/prep_ocn_mod.F90
+M       driver_cpl/driver/prep_rof_mod.F90
+M       driver_cpl/driver/seq_diag_mct.F90
+M       driver_cpl/driver/seq_flux_mct.F90
+M       driver_cpl/shr/seq_flds_mod.F90
+M       share/csm_share/shr/shr_const_mod.F90
+M       share/csm_share/shr/shr_flux_mod.F90
+A       share/csm_share/shr/water_isotopes.F90
+A       share/csm_share/shr/water_types.F90
+
 ======================================================================
 
 Originator: fischer-ncar, Brain Kauffman 

cime_config/cesm/machines/config_machines.xml

@@ -601,7 +601,7 @@
 
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
-	<command name="switch">intel intel/16.0.2.181</command>
+	<command name="switch">intel intel/16.0.3.210</command>
 	<command name="rm">cray-libsci</command>
 	<command name="use">/global/project/projectdirs/ccsm1/modulefiles/cori</command>
       </modules>
@@ -614,30 +614,30 @@
 
       <modules compiler="cray">
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.4.0</command>
+	<command name="switch">cce cce/8.5.0</command>
       </modules>
       <modules compiler="gnu">
 	<command name="load">PrgEnv-gnu</command>
 	<command name="switch">gcc gcc/5.1.0</command>
       </modules>
       <modules>
-	<command name="load">papi/5.4.1.2</command>
-	<command name="swap">craype craype/2.4.2</command>
+	<command name="load">papi/5.4.3.2</command>
+	<command name="swap">craype craype/2.5.5</command>
       </modules>
       <modules compiler="!intel">
-	<command name="switch">cray-libsci/13.2.0</command>
+	<command name="switch">cray-libsci/16.06.1</command>
       </modules>
       <modules>
-	<command name="load">cray-mpich/7.2.5</command>
+	<command name="load">cray-mpich/7.4.0</command>
       </modules>
       <modules mpilib="mpi-serial">
-	<command name="load">cray-hdf5/1.8.14</command>
-	<command name="load">cray-netcdf/4.3.3.1</command>
+	<command name="load">cray-hdf5/1.8.16</command>
+	<command name="load">cray-netcdf/4.4.0</command>
       </modules>
       <modules mpilib="!mpi-serial">
-	<command name="load">cray-netcdf-hdf5parallel/4.3.3.1</command>
-	<command name="load">cray-hdf5-parallel/1.8.14</command>
-	<command name="load">cray-parallel-netcdf/1.6.1</command>
+	<command name="load">cray-netcdf-hdf5parallel/4.4.0</command>
+	<command name="load">cray-hdf5-parallel/1.8.16</command>
+	<command name="load">cray-parallel-netcdf/1.7.0</command>
       </modules>
       <modules>
 	<command name="load">cmake/3.3.2</command>