===============================================================
cice5_20150129
Originator: tcraig
Date: Jan 29, 2015
Version: 5.0
One-line Summary: Merge with RASM and LANL repos
- remove snowinfil option
- some new logic in ice_therm_vertical in "Compute h*q for new layers (k2) given overlap with old layers (k1)"
- fix restart bug in tr_pond_lvl code in run_dEdd.
- add new output fields uatm, vatm, fsensn_ai
- add tfrz namelist to be able to switch between different freezing temperature equations.
  add linear_salt and mushy_layer freezing equations to the default minus1point8 version.
- add support for year_init values of 1 (cice default is still zero, but CESM and RASM are going
  to move to 1 as the default).
- add missing coordinate attributes to history files for CF compliance
- add check and abort in neutral_drag_coeffs for hkeel<hdraft
- minor fix to dhlid default setting (changed from 0 to c0)
- modification in bl99 for Tsf setting
- update ar9 namelist defaults
- add io_flavor attribute to history files (io_pio, io_netcdf)

M       bld/build-namelist
M       bld/namelist_files/namelist_definition.xml
M       bld/namelist_files/namelist_defaults_cice.xml
M       src/io_netcdf/ice_history_write.F90
M       src/source/ice_init.F90
M       src/source/ice_itd.F90
M       src/source/ice_shortwave.F90
M       src/source/ice_ocean.F90
M       src/source/ice_meltpond_lvl.F90
M       src/source/ice_therm_vertical.F90
M       src/source/ice_step_mod.F90
M       src/source/ice_flux.F90
M       src/source/ice_therm_bl99.F90
M       src/source/ice_history_shared.F90
M       src/source/ice_atmo.F90
M       src/source/ice_history.F90
M       src/input_templates/gx1/ice_in
M       src/input_templates/gx3/ice_in
M       src/input_templates/run_ice.Linux.NCAR.yellowstone
M       src/input_templates/col/ice_in
M       src/io_pio/ice_history_write.F90
M       src/drivers/cesm/ice_comp_esmf.F90
M       src/drivers/cesm/ice_import_export.F90
M       src/drivers/cesm/ice_comp_mct.F90

===============================================================
cice5_20150128
Originator: jedwards
Date: Jan 28, 2015
Version: 5.0
One-line Summary:pio interface fix 

M       src/io_pio/ice_restart.F90

===============================================================
cice5_20150127
Originator: jedwards
Date: Jan 27, 2015
Version: 5.0
One-line Summary: pio interface cleanup

M            src/source/ice_grid.F90
M            src/io_pio/ice_restart.F90
M            src/io_pio/ice_pio.F90
M            src/io_pio/ice_history_write.F90
M            src/drivers/cesm/ice_comp_mct.F90

===============================================================
cice5_20150124
Originator: dbailey
Date: Jan 21, 2015
Version: 5.0
One-line Summary: iblk needs to be passed to ice_timers

In threaded regions, the call to ice_timer_start and ice_timer_stop
needs the block index iblk.

M       src/mpi/ice_timers.F90
M       src/source/ice_step_mod.F90
M       src/drivers/cesm/CICE_RunMod.F90

===============================================================
cice5_20150123
Originator: dbailey
Date: Jan 21, 2015
Version: 5.0
One-line Summary: Handling of initial files and MPI_WTIME fix.

M       bld/build-namelist
M       src/mpi/ice_timers.F90
M       src/io_pio/ice_restart.F90

===============================================================
cice5_20150122
Originator: dbailey
Date: Jan 20, 2015
Version: 5.0
One-line Summary: Handling of initial files and RASM default.

Back to original handling of CICE5 initial files. Looks for file
named cice5.r and if it cannot find one, uses cice.r file. Will
abort gracefully if this is CICE4 initial file format.

RASM needed the bubbly conduction instead of MU71.

M       bld/build-namelist
M       bld/namelist_files/namelist_defaults_cice.xml
M       src/io_pio/ice_restart.F90

