<p><b>dwj07@fsu.edu</b> 2012-12-20 14:44:33 -0700 (Thu, 20 Dec 2012)</p><p>        <br>
        -- BRANCH COMMIT --<br>
<br>
        Fixing issues with the state version of variables.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/generic_forcing/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/Registry        2012-12-20 20:54:13 UTC (rev 2369)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/Registry        2012-12-20 21:44:33 UTC (rev 2370)
@@ -356,7 +356,7 @@
var persistent real iceFraction ( nCells Time ) 2 - iceFraction state - -
var persistent real prognosticCO2 ( nCells Time ) 2 - prognosticCO2 state - -
var persistent real diagnosticCO2 ( nCells Time ) 2 - diagnosticCO2 state - -
-var persistent real squaredWindSpeed12Meter ( nCells Time ) 2 - squaredWindSpeed12Meter state - -
+var persistent real squaredWindSpeed10Meter ( nCells Time ) 2 - squaredWindSpeed10Meter state - -
% Coupler output fields, for coupled runs
var persistent real surfaceMeltHeatFlux ( nCells Time ) 2 - surfaceMeltHeatFlux state - -
Modified: branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_forcing_coupled.F
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_forcing_coupled.F        2012-12-20 20:54:13 UTC (rev 2369)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_forcing_coupled.F        2012-12-20 21:44:33 UTC (rev 2370)
@@ -119,8 +119,8 @@
#ifdef MPAS_CESM
- index_temperature_flux = grid % index_temperatureFlux
- index_salinity_flux = grid % index_salinityFlux
+ index_temperature_flux = state % index_temperatureFlux
+ index_salinity_flux = state % index_salinityFlux
angleEdge => grid % angleEdge % array
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        2012-12-20 20:54:13 UTC (rev 2369)
+++ branches/ocean_projects/generic_forcing/src/ocean_cesm_driver/ocn_comp_mct.F        2012-12-20 21:44:33 UTC (rev 2370)
@@ -469,7 +469,7 @@
block_ptr => domain % blocklist
do while(associated(block_ptr))
- call ocn_build_forcing_arrays(currTime, block_ptr % mesh, ierr)
+ call ocn_build_forcing_arrays(currTime, block_ptr % mesh, block_ptr % state % time_levs(2) % state, ierr)
block_ptr => block_ptr % next
end do
@@ -1008,59 +1008,59 @@
do while(associated(block_ptr))
do i = 1, block_ptr % mesh % nCellsSolve
n = n + 1
- block_ptr % mesh % zonalWindStress % array(n) = x2o_o % rAttr(index_x2o_Foxx_taux, n)
- block_ptr % mesh % meridionalWindStress % array(n) = x2o_o % rAttr(index_x2o_Foxx_tauy, n)
+ block_ptr % state % time_levs(1) % state % zonalWindStress % array(n) = x2o_o % rAttr(index_x2o_Foxx_taux, n)
+ block_ptr % state % time_levs(1) % state % meridionalWindStress % array(n) = x2o_o % rAttr(index_x2o_Foxx_tauy, n)
- block_ptr % mesh % latentHeatFlux % array(n) = x2o_o % rAttr(index_x2o_Foxx_lat, n)
- block_ptr % mesh % sensibleHeatFlux % array(n) = x2o_o % rAttr(index_x2o_Foxx_sen, n)
- block_ptr % mesh % longWaveHeatFluxUp % array(n) = x2o_o % rAttr(index_x2o_Foxx_lwup, n)
- block_ptr % mesh % longWaveHeatFluxDown % array(n) = x2o_o % rAttr(index_x2o_Faxa_lwdn, n)
- block_ptr % mesh % evaporationFlux % array(n) = x2o_o % rAttr(index_x2o_Foxx_evap, n)
- block_ptr % mesh % seaIceHeatFlux % array(n) = x2o_o % rAttr(index_x2o_Fioi_melth, n)
- block_ptr % mesh % snowFlux % array(n) = x2o_o % rAttr(index_x2o_Faxa_snow, n)
+ block_ptr % state % time_levs(1) % state % latentHeatFlux % array(n) = x2o_o % rAttr(index_x2o_Foxx_lat, n)
+ block_ptr % state % time_levs(1) % state % sensibleHeatFlux % array(n) = x2o_o % rAttr(index_x2o_Foxx_sen, n)
+ block_ptr % state % time_levs(1) % state % longWaveHeatFluxUp % array(n) = x2o_o % rAttr(index_x2o_Foxx_lwup, n)
+ block_ptr % state % time_levs(1) % state % longWaveHeatFluxDown % array(n) = x2o_o % rAttr(index_x2o_Faxa_lwdn, n)
+ block_ptr % state % time_levs(1) % state % evaporationFlux % array(n) = x2o_o % rAttr(index_x2o_Foxx_evap, n)
+ block_ptr % state % time_levs(1) % state % seaIceHeatFlux % array(n) = x2o_o % rAttr(index_x2o_Fioi_melth, n)
+ block_ptr % state % time_levs(1) % state % snowFlux % array(n) = x2o_o % rAttr(index_x2o_Faxa_snow, n)
- block_ptr % mesh % seaIceFreshWaterFlux % array(n) = x2o_o % rAttr(index_x2o_Fioi_meltw, n)
- block_ptr % mesh % seaIceSalinityFlux % array(n) = x2o_o % rAttr(index_x2o_Fioi_salt, n)
- block_ptr % mesh % riverRunoffFlux % array(n) = x2o_o % rAttr(index_x2o_Forr_roff, n)
- block_ptr % mesh % iceRunoffFlux % array(n) = x2o_o % rAttr(index_x2o_Forr_ioff, n)
+ block_ptr % state % time_levs(1) % state % seaIceFreshWaterFlux % array(n) = x2o_o % rAttr(index_x2o_Fioi_meltw, n)
+ block_ptr % state % time_levs(1) % state % seaIceSalinityFlux % array(n) = x2o_o % rAttr(index_x2o_Fioi_salt, n)
+ block_ptr % state % time_levs(1) % state % riverRunoffFlux % array(n) = x2o_o % rAttr(index_x2o_Forr_roff, n)
+ block_ptr % state % time_levs(1) % state % iceRunoffFlux % array(n) = x2o_o % rAttr(index_x2o_Forr_ioff, n)
- block_ptr % mesh % shortWaveHeatFlux % array(n) = max(x2o_o % rAttr(index_x2o_Foxx_swnet, n), 0.0_RKIND)
+ block_ptr % state % time_levs(1) % state % shortWaveHeatFlux % array(n) = max(x2o_o % rAttr(index_x2o_Foxx_swnet, n), 0.0_RKIND)
- block_ptr % mesh % rainFlux % array(n) = x2o_o % rAttr(index_x2o_Faxa_rain, n)
- block_ptr % mesh % seaLevelPressure % array(n) = x2o_o % rAttr(index_x2o_Sa_pslv, n)
- block_ptr % mesh % iceFraction % array(n) = x2o_o % rAttr(index_x2o_Si_ifrac, n)
+ block_ptr % state % time_levs(1) % state % rainFlux % array(n) = x2o_o % rAttr(index_x2o_Faxa_rain, n)
+ block_ptr % state % time_levs(1) % state % seaLevelPressure % array(n) = x2o_o % rAttr(index_x2o_Sa_pslv, n)
+ block_ptr % state % time_levs(1) % state % iceFraction % array(n) = x2o_o % rAttr(index_x2o_Si_ifrac, n)
- block_ptr % mesh % prognosticCO2 % array(n) = x2o_o % rAttr(index_x2o_Sa_co2prog, n)
- block_ptr % mesh % diagnosticCO2 % array(n) = x2o_o % rAttr(index_x2o_Sa_co2diag, n)
- block_ptr % mesh % squaredWindSpeed10Meter % array(n) = x2o_o % rAttr(index_x2o_So_duu10n, n)
+ block_ptr % state % time_levs(1) % state % prognosticCO2 % array(n) = x2o_o % rAttr(index_x2o_Sa_co2prog, n)
+ block_ptr % state % time_levs(1) % state % diagnosticCO2 % array(n) = x2o_o % rAttr(index_x2o_Sa_co2diag, n)
+ block_ptr % state % time_levs(1) % state % squaredWindSpeed10Meter % array(n) = x2o_o % rAttr(index_x2o_So_duu10n, n)
- if(block_ptr % mesh % iceRunoffFlux % array(n) < 0.0_RKIND) then
+ if(block_ptr % state % time_levs(1) % state % iceRunoffFlux % array(n) < 0.0_RKIND) then
call shr_sys_abort ('Error: incoming IOFF_F is negative')
end if
end do
block_ptr => block_ptr % next
end do
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % meridionalWindStress)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % zonalWindStress)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % latentHeatFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % sensibleHeatFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % longWaveHeatFluxUp)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % longWaveHeatFluxDown)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % evaporationFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % seaIceHeatFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % snowFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % seaIceFreshWaterFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % seaIceSalinityFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % riverRunoffFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % iceRunoffFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % shortWaveHeatFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % rainFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % seaLevelPressure)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % iceFraction)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % prognosticCO2)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % diagnosticCO2)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % squaredWindSpeed10Meter)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % meridionalWindStress)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % zonalWindStress)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % latentHeatFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % sensibleHeatFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % longWaveHeatFluxUp)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % longWaveHeatFluxDown)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % evaporationFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % seaIceHeatFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % snowFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % seaIceFreshWaterFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % seaIceSalinityFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % riverRunoffFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % iceRunoffFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % shortWaveHeatFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % rainFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % seaLevelPressure)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % iceFraction)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % prognosticCO2)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % diagnosticCO2)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % squaredWindSpeed10Meter)
!-----------------------------------------------------------------------
!EOC
@@ -1101,32 +1101,32 @@
type (block_type), pointer :: block_ptr
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % surfaceMeltHeatFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % temperatureState)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % salinityState)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % zonalVelocityState)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % meridionalVelocityState)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % zonalSSHGradientState)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % meridionalSSHGradientState)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % CO2Flux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % DMSFlux)
- call mpas_dmpar_exch_halo_field(domain % blocklist % mesh % surfaceUpwardCO2Flux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % surfaceMeltHeatFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % temperatureState)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % salinityState)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % zonalVelocityState)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % meridionalVelocityState)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % zonalSSHGradientState)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % meridionalSSHGradientState)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % CO2Flux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % DMSFlux)
+ call mpas_dmpar_exch_halo_field(domain % blocklist % state % time_levs(1) % state % surfaceUpwardCO2Flux)
n = 0
block_ptr => domain % blocklist
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 % mesh % surfaceMeltHeatFlux % array(n)
- o2x_o % rAttr(index_o2x_So_t, n) = block_ptr % mesh % temperatureState % array(n)
- o2x_o % rAttr(index_o2x_So_s, n) = block_ptr % mesh % salinityState % array(n)
- o2x_o % rAttr(index_o2x_So_u, n) = block_ptr % mesh % zonalVelocityState % array(n)
- o2x_o % rAttr(index_o2x_So_v, n) = block_ptr % mesh % meridionalVelocityState % array(n)
- o2x_o % rAttr(index_o2x_So_dhdx, n) = block_ptr % mesh % zonalSSHGradientState % array(n)
- o2x_o % rAttr(index_o2x_So_dhdy, n) = block_ptr % mesh % meridionalSSHGradientState % array(n)
- o2x_o % rAttr(index_o2x_Faoo_fco2_ocn, n) = block_ptr % mesh % CO2Flux % array(n)
- o2x_o % rAttr(index_o2x_Faoo_fdms_ocn, n) = block_ptr % mesh % DMSFlux % array(n)
- o2x_o % rAttr(index_o2x_Faoo_fco2_ocn, n) = block_ptr % mesh % surfaceUpwardCO2Flux % array(n)
+ o2x_o % rAttr(index_o2x_Fioo_q, n) = block_ptr % state % time_levs(1) % state % surfaceMeltHeatFlux % array(n)
+ o2x_o % rAttr(index_o2x_So_t, n) = block_ptr % state % time_levs(1) % state % temperatureState % array(n)
+ o2x_o % rAttr(index_o2x_So_s, n) = block_ptr % state % time_levs(1) % state % salinityState % array(n)
+ o2x_o % rAttr(index_o2x_So_u, n) = block_ptr % state % time_levs(1) % state % zonalVelocityState % array(n)
+ o2x_o % rAttr(index_o2x_So_v, n) = block_ptr % state % time_levs(1) % state % meridionalVelocityState % array(n)
+ o2x_o % rAttr(index_o2x_So_dhdx, n) = block_ptr % state % time_levs(1) % state % zonalSSHGradientState % array(n)
+ o2x_o % rAttr(index_o2x_So_dhdy, n) = block_ptr % state % time_levs(1) % state % meridionalSSHGradientState % array(n)
+ o2x_o % rAttr(index_o2x_Faoo_fco2_ocn, n) = block_ptr % state % time_levs(1) % state % CO2Flux % array(n)
+ o2x_o % rAttr(index_o2x_Faoo_fdms_ocn, n) = block_ptr % state % time_levs(1) % state % DMSFlux % array(n)
+ o2x_o % rAttr(index_o2x_Faoo_fco2_ocn, n) = block_ptr % state % time_levs(1) % state % surfaceUpwardCO2Flux % array(n)
end do
block_ptr => block_ptr % next
</font>
</pre>