<p><b>dwj07@fsu.edu</b> 2012-03-09 13:54:34 -0700 (Fri, 09 Mar 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Merging trunk to branch.<br>
</p><hr noshade><pre><font color="gray">
Property changes on: branches/ocean_projects/monotonic_advection
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mpas:1508
+ /trunk/mpas:1500-1614
Modified: branches/ocean_projects/monotonic_advection/Makefile
===================================================================
--- branches/ocean_projects/monotonic_advection/Makefile 2012-03-09 20:42:24 UTC (rev 1614)
+++ branches/ocean_projects/monotonic_advection/Makefile 2012-03-09 20:54:34 UTC (rev 1615)
@@ -100,10 +100,10 @@
"CC_PARALLEL = gcc" \
"FC_SERIAL = ifort" \
"CC_SERIAL = gcc" \
- "FFLAGS_OPT = -real-size 64 -O3 -convert big_endian -FR" \
+ "FFLAGS_OPT = -real-size 64 -O3 -convert big_endian -FR -heap-arrays 4096" \
"CFLAGS_OPT = -O3 -m64" \
"LDFLAGS_OPT = -O3" \
- "FFLAGS_DEBUG = -real-size 64 -g -convert big_endian -FR -CU -CB -check all -fpe0 -traceback -debug all" \
+ "FFLAGS_DEBUG = -real-size 64 -g -convert big_endian -FR -CU -CB -check all -fpe0 -traceback -debug all -heap-arrays 4096" \
"CFLAGS_DEBUG = -g -m64" \
"LDFLAGS_DEBUG = -g" \
"CORE = $(CORE)" \
Modified: branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos
===================================================================
--- branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos 2012-03-09 20:42:24 UTC (rev 1614)
+++ branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos 2012-03-09 20:54:34 UTC (rev 1615)
@@ -1,5 +1,4 @@
&nhyd_model
- config_test_case = 0
config_time_integration = 'SRK3'
config_dt = 450.0
config_start_time = '2010-10-23_00:00:00'
Modified: branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos_mtn_wave
===================================================================
--- branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos_mtn_wave 2012-03-09 20:42:24 UTC (rev 1614)
+++ branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos_mtn_wave 2012-03-09 20:54:34 UTC (rev 1615)
@@ -1,49 +1,72 @@
&nhyd_model
- config_test_case = 6
config_time_integration = 'SRK3'
- config_dt = 6.
- config_ntimesteps = 3000
- config_output_interval = 100
+ config_dt = 6.0
+ config_start_time = '0000-01-01_00:00:00'
+ config_run_duration = '05:00:00'
config_number_of_sub_steps = 6
config_h_mom_eddy_visc2 = 10.
config_h_mom_eddy_visc4 = 0.
- config_v_mom_eddy_visc2 = 10.
+ config_v_mom_eddy_visc2 = 10.0
config_h_theta_eddy_visc2 = 10.
config_h_theta_eddy_visc4 = 0.
config_v_theta_eddy_visc2 = 10.
+ config_horiz_mixing = '2d_fixed'
config_theta_adv_order = 3
config_w_adv_order = 3
+ config_u_vadv_order = 3
+ config_w_vadv_order = 3
+ config_theta_vadv_order = 3
+ config_coef_3rd_order = 0.25
config_scalar_advection = .false.
- config_positive_definite = .false.
- config_monotonic = .false.
- config_mix_full = .false.
- config_horiz_mixing = '2d_fixed'
- config_coef_3rd_order = 0.25
- config_epssm = 0.2
+ config_epssm = 0.1
+ config_smdiv = 0.1
config_newpx = .false.
/
-
&damping
- config_zd = 22000.0
- config_xnutr = 0.0
+ config_zd = 10500.0
+ config_xnutr = 0.1
/
&dimensions
- config_nvertlevels = 26
+ config_nvertlevels = 70
/
&io
- config_input_name = 'grid.nc'
+ config_input_name = 'mtn_wave_init.nc'
config_output_name = 'output.nc'
config_restart_name = 'restart.nc'
+ config_output_interval = '00:30:00'
+ config_frames_per_outfile = 0
/
&restart
- config_restart_interval = 3000
+ config_restart_interval = '1_00:00:00'
config_do_restart = .false.
- config_restart_time = 1036800.0
/
&physics
+ config_frac_seaice = .false.
+ config_sfc_albedo = .false.
+ config_sst_update = .false.
+ config_sstdiurn_update = .false.
+ config_deepsoiltemp_update = .false.
+
+ config_n_microp = 5
+
+ config_radtlw_interval = '00:00:00'
+ config_radtsw_interval = '00:00:00'
+ config_conv_interval = 'none'
+ config_pbl_interval = 'none'
+
+ config_microp_scheme = 'off'
+ config_conv_shallow_scheme = 'off'
+ config_conv_deep_scheme = 'off'
+ config_eddy_scheme = 'off'
+ config_lsm_scheme = 'off'
+ config_pbl_scheme = 'off'
+ config_radt_cld_scheme = 'off'
+ config_radt_lw_scheme = 'off'
+ config_radt_sw_scheme = 'off'
+ config_sfclayer_scheme = 'off'
/
Modified: branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos_squall
===================================================================
--- branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos_squall 2012-03-09 20:42:24 UTC (rev 1614)
+++ branches/ocean_projects/monotonic_advection/namelist.input.nhyd_atmos_squall 2012-03-09 20:54:34 UTC (rev 1615)
@@ -1,43 +1,74 @@
&nhyd_model
- config_test_case = 4
config_time_integration = 'SRK3'
- config_dt = 6.
- config_ntimesteps = 600
- config_output_interval = 100
+ config_dt = 3.0
+ config_start_time = '0000-01-01_00:00:00'
+ config_run_duration = '02:00:00'
config_number_of_sub_steps = 6
config_h_mom_eddy_visc2 = 500.
config_h_mom_eddy_visc4 = 0.
config_v_mom_eddy_visc2 = 500.0
config_h_theta_eddy_visc2 = 500.
- config_h_theta_eddy_visc4 = 00.
- config_v_theta_eddy_visc2 = 500.0
- config_theta_adv_order = 2
- config_scalar_adv_order = 2
- config_positive_definite = .false.
- config_monotonic = .false.
- config_newpx = .false.
+ config_h_theta_eddy_visc4 = 0.
+ config_v_theta_eddy_visc2 = 500.
+ config_horiz_mixing = '2d_fixed'
+ config_theta_adv_order = 3
+ config_w_adv_order = 3
+ config_u_vadv_order = 3
+ config_w_vadv_order = 3
+ config_theta_vadv_order = 3
+ config_coef_3rd_order = 0.25
+ config_epssm = 0.1
+ config_smdiv = 0.1
+ config_mix_full = .false.
+ config_monotonic = .true.
/
&damping
- config_zd = 22000.0
+ config_zd = 20000.0
config_xnutr = 0.0
/
&dimensions
- config_nvertlevels = 26
+ config_nvertlevels = 40
/
&io
- config_input_name = 'grid.nc'
+ config_input_name = 'supercell_init.nc'
config_output_name = 'output.nc'
config_restart_name = 'restart.nc'
+ config_output_interval = '00:30:00'
+ config_frames_per_outfile = 0
/
&restart
- config_restart_interval = 3000
+ config_restart_interval = '1_00:00:00'
config_do_restart = .false.
- config_restart_time = 1036800.0
/
&physics
+ config_frac_seaice = .false.
+ config_sfc_albedo = .false.
+ config_sst_update = .false.
+ config_sstdiurn_update = .false.
+ config_deepsoiltemp_update = .false.
+
+ config_n_microp = 1
+
+ config_radtlw_interval = '00:30:00'
+ config_radtsw_interval = '00:30:00'
+ config_conv_interval = 'none'
+ config_pbl_interval = 'none'
+
+ config_microp_scheme = 'kessler'
+ config_conv_shallow_scheme = 'off'
+ config_conv_deep_scheme = 'off'
+ config_eddy_scheme = 'off'
+ config_lsm_scheme = 'off'
+ config_pbl_scheme = 'off'
+ config_radt_cld_scheme = 'off'
+ config_radt_lw_scheme = 'off'
+ config_radt_sw_scheme = 'off'
+ config_sfclayer_scheme = 'off'
/
+
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/Registry
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_advection.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_equation_of_state.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_equation_of_state_jm.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_equation_of_state_linear.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_global_diagnostics.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_mpas_core.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_restoring.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tendency.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_thick_hadv.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_thick_vadv.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_time_integration.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_time_integration_rk4.F
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_time_integration_split.F 2012-03-09 20:42:24 UTC (rev 1614)
+++ branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_time_integration_split.F 2012-03-09 20:54:34 UTC (rev 1615)
@@ -861,23 +861,6 @@
block => block % next
end do
-
- ! Boundary update on tracers. This is placed here, rather than
- ! on tend % tracers as in RK4, because I needed to update
- ! afterwards for the del4 diffusion operator.
- call mpas_timer_start("se halo tracers", .false., timer_halo_tracers)
- block => domain % blocklist
- do while (associated(block))
-
- call mpas_dmpar_exch_halo_field3d_real(domain % dminfo, block % state % time_levs(2) % state % tracers % array(:,:,:), &
- block % tend % num_tracers, block % mesh % nVertLevels, block % mesh % nCells, block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
-
- block => block % next
- end do
- call mpas_timer_stop("se halo tracers", timer_halo_tracers)
-
-
-
end do ! split_explicit_step = 1, config_n_ts_iter
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! END large iteration loop
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_time_integration_split.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_hadv.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_hadv2.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_hadv3.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_hadv4.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_hmix.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_hmix_del2.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_hmix_del4.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv_spline.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_coriolis.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_forcing.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_forcing_bottomdrag.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_forcing_windstress.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_hmix.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_hmix_del2.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_hmix_del4.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_pressure_grad.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vel_vadv.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vmix.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vmix_coefs_const.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_vmix_coefs_tanh.F
___________________________________________________________________
Added: svn:mergeinfo
+
Property changes on: branches/ocean_projects/monotonic_advection/src/external
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/mpas/src/external:1499-1597
+ /trunk/mpas/src/external:1499-1614
</font>
</pre>