===============================================================
cice5_20150121
Originator: dbailey
Date: Jan 20, 2015
Version: 5.0
One-line Summary: Need CICE4 conduction scheme.

conduct = 'MU71'

M       bld/namelist_files/namelist_defaults_cice.xml

===============================================================
cice5_20150120
Originator: dbailey
Date: Jan 20, 2015
Version: 5.0
One-line Summary: Workaround for Intel and namelist default fix.

M       bld/namelist_files/namelist_defaults_cice.xml
M       src/source/ice_grid.F90

===============================================================
cice5_20150113
Originator: dbailey
Date: Jan 13, 2015
Version: 5.0
One-line Summary: Various NAG fixes.

M       src/mpi/ice_exit.F90
M       src/source/ice_itd.F90
M       src/source/ice_brine.F90
M       src/source/ice_fileunits.F90

===============================================================
cice5_20150112
Originator: jedwards
Date: Jan 12, 2015
Version: 5.0
One-line Summary: Port to pio2.0

M   src/io_pio/ice_restart.F90
M   src/io_pio/ice_pio.F90
M   src/io_pio/ice_history_write.F90

===============================================================
cice5_20141210
Originator: dbailey
Date: Dec 10, 2014
Version: 5.0
One-line Summary: Use new CICE5 initial files.

M       src/mpi/ice_exit.F90
M       src/source/ice_itd.F90
M       src/source/ice_brine.F90
M       src/source/ice_fileunits.F90

===============================================================
cice5_20141210
Originator: dbailey
Date: Dec 10, 2014
Version: 5.0
One-line Summary: Use new CICE5 initial files.

M       bld/build-namelist

===============================================================
cice5_20141209
Originator: dbailey
Date: Dec 9, 2014
Version: 5.0
One-line Summary: Use new CICE5 initial files.

M       bld/build-namelist

===============================================================
cice5_20141208
Originator: dbailey
Date: Dec 8, 2014
Version: 5.0
One-line Summary: Workaround for out-of-bounds problem.

M       src/source/ice_itd.F90

===============================================================
cice5_20141204
Originator: dbailey
Date: Dec 4, 2014
Version: 5.0
One-line Summary: NAG compiler changes.

M       bld/build-namelist
M       src/source/ice_flux.F90
M       src/source/ice_therm_mushy.F90
M       src/source/ice_zbgc.F90
M       src/source/ice_fileunits.F90

===============================================================
cice5_20141203
Originator: dbailey
Date: Dec 3, 2014
Version: 5.0
One-line Summary: One more cam5 to cam4.

M       bld/namelist_files/namelist_definition.xml

===============================================================
cice5_20141105
Originator: dbailey
Date: Nov 5, 2014
Version: 5.0
One-line Summary: Add nicelyr, nsnwlyr, and tracers to configure.

These configure variables are set through CICE_CONFIG_OPTS in
env_build.xml. Also, a small typo where the sice history variable has "U"
netCDF attributes instead of the "T".

M       bld/configure
M       bld/config_files/definition.xml
M       src/source/ice_history.F90

===============================================================
cice5_20141104
Originator: tcraig
Date: Nov 4, 2014
Version: 5.0
One-line Summary: Merge in latest rasm changes, initialization of Cdn_atm

M       bld/namelist_files/namelist_defaults_cice.xml
M       src/source/ice_flux.F90
M       src/drivers/cesm/ice_import_export.F90
M       src/io_pio/ice_history_write.F90
===============================================================
cice5_20141103
Originator: dbailey
Date: Nov3, 2014
Version: 5.0
One-line Summary: Fix blkmask changes.

M       src/io_pio/ice_history_write.F90

===============================================================
cice5_27_cice5.0.4
Originator: dbailey
Date: Oct 31, 2014
Version: 5.0
One-line Summary: Change cam5 to cam4 for albedos.

M       bld/build-namelist
M       bld/namelist_files/namelist_defaults_cice.xml

===============================================================
cice5_26_cice5.0.4
Originator: dbailey
Date: Oct 31, 2014
Version: 5.0
One-line Summary: Fix 4D variables for PIO.

M       src/io_pio/ice_pio.F90
M       src/io_pio/ice_history_write.F90

===============================================================
cice5_25_cice5.0.4
Originator: tcraig
Date: Oct 22, 2014
Version: 5.0
One-line Summary: Merge LANL (r864) and RASM (r945) mods
  includes new namiter and f_blkmask namelist.

M       bld/build-namelist
M       bld/namelist_files/namelist_definition.xml
M       bld/namelist_files/namelist_defaults_cice.xml
M       src/io_netcdf/ice_history_write.F90
M       src/source/ice_init.F90
M       src/source/ice_itd.F90
M       src/source/ice_transport_remap.F90
M       src/source/ice_shortwave.F90
M       src/source/ice_fileunits.F90
M       src/source/ice_therm_itd.F90
M       src/source/ice_grid.F90
M       src/source/ice_read_write.F90
M       src/source/ice_history_shared.F90
M       src/source/ice_atmo.F90
M       src/source/ice_history.F90
M       src/bld/Macros.Linux.LANL.conejo
M       src/input_templates/gx1/ice_in
M       src/input_templates/gx3/ice_in
M       src/input_templates/col/ice_in
M       src/io_pio/ice_history_write.F90
M       src/drivers/cesm/ice_import_export.F90
===============================================================
cice5_24_cice5.0.4
Originator: tcraig
Date: Sep 30, 2014
Version: 5.0
One-line Summary: Update ar9 namelist, reduce RASM_MODS cpps,
  add regional grid_type option

M       bld/namelist_files/namelist_defaults_cice.xml
M       src/source/ice_init.F90
M       src/source/ice_grid.F90
M       src/drivers/cesm/ice_import_export.F90
M       src/drivers/cesm/ice_cpl_indices.F90
===============================================================
cice5_23_cice5.0.4
Originator: tcraig
Date: Sep 28, 2014
Version: 5.0
One-line Summary: Merge lanl r839 trunk mods 

M       src/source/ice_init.F90
M       src/source/ice_mechred.F90
M       src/source/ice_therm_vertical.F90
M       src/source/ice_therm_bl99.F90

===============================================================
cice5_22_cice5.0.4
Originator: tcraig
Date: Sep 28, 2014
Version: 5.0
One-line Summary: fix branching and refcase stuff, fix minor
  DEBUG failures

M       bld/cice.buildnml.csh
M       bld/build-namelist
M       src/source/ice_init.F90
M       src/source/ice_step_mod.F90
M       src/source/ice_flux.F90
M       src/source/ice_therm_itd.F90
M       src/drivers/cesm/ice_comp_esmf.F90
M       src/drivers/cesm/ice_comp_mct.F90

===============================================================
cice5_21_cice5.0.4
Originator: tcraig
Date: Sep 22, 2014
Version: 5.0
One-line Summary: Add esmf layer, force ice_ic to 'none' for
  hybrid startups from reference conditions

M       bld/build-namelist
A       src/drivers/cesm/ice_comp_esmf.F90
M       src/drivers/cesm/ice_comp_mct.F90

===============================================================
cice5_20_cice5.0.4
Originator: tcraig
Date: Sep 11, 2014
Version: 5.0
One-line Summary: Merge LANL trunk r835 changes
 Identical to lanl cesm branch r836 and nps cice5_15_cesm1_1_rasm27

M       src/mpi/ice_global_reductions.F90
M       src/source/ice_init.F90
M       src/source/ice_shortwave.F90
M       src/source/ice_step_mod.F90
M       src/doc/cicedoc.pdf
A       src/doc/PDF/CMHB_IJHPCA2014.pdf
M       src/input_templates/gx1/ice_in
M       src/input_templates/gx3/ice_in
M       src/input_templates/col/ice_in
M       src/comp_ice
===============================================================
cice5_19_cice5.0.4
Originator: tcraig
Date: Sep 11, 2014
Version: 5.0
One-line Summary: Fix tripole exact restart, add asum diagnostic

M       bld/build-namelist
M       bld/namelist_files/namelist_definition.xml
M       bld/namelist_files/namelist_defaults_cice.xml
M       src/mpi/ice_boundary.F90
M       src/source/ice_dyn_evp.F90
M       src/source/ice_read_write.F90
M       src/source/ice_history_shared.F90
M       src/source/ice_restart_driver.F90
M       src/io_pio/ice_restart.F90

===============================================================
cice5_18_cice5.0.4
Originator: dbailey
Date: Sep 5, 2014
Version: 5.0
One-line Summary: Fix uninitialized array mraftn.

M       src/source/ice_mechred.F90

===============================================================
cice5_17_cice5.0.4
Originator: tcraig
Date: Sept 4, 2014
Version: 5.0
One-line Summary: fix eap threading, bfb global sum
- identical to rasm cice5_13_cesm1_1_rasm27

M       src/source/ice_dyn_eap.F90
M       src/mpi/ice_global_reductions.F90

===============================================================
cice5_16_cice5.0.4
Originator: tcraig
Date: Sept 4, 2014
Version: 5.0
One-line Summary: merge rasm mods to branch, fix threading, tested
- identical to rasm cice5_12_cesm1_1_rasm27

M       bld/configure
M       bld/build-namelist
M       bld/namelist_files/namelist_definition.xml
M       bld/namelist_files/namelist_defaults_cice.xml
M       src/io_netcdf/ice_history_write.F90
M       src/source/ice_init.F90
M       src/source/ice_shortwave.F90
M       src/source/ice_history_drag.F90
M       src/source/ice_step_mod.F90
M       src/source/ice_flux.F90
M       src/source/ice_atmo.F90
M       src/drivers/cesm/ice_import_export.F90
M       src/drivers/cesm/ice_constants.F90
M       src/io_pio/ice_history_write.F90

===============================================================
cice5_15_cice5.0.4
Originator: tcraig
Date: Aug 27, 2014
Version: 5.0
One-line Summary: Update to LANL trunk revision 820

M       src/mpi/ice_communicate.F90
M       src/source/ice_init.F90
M       src/source/ice_therm_mushy.F90
M       src/source/ice_itd.F90
M       src/source/ice_shortwave.F90
M       src/source/ice_meltpond_topo.F90
M       src/source/ice_ocean.F90
M       src/source/ice_meltpond_lvl.F90
M       src/source/ice_mechred.F90
M       src/source/ice_therm_vertical.F90
M       src/source/ice_step_mod.F90
M       src/source/ice_flux.F90
M       src/source/ice_read_write.F90
M       src/source/ice_history_shared.F90
M       src/source/ice_restart_driver.F90
M       src/source/ice_history.F90
M       src/input_templates/gx1/ice_in
M       src/input_templates/gx3/ice_in
M       src/input_templates/col/ice_in
M       src/drivers/cice/CICE_InitMod.F90
M       src/drivers/cesm/CICE_InitMod.F90
M       src/drivers/hadgem3/CICE_InitMod.F90
M       src/drivers/hadgem3/CICE_RunMod.F90
M       src/io_pio/ice_pio.F90

===============================================================
cice5_14_cice5.0.4
Originator: dbailey
Date: Aug 27, 2014
Version: 5.0
One-line Summary: fix prescribed ice

M       src/drivers/cesm/ice_prescribed_mod.F90
===============================================================
cice5_13_cice5.0.4
Originator: tcraig
Date: Aug 25, 2014
Version: 5.0
One-line Summary: fix shortwave bug, fix threading, update prescribed
  ice (still needs work), fix spacecurve, fix write_ice, add blkmask,
  add bfbflag.

M       bld/build-namelist
M       bld/namelist_files/namelist_definition.xml
M       bld/namelist_files/namelist_defaults_cice.xml
M       src/mpi/ice_global_reductions.F90
M       src/io_netcdf/ice_history_write.F90
M       src/source/ice_init.F90
M       src/source/ice_dyn_evp.F90
M       src/source/ice_transport_driver.F90
M       src/source/ice_restoring.F90
M       src/source/ice_dyn_eap.F90
M       src/source/ice_transport_remap.F90
M       src/source/ice_shortwave.F90
M       src/source/ice_fileunits.F90
M       src/source/ice_diagnostics.F90
M       src/source/ice_therm_vertical.F90
M       src/source/ice_distribution.F90
M       src/source/ice_state.F90
M       src/source/ice_grid.F90
M       src/source/ice_forcing.F90
M       src/source/ice_history_shared.F90
M       src/source/ice_spacecurve.F90
M       src/drivers/cice/CICE_InitMod.F90
M       src/drivers/cesm/CICE_InitMod.F90
M       src/drivers/cesm/CICE_RunMod.F90
M       src/drivers/cesm/ice_comp_mct.F90
M       src/drivers/cesm/ice_prescribed_mod.F90
M       src/io_pio/ice_history_write.F90

===============================================================
cice5_12_cice5.0.4
Originator: tcraig
Date: July 14, 2014
Version: 5.0
One-line Summary: merge latest rasm changes; pio restarts

M       bld/configure
M       bld/build-namelist
M       bld/namelist_files/namelist_definition.xml
M       bld/namelist_files/namelist_defaults_cice.xml
M       src/mpi/ice_timers.F90
M       src/source/ice_init.F90
M       src/source/ice_shortwave.F90
M       src/source/ice_meltpond_topo.F90
M       src/source/ice_ocean.F90
M       src/source/ice_meltpond_lvl.F90
M       src/source/ice_aerosol.F90
M       src/source/ice_step_mod.F90
M       src/source/ice_flux.F90
M       src/source/ice_restart_driver.F90
M       src/source/ice_atmo.F90
M       src/drivers/cesm/ice_import_export.F90
M       src/io_pio/ice_restart.F90

===============================================================
cice5_11_cice5.0.4
Originator: dbailey
Date: July 14, 2014
Version: 5.0
One-line Summary: latest ncar changes; save, omp

M      bld/namelist_files/namelist_defaults_cice.xml
M      src/mpi/ice_timers.F90
M      src/source/ice_transport_driver.F90
M      src/source/ice_transport_remap.F90
M      src/source/ice_shortwave.F90
M      src/source/ice_zbgc.F90
M      src/source/ice_ocean.F90
M      src/source/ice_aerosol.F90
M      src/source/ice_step_mod.F90
M      src/source/ice_flux.F90
M      src/source/ice_grid.F90
M      src/source/ice_restart_driver.F90
M      src/source/ice_history.F90

===============================================================
cice5_10_cice5.0.4
Originator: tcraig
Date: June 24, 2014
Version: 5.0
One-line Summary: fix pio history files

M      bld/namelist_files/namelist_definition.xml
M      src/io_pio/ice_pio.F90
M      src/io_pio/ice_history_write.F90

===============================================================
cice5_09_cice5.0.4
Originator: tcraig
Date: June 14, 2014
Version: 5.0
One-line Summary: fix coszen in io_netcdf

M      src/io_netcdf/ice_restart.F90
===============================================================
cice5_08_cice5.0.4
Originator: tcraig
Date: June 12, 2014
Version: 5.0
One-line Summary: get pio working and fix coszen restart bug

M       bld/configure
M       src/source/ice_restart_driver.F90
M       src/io_pio/ice_restart.F90
M       src/io_pio/ice_pio.F90
===============================================================
cice5_07_cice5.0.4
Originator: tcraig
Date: June 12, 2014
Version: 5.0
One-line Summary: add RASM_MODS cpp for rasm specific code mods

M      bld/configure
M      src/source/ice_domain.F90
M      src/source/ice_ocean.F90
M      src/source/ice_step_mod.F90
M      src/source/ice_flux.F90
M      src/source/ice_grid.F90
M      src/source/ice_atmo.F90
M      src/drivers/cesm/ice_import_export.F90
M      src/drivers/cesm/ice_cpl_indices.F90
===============================================================
cice5_06_cice5.0.4
Originator: tcraig
Date: June 10, 2014
Version: 5.0
One-line Summary: update for cesm1.1 (rasm) and ar9v4 grid
  update error checking for too small max_blocks in decomps

M      bld/configure
M      bld/cice_decomp.xml
M      bld/namelist_files/namelist_defaults_cice.xml
M      src/source/ice_distribution.F90
M      src/drivers/cesm/ice_comp_mct.F90
M      bld/cice_decomp.xml
	
===============================================================
cice5_05_cice5.0.4
Originator: tcraig
Date: 
Version: 5.0
One-line Summary: fix missing values on history files

M      src/io_netcdf/ice_history_write.F90
M      src/io_pio/ice_history_write.F90
	
===============================================================
cice5_04_cice5.0.4
Originator: tcraig
Date: 
Version: 5.0
One-line Summary: cice5 working in cesm1_3_beta07

M      bld/config_files/definition.xml
M      bld/generate_cice_decomp.pl
M      bld/namelist_files/namelist_definition.xml
M      src/mpi/ice_exit.F90
M      src/source/ice_init.F90
M      src/source/ice_orbital.F90
	
===============================================================
cice5_03_cice5.0.4
Originator: tcraig
Date: 
Version: 5.0
One-line Summary: minor bug fixes

M      src/source/ice_fileunits.F90
M      src/input_templates/run_ice.Linux.NCAR.yellowstone
	
===============================================================
cice5_02_cice5.0.4
Originator: tcraig
Date: 
Version: 5.0
One-line Summary: Update capability to run with CESM

M      bld/configure
M      bld/build-namelist
M      bld/namelist_files/namelist_definition.xml
M      bld/namelist_files/namelist_defaults_cice.xml
M      src/source/ice_calendar.F90
M      src/source/ice_history_shared.F90
M      src/source/ice_restart_driver.F90
M      src/source/ice_history.F90
M      src/drivers/cesm/CICE_InitMod.F90
M      src/drivers/cesm/CICE_RunMod.F90
M      src/drivers/cesm/ice_comp_mct.F90

===============================================================
cice5_01_cice5.0.4
Originator: tcraig
Date: 
Version: 5.0
One-line Summary: Initial capability to run with CESM

A      bld/configure
A      bld/config_files/definition.xml
A      bld/build-namelist
A      bld/namelist_files/namelist_definition.xml
A      bld/namelist_files/namelist_defaults_cice.xml
M      src/mpi/ice_timers.F90
M      src/mpi/ice_communicate.F90
M      src/mpi/ice_exit.F90
M      src/source/ice_init.F90
M      src/source/ice_domain.F90
M      src/source/ice_calendar.F90
M      src/source/ice_ocean.F90
M      src/source/ice_fileunits.F90
M      src/source/ice_diagnostics.F90
M      src/source/ice_step_mod.F90
M      src/source/ice_flux.F90
M      src/source/ice_grid.F90
M      src/source/ice_orbital.F90
M      src/source/ice_restart_driver.F90
M      src/source/ice_atmo.F90
M      src/bld/Macros.Linux.NCAR.yellowstone
M      src/input_templates/gx3/ice_in
M      src/input_templates/run_ice.Linux.NCAR.yellowstone
M      src/io_pio/ice_restart.F90
A      src/drivers/cesm/ice_scam.F90
A      src/drivers/cesm/CICE_InitMod.F90
A      src/drivers/cesm/CICE_RunMod.F90
A      src/drivers/cesm/ice_import_export.F90
A      src/drivers/cesm/CICE_FinalMod.F90
A      src/drivers/cesm/ice_constants.F90
A      src/drivers/cesm/ice_cpl_indices.F90
A      src/drivers/cesm/ice_comp_mct.F90
A      src/drivers/cesm/ice_prescribed_mod.F90
M      src/comp_ice
	
===============================================================
cice5_00_cice5.0.4
Originator: tcraig
Date: 
Version: 5.0
One-line Summary: Original import of cice5.0.4
===============================================================