src:ticket:580

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1515 f091316a-d328-0410-a40a-876eff57d070
Making some updates to my code after ticket 580.
src:ticket:581

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

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

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

Conflicts:

	ROMS/External/ocean_benchmark1.in
	ROMS/External/ocean_benchmark2.in
	ROMS/External/ocean_benchmark3.in
	ROMS/External/ocean_bio_toy.in
	ROMS/External/ocean_bl_test.in
	ROMS/External/ocean_canyon2d.in
	ROMS/External/ocean_canyon3d.in
	ROMS/External/ocean_coupling_test.in
	ROMS/External/ocean_damee_4.in
	ROMS/External/ocean_dogbone_composite.in
	ROMS/External/ocean_dogbone_whole.in
	ROMS/External/ocean_double_gyre.in
	ROMS/External/ocean_estuary_test.in
	ROMS/External/ocean_flt_test2d.in
	ROMS/External/ocean_flt_test3d.in
	ROMS/External/ocean_grav_adj.in
	ROMS/External/ocean_inlet_test.in
	ROMS/External/ocean_kelvin.in
	ROMS/External/ocean_lab_canyon.in
	ROMS/External/ocean_lake_signell.in
	ROMS/External/ocean_lmd_test.in
	ROMS/External/ocean_overflow.in
	ROMS/External/ocean_riverplume1.in
	ROMS/External/ocean_riverplume2.in
	ROMS/External/ocean_seamount.in
	ROMS/External/ocean_sed_test1.in
	ROMS/External/ocean_sed_toy.in
	ROMS/External/ocean_shoreface.in
	ROMS/External/ocean_soliton.in
	ROMS/External/ocean_test_chan.in
	ROMS/External/ocean_test_head.in
	ROMS/External/ocean_upwelling.in
	ROMS/External/ocean_wc13.in
	ROMS/External/ocean_weddell.in
	ROMS/External/ocean_windbasin.in
	ROMS/Functionals/ana_biology.h
	ROMS/Modules/mod_grid.F
	ROMS/Nonlinear/get_data.F
	ROMS/Nonlinear/initial.F
	ROMS/Nonlinear/main2d.F
	ROMS/Nonlinear/main3d.F
	ROMS/Nonlinear/step2d_LF_AM3.h
	ROMS/Nonlinear/step3d_t.F
	ROMS/Utility/checkdefs.F
	ROMS/Utility/get_grid.F
	ROMS/Utility/get_state.F
	ROMS/Utility/inp_par.F
	ROMS/Utility/read_phypar.F
	ROMS/Utility/wrt_his.F
	User/External/ocean.in
	User/External/ocean_adria02.in
	User/External/ocean_cblast.in
	User/External/ocean_eac_4.in
	User/External/ocean_eac_8.in
	User/External/ocean_ias.in
	User/External/ocean_ias_40.in
	User/External/ocean_natl.in
	User/External/ocean_nena.in
	User/External/ocean_nj_bight.in
	User/External/ocean_scb.in
	User/External/ocean_sw06_coarse.in
	User/External/ocean_sw06_fine.in
Merge branch 'kate_svn' of delta.arsc.edu:feedme into kate_svn

Conflicts:
	ROMS/Nonlinear/main2d.F
Some Kate changes in response to last big patch.
More bits to go with latest huge patch (version 3.7) - no nesting of ice yet.
src:ticket:588

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

Conflicts:

	ROMS/Utility/inp_par.F
src:ticket:590

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

Conflicts:

	ROMS/Modules/mod_param.F
	ROMS/Utility/inp_par.F
	ROMS/Utility/lbc.F
src:ticket:590

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

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

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

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

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

git-svn-id: https://www.myroms.org/svn/omlab/branches/arango@1533 f091316a-d328-0410-a40a-876eff57d070
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