<p><b>dwj07@fsu.edu</b> 2013-01-10 13:56:57 -0700 (Thu, 10 Jan 2013)</p><p><br>
-- BRANCH COMMIT --<br>
Fixing some issues with ocean CESM coupling.<br>
Adding time average fields for coupling fields.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/generic_forcing/src/core_ocean/Makefile
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/Makefile 2013-01-10 15:27:13 UTC (rev 2379)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/Makefile 2013-01-10 20:56:57 UTC (rev 2380)
@@ -59,6 +59,7 @@
mpas_ocn_equation_of_state_linear.o \
mpas_ocn_global_diagnostics.o \
mpas_ocn_time_average.o \
+ mpas_ocn_time_average_coupled.o \
mpas_ocn_forcing_coupled.o \
mpas_ocn_forcing_monthly.o \
mpas_ocn_forcing.o \
@@ -75,16 +76,18 @@
mpas_ocn_time_integration.o: mpas_ocn_time_integration_rk4.o mpas_ocn_time_integration_split.o
-mpas_ocn_time_integration_rk4.o:
+mpas_ocn_time_integration_rk4.o: mpas_ocn_tendency.o
-mpas_ocn_time_integration_split.o:
+mpas_ocn_time_integration_split.o: mpas_ocn_tendency.o
-mpas_ocn_tendency.o: mpas_ocn_time_average.o mpas_ocn_tracer_short_wave_absorption.o
+mpas_ocn_tendency.o: mpas_ocn_time_average.o mpas_ocn_time_average_coupled.o mpas_ocn_tracer_short_wave_absorption.o
mpas_ocn_global_diagnostics.o:
mpas_ocn_time_average.o:
+mpas_ocn_time_average_coupled.o: mpas_ocn_constants.o
+
mpas_ocn_thick_hadv.o:
mpas_ocn_thick_vadv.o:
Modified: branches/ocean_projects/generic_forcing/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/Registry 2013-01-10 15:27:13 UTC (rev 2379)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/Registry 2013-01-10 20:56:57 UTC (rev 2380)
@@ -358,6 +358,7 @@
var persistent real squaredWindSpeed10Meter ( nCells Time ) 2 - squaredWindSpeed10Meter state - -
% Coupler output fields, for coupled runs
+var persistent real nAccumulateCoupled ( Time ) 2 o nAccumulateCoupled state - -
var persistent real surfaceMeltHeatFlux ( nCells Time ) 2 - surfaceMeltHeatFlux state - -
var persistent real temperatureState ( nCells Time ) 2 - temperatureState state - -
var persistent real salinityState ( nCells Time ) 2 - salinityState state - -
Modified: branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_time_integration_rk4.F
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_time_integration_rk4.F 2013-01-10 15:27:13 UTC (rev 2379)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_time_integration_rk4.F 2013-01-10 20:56:57 UTC (rev 2380)
@@ -26,6 +26,7 @@
use ocn_equation_of_state
use ocn_vmix
use ocn_time_average
+ use ocn_time_average_coupled
implicit none
private
@@ -340,6 +341,7 @@
!TDR
call ocn_time_average_accumulate(block % state % time_levs(2) % state, block % state % time_levs(1) % state)
+ call ocn_time_average_coupled_accumulate(block % state % time_levs(2) % state, block % state % time_levs(1) % state)
block => block % next
end do
Modified: branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_time_integration_split.F
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_time_integration_split.F 2013-01-10 15:27:13 UTC (rev 2379)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_time_integration_split.F 2013-01-10 20:56:57 UTC (rev 2380)
@@ -28,6 +28,7 @@
use ocn_equation_of_state
use ocn_vmix
use ocn_time_average
+ use ocn_time_average_coupled
implicit none
private
@@ -1010,6 +1011,7 @@
!TDR
call ocn_time_average_accumulate(block % state % time_levs(2) % state, block % state % time_levs(1) % state)
+ call ocn_time_average_coupled_accumulate(block % state % time_levs(2) % state, block % state % time_levs(1) % state)
block => block % next
end do
Modified: branches/ocean_projects/generic_forcing/src/ocean_cesm_driver/ocn_comp_mct.F
===================================================================
--- branches/ocean_projects/generic_forcing/src/ocean_cesm_driver/ocn_comp_mct.F 2013-01-10 15:27:13 UTC (rev 2379)
+++ branches/ocean_projects/generic_forcing/src/ocean_cesm_driver/ocn_comp_mct.F 2013-01-10 20:56:57 UTC (rev 2380)
@@ -139,6 +139,7 @@
type (MPAS_Time_Type) :: alarmStartTime
type (MPAS_TimeInterval_Type) :: alarmTimeStep
+ type (block_type), pointer :: block_ptr
!-----------------------------------------------------------------------
!
@@ -382,6 +383,13 @@
call ocn_write_output_frame(output_obj, output_frame, domain)
itimestep = 0
+ block_ptr => domain % blocklist
+ do while(associated(block_ptr))
+ call ocn_time_average_init(block_ptr % state % time_levs(1) % state)
+ block_ptr => block_ptr % next
+ end do
+
+
!-----------------------------------------------------------------------
!EOC
@@ -399,6 +407,7 @@
use mpas_grid_types
use mpas_io_output
use mpas_timer
+ use mpas_ocn_time_average_coupled
implicit none
!
@@ -467,14 +476,10 @@
dt = config_dt
currTime = mpas_get_clock_time(clock, MPAS_NOW, ierr)
-! call mpas_get_time(curr_time=currTime, dateTimeString=timeStamp, ierr=ierr)
-! write(0,*) 'Initial time ', trim(timeStamp)
-! call ocn_write_output_frame(output_obj, output_frame, domain)
-
block_ptr => domain % blocklist
do while(associated(block_ptr))
- call ocn_time_average_init(block_ptr % state % time_levs(1) % state)
+ call ocn_time_average_init_coupled(block_ptr % state % time_levs(1) % state)
block_ptr => block_ptr % next
end do
@@ -1011,7 +1016,7 @@
!
!-----------------------------------------------------------------------
- integer :: i,n
+ integer :: i,n, index_temperature, index_salinity
type (block_type), pointer :: block_ptr
@@ -1031,8 +1036,9 @@
do while(associated(block_ptr))
do i = 1, block_ptr % mesh % nCellsSolve
n = n + 1
+
o2x_o % rAttr(index_o2x_Fioo_q, n) = block_ptr % state % time_levs(1) % state % surfaceMeltHeatFlux % array(i)
- o2x_o % rAttr(index_o2x_So_t, n) = block_ptr % state % time_levs(1) % state % temperatureState % array(i) + T0_Kelvin
+ o2x_o % rAttr(index_o2x_So_t, n) = block_ptr % state % time_levs(1) % state % temperatureState % array(i)
o2x_o % rAttr(index_o2x_So_s, n) = block_ptr % state % time_levs(1) % state % salinityState % array(i)
o2x_o % rAttr(index_o2x_So_u, n) = block_ptr % state % time_levs(1) % state % zonalVelocityState % array(i)
o2x_o % rAttr(index_o2x_So_v, n) = block_ptr % state % time_levs(1) % state % meridionalVelocityState % array(i)
@@ -1080,7 +1086,6 @@
end subroutine convert_seconds_to_timestamp!}}}
-
end module ocn_comp_mct
!|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
</font>
</pre>