Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl

NOAA-GFDL · Aug 11, 2017 · 0ef6bf5 · 0ef6bf5
2 parents 48fd416 + 76e81cd
commit 0ef6bf5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/FMS b/src/FMS
diff --git a/src/MOM6 b/src/MOM6
+828 −1,147		coupler/atmos_ocean_fluxes.F90
+3,151 −491		coupler/coupler_types.F90
+3 −0		coupler/ensemble_manager.F90
+4 −4		diag_manager/diag_data.F90
+1 −1		diag_manager/diag_manager.F90
+1 −1		diag_manager/diag_output.F90
+4 −4		diag_manager/diag_table.F90
+129 −88		fms/fms_io.F90
+5 −6		mpp/include/mpp_util_mpi.inc
+19 −3		time_interp/time_interp.F90
+14 −0		time_manager/time_manager.F90
+23 −19		config_src/coupled_driver/MOM_surface_forcing.F90
+122 −105		config_src/coupled_driver/ocean_model_MOM.F90
+0 −1		config_src/ice_solo_driver/MOM_surface_forcing.F90
+17 −10		config_src/ice_solo_driver/atmos_ocean_fluxes.F90
+3,232 −71		config_src/ice_solo_driver/coupler_types.F90
+161 −0		config_src/ice_solo_driver/coupler_util.F90
+0 −1		config_src/solo_driver/MOM_surface_forcing.F90
+2 −1		config_src/solo_driver/atmos_ocean_fluxes.F90
+3,231 −70		config_src/solo_driver/coupler_types.F90
+161 −0		config_src/solo_driver/coupler_util.F90
+0 −1		src/core/MOM.F90
+12 −6		src/core/MOM_forcing_type.F90
+2 −2		src/core/MOM_variables.F90
+22 −18		src/tracer/DOME_tracer.F90
+23 −12		src/tracer/ISOMIP_tracer.F90
+67 −48		src/tracer/MOM_OCMIP2_CFC.F90
+3 −2		src/tracer/MOM_generic_tracer.F90
+43 −5		src/tracer/MOM_tracer_flow_control.F90
+23 −18		src/tracer/advection_test_tracer.F90
+22 −18		src/tracer/boundary_impulse_tracer.F90
+21 −17		src/tracer/dye_example.F90
+21 −17		src/tracer/ideal_age_example.F90
+22 −17		src/tracer/oil_tracer.F90
+22 −17		src/tracer/pseudo_salt_tracer.F90
+20 −17		src/tracer/tracer_example.F90