<p><b>dwj07@fsu.edu</b> 2012-12-20 13:37:48 -0700 (Thu, 20 Dec 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Adding call to shortwave setup.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_mpas_core.F        2012-12-18 23:14:09 UTC (rev 2367)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_mpas_core.F        2012-12-20 20:37:48 UTC (rev 2368)
@@ -33,6 +33,7 @@
use ocn_constants
use ocn_thick_surface_flux
use ocn_tracer_surface_flux
+ use ocn_tracer_short_wave_absorption
type (io_output_object), save :: restart_obj
@@ -108,6 +109,9 @@
call ocn_tracer_surface_flux_init(err_tmp)
err = ior(err, err_tmp)
+ call ocn_tracer_short_wave_absorption_init(err_tmp)
+ err = ior(err, err_tmp)
+
call ocn_constants_init()
call mpas_timer_init(domain)
Modified: branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_tracer_surface_flux.F
===================================================================
--- branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_tracer_surface_flux.F        2012-12-18 23:14:09 UTC (rev 2367)
+++ branches/ocean_projects/generic_forcing/src/core_ocean/mpas_ocn_tracer_surface_flux.F        2012-12-20 20:37:48 UTC (rev 2368)
@@ -42,6 +42,8 @@
!
!--------------------------------------------------------------------
+ logical :: useShortWave
+
!***********************************************************************
contains
@@ -100,6 +102,8 @@
integer, dimension(:), pointer :: maxLevelCell
+ if(.not.useShortWave) return
+
err = 0
nCells = grid % nCells
@@ -139,7 +143,12 @@
integer, intent(out) :: err !< Output: error flag
err = 0
+ useShortWave = .false.
+ if(config_use_coupled_forcing) then
+ useShortWave = .true.
+ end if
+
end subroutine ocn_tracer_surface_flux_init!}}}
!***********************************************************************
</font>
</pre>