src:ticket:597

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1531 f091316a-d328-0410-a40a-876eff57d070

Conflicts:

	ROMS/Drivers/w4dpsas_ocean.h
	ROMS/Nonlinear/nesting.F
	ROMS/Version
src:ticket:600

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1533 f091316a-d328-0410-a40a-876eff57d070

Conflicts:

	ROMS/Nonlinear/initial.F
src:ticket:601

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1534 f091316a-d328-0410-a40a-876eff57d070
src:ticket:602

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1535 f091316a-d328-0410-a40a-876eff57d070

Conflicts:

	Compilers/Darwin-ifort.mk
	Compilers/Linux-ifort.mk
src:ticket:605

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1536 f091316a-d328-0410-a40a-876eff57d070
src:ticket:607

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1537 f091316a-d328-0410-a40a-876eff57d070
Update to remove extra tau lines in t3dbc_im.F
src:ticket:608

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1538 f091316a-d328-0410-a40a-876eff57d070
src:ticket:609

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1539 f091316a-d328-0410-a40a-876eff57d070

Conflicts:

	ROMS/External/ocean_dogbone_composite.in
	ROMS/External/ocean_dogbone_refined.in
	ROMS/External/ocean_dogbone_whole.in
	ROMS/Include/cppdefs.h
	ROMS/Modules/mod_mixing.F
	ROMS/Modules/mod_ncparam.F
	ROMS/Nonlinear/initial.F
	ROMS/Utility/checkdefs.F
	ROMS/Utility/close_io.F
	ROMS/Utility/def_info.F
	ROMS/Utility/get_grid.F
src:ticket:610

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1541 f091316a-d328-0410-a40a-876eff57d070

Conflicts:

	ROMS/Include/globaldefs.h
src:ticket:612

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1542 f091316a-d328-0410-a40a-876eff57d070
src:ticket:613

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1543 f091316a-d328-0410-a40a-876eff57d070

Conflicts:

	ROMS/Nonlinear/set_tides.F
	ROMS/Utility/check_multifile.F
	ROMS/Utility/inp_par.F
	ROMS/Utility/read_phypar.F
Fix to ice shelf thermo from Mike Dinniman.