<p><b>dwj07@fsu.edu</b> 2013-02-21 15:21:25 -0700 (Thu, 21 Feb 2013)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Adding changes required for non-blocking RK4 version.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/split_halo_exch/src/core_ocean/Makefile
===================================================================
--- branches/split_halo_exch/src/core_ocean/Makefile        2013-02-21 22:16:05 UTC (rev 2502)
+++ branches/split_halo_exch/src/core_ocean/Makefile        2013-02-21 22:21:25 UTC (rev 2503)
@@ -49,6 +49,7 @@
mpas_ocn_tracer_advection_helpers.o \
mpas_ocn_time_integration.o \
mpas_ocn_time_integration_rk4.o \
+ mpas_ocn_time_integration_rk4nb.o \
mpas_ocn_time_integration_split.o \
mpas_ocn_equation_of_state.o \
mpas_ocn_equation_of_state_jm.o \
@@ -67,8 +68,10 @@
mpas_ocn_advection.o:
-mpas_ocn_time_integration.o: mpas_ocn_time_integration_rk4.o mpas_ocn_time_integration_split.o
+mpas_ocn_time_integration.o: mpas_ocn_time_integration_rk4.o mpas_ocn_time_integration_split.o mpas_ocn_time_integration_rk4nb.o
+mpas_ocn_time_integration_rk4nb.o: mpas_ocn_tendency.o mpas_ocn_diagnostics.o
+
mpas_ocn_time_integration_rk4.o: mpas_ocn_tendency.o mpas_ocn_diagnostics.o
mpas_ocn_time_integration_split.o: mpas_ocn_tendency.o mpas_ocn_diagnostics.o
@@ -220,6 +223,7 @@
mpas_ocn_diagnostics.o \
mpas_ocn_time_integration.o \
mpas_ocn_time_integration_rk4.o \
+ mpas_ocn_time_integration_rk4nb.o \
mpas_ocn_time_integration_split.o \
mpas_ocn_equation_of_state.o \
mpas_ocn_equation_of_state_jm.o \
Modified: branches/split_halo_exch/src/core_ocean/mpas_ocn_time_integration.F
===================================================================
--- branches/split_halo_exch/src/core_ocean/mpas_ocn_time_integration.F        2013-02-21 22:16:05 UTC (rev 2502)
+++ branches/split_halo_exch/src/core_ocean/mpas_ocn_time_integration.F        2013-02-21 22:21:25 UTC (rev 2503)
@@ -23,6 +23,7 @@
use mpas_timer
use ocn_time_integration_rk4
+ use ocn_time_integration_rk4nb
use ocn_time_integration_split
implicit none
@@ -50,7 +51,7 @@
!
!--------------------------------------------------------------------
- logical :: rk4On, splitOn
+ logical :: rk4On, splitOn, rk4NBOn
contains
@@ -92,6 +93,8 @@
if (rk4On) then
call ocn_time_integrator_rk4(domain, dt)
+ elseif (rk4NBOn) then
+ call ocn_time_integrator_rk4nb(domain, dt)
elseif (splitOn) then
call ocn_time_integrator_split(domain, dt)
endif
@@ -119,10 +122,13 @@
err = 0
rk4On = .false.
+ rk4NBOn = .false.
splitOn = .false.
if (trim(config_time_integrator) == 'RK4') then
rk4On = .true.
+ elseif (trim(config_time_integrator) == 'RK4-NB' ) then
+ rk4NBOn = .true.
elseif (trim(config_time_integrator) == 'split_explicit' &
.or.trim(config_time_integrator) == 'unsplit_explicit') then
splitOn = .true.
</font>
</pre>