src:ticket:616

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

Conflicts:

	ROMS/External/ocean_basin.in
	ROMS/External/ocean_benchmark1.in
	ROMS/External/ocean_benchmark2.in
	ROMS/External/ocean_benchmark3.in
	ROMS/External/ocean_bl_test.in
	ROMS/External/ocean_canyon2d.in
	ROMS/External/ocean_canyon3d.in
	ROMS/External/ocean_channel.in
	ROMS/External/ocean_coupling_test.in
	ROMS/External/ocean_damee_4.in
	ROMS/External/ocean_dogbone_composite.in
	ROMS/External/ocean_dogbone_refined.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_weddell.in
	ROMS/External/ocean_windbasin.in
	ROMS/Functionals/ana_psource.h
	ROMS/Include/cppdefs.h
	ROMS/Include/globaldefs.h
	ROMS/Modules/mod_arrays.F
	ROMS/Modules/mod_ncparam.F
	ROMS/Modules/mod_sources.F
	ROMS/Nonlinear/Biology/ecosim_inp.h
	ROMS/Nonlinear/Biology/nemuro_inp.h
	ROMS/Nonlinear/Biology/npzd_Franks_inp.h
	ROMS/Nonlinear/Biology/npzd_Powell_inp.h
	ROMS/Nonlinear/Biology/npzd_iron_inp.h
	ROMS/Nonlinear/get_idata.F
	ROMS/Nonlinear/initial.F
	ROMS/Nonlinear/pre_step3d.F
	ROMS/Nonlinear/set_data.F
	ROMS/Nonlinear/step2d_LF_AM3.h
	ROMS/Nonlinear/step3d_t.F
	ROMS/Utility/checkdefs.F
	ROMS/Utility/def_info.F
	ROMS/Utility/read_phypar.F
	ROMS/Utility/set_masks.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_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
src:ticket:618

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

Conflicts:

	ROMS/Modules/mod_scalars.F
	ROMS/Nonlinear/Biology/nemuro_inp.h
	ROMS/Nonlinear/nesting.F
src:ticket:619

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

Conflicts:

	ROMS/Nonlinear/main2d.F
	ROMS/Nonlinear/main3d.F
	ROMS/Nonlinear/step3d_t.F
	ROMS/Utility/checkdefs.F
	ROMS/Utility/set_contact.F
Merge branch 'kate_svn' of delta.arsc.edu:feedme into kate_svn

Conflicts:
	ROMS/External/ocean_dogbone_refined.in
	ROMS/External/sediment_test_head.in
	ROMS/Modules/mod_nesting.F
	ROMS/Modules/mod_scalars.F
	ROMS/Nonlinear/nesting.F
	ROMS/Utility/set_contact.F
	ROMS/Version
Updated code compiles, need to try ntimesteps in main2/3d.