Cleaning up in preparation for release.

M       source/ice_itd.F90
 - remove asymptotic and wmo6a ITD options

M       source/ice_ocean.F90
M       source/ice_history_drag.F90
M       source/ice_step_mod.F90
M       source/ice_flux.F90
M       source/ice_atmo.F90
 - rename diagnostic Cdn_atm_ocn to Cdn_atm_ratio

M       source/ice_read_write.F90
 - change 'min and max' to 'min, max, sum' in diagnostic output

M       doc/cicedoc.pdf
 - update documentation

D       README_v5.0
A  +    README_v5.1
 - update dates and web links for release

M       drivers/cice/CICE_RunMod.F90_debug
 - sync with CICE_RunMod.F90_debug

M       ice.log.Linux.LANL.conejo
D       ice.log.Linux.ORNL.lens
D       ice.log.Linux.ORNL.titan
D       ice.log.Linux.SIO.uhu
 - update diagnostic output

M       comp_ice
 - change v5.0 to v5.1

Author: eclare108213

README_v5.0 README_v5.1README_v5.0 renamed to README_v5.1

@@ -1,7 +1,7 @@
-CICE version 5.0
-  September 2013
+CICE version 5.1
+  March 2015
 
-This directory contains files needed to run version 5.0 of CICE, the LANL sea 
+This directory contains files needed to run version 5.1 of CICE, the LANL sea 
 ice model, in standalone mode on a 3 degree grid.  As currently configured, the 
 model runs on 4 processors.  MPI is used for message passing between processors, 
 and OpenMP threading is available.  The grid provided here is too small for the 
@@ -10,8 +10,8 @@ without forcing data.  If you want to run on a single processor without using MP
 edit comp_ice.
 
 For additional information, please consult the CICE documentation 'cicedoc.pdf', 
-found at http://climate.lanl.gov/Models/CICE/ or in the code distribution, in the 
-directory doc/.  This README file contains introductory material only.  
+found at http://oceans11.lanl.gov/trac/CICE/wiki or in the code distribution, in
+the directory doc/.  This README file contains introductory material only.  
 
 --- To compile and run the model ---
 
@@ -41,7 +41,7 @@ When restart files are written, the filename is written into the file
 --- Forcing data ---
 
 The code is currently configured to run in standalone mode on a 3 degree grid using 
-atmospheric data from 1997, available from http://climate.lanl.gov/Models/CICE/.  
+atmospheric data from 1997, available from http://oceans11.lanl.gov/trac/CICE/wiki.
 These data files are designed only for testing the code, not for use in production 
 runs or as observational data.  Please do not publish results based on these data
 sets.  Module source/ice_forcing.F90 can be modified to change the forcing data. 

comp_ice

@@ -7,7 +7,7 @@ setenv SITE LANL.conejo   # also works for mustang
 #setenv SITE LANL.bigsuze
 
 ### SYSTEM_USERDIR is predefined on ORNL machines
-setenv SYSTEM_USERDIR /scratch/eclare/CICE.v5.0  # conejo
+setenv SYSTEM_USERDIR /scratch/eclare/CICE.v5.1  # conejo
 #setenv SYSTEM_USERDIR /Users/akt/Work/MPAS-CICE/Column_Package/cice_package/run_dirs
 
 ### Grid resolution
@@ -76,7 +76,7 @@ setenv NUMIN 11           # minimum file unit number
 setenv NUMAX 99           # maximum file unit number
 
 ### Set SRCDIR and EXEDIR to your own paths!
-setenv SRCDIR /usr/projects/climate/eclare/CICE.v5.0/cice  # conejo
+setenv SRCDIR /usr/projects/climate/eclare/CICE.v5.1/cice  # conejo
 #setenv SRCDIR /Users/akt/Work/MPAS-CICE/Column_Package/cice_package/cice
 
 setenv EXEDIR $SYSTEM_USERDIR/rundir

doc/cicedoc.pdf

@@ -52,11 +52,13 @@
 
       call ice_timer_start(timer_step)   ! start timing entire run
 
+#ifndef CICE_IN_NEMO
    !--------------------------------------------------------------------
    ! timestep loop
    !--------------------------------------------------------------------
 
       timeLoop: do
+#endif
 
          call ice_step
 
@@ -66,7 +68,9 @@
 
          call calendar(time)    ! at the end of the timestep
 
+#ifndef CICE_IN_NEMO
          if (stop_now >= 1) exit timeLoop
+#endif
 
 #ifndef coupled
          call ice_timer_start(timer_couple)  ! atm/ocn coupling
@@ -81,7 +85,9 @@
          call init_flux_atm     ! initialize atmosphere fluxes sent to coupler
          call init_flux_ocn     ! initialize ocean fluxes sent to coupler
 
+#ifndef CICE_IN_NEMO
       enddo timeLoop
+#endif
 
    !--------------------------------------------------------------------
    ! end of timestep loop
@@ -300,7 +306,7 @@
       use ice_constants, only: c0, c1, puny, rhofresh
       use ice_domain_size, only: ncat
       use ice_flux, only: alvdf, alidf, alvdr, alidr, albice, albsno, &
-          albpnd, albcnt, apeff_ai, coszen, fpond, fresh, &
+          albpnd, albcnt, apeff_ai, coszen, fpond, fresh, l_mpond_fresh, &
           alvdf_ai, alidf_ai, alvdr_ai, alidr_ai, fhocn_ai, &
           fresh_ai, fsalt_ai, fsalt, &
           fswthru_ai, fhocn, fswthru, scale_factor, &
@@ -402,8 +408,10 @@
       ! reduce fresh by fpond for coupling
       !-----------------------------------------------------------------
 
-            fpond(i,j,iblk) = fpond(i,j,iblk) * rhofresh/dt
-            fresh(i,j,iblk) = fresh(i,j,iblk) - fpond(i,j,iblk)
+            if (l_mpond_fresh) then
+               fpond(i,j,iblk) = fpond(i,j,iblk) * rhofresh/dt
+               fresh(i,j,iblk) = fresh(i,j,iblk) - fpond(i,j,iblk)
+            endif
 
       !----------------------------------------------------------------
       ! Store grid box mean albedos and fluxes before scaling by aice