<p><b>laura@ucar.edu</b> 2011-01-14 09:54:55 -0700 (Fri, 14 Jan 2011)</p><p>updated with physics<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_physics/src/core_hyd_atmos/module_time_integration.F
===================================================================
--- branches/atmos_physics/src/core_hyd_atmos/module_time_integration.F        2011-01-14 16:51:41 UTC (rev 699)
+++ branches/atmos_physics/src/core_hyd_atmos/module_time_integration.F        2011-01-14 16:54:55 UTC (rev 700)
@@ -163,19 +163,16 @@
if(debug) write(0,*) ' returned from dyn_tend '
-!#ifdef DO_PHYSICS
-! if (debug) write(0,*) ' add physics tendencies '
-! block => domain % blocklist
-! do while (associated(block))
-! call physics_addtend( block % tend, block % state % time_levs(2) % state, &
-! block % state % time_levs(2) % state % h % array, block % mesh )
-! call dmpar_exch_halo_field3dReal(domain % dminfo, block % tend % scalars % array(:,:,:), &
-! block % state % time_levs(2) % state % num_scalars, block % mesh % nVertLevels, block % mesh % nCells, &
-! block % parinfo % cellsToSend, block % parinfo % cellsToRecv)
-! block => block % next
-! end do
-! if (debug) write(0,*) ' finished add physics tendencies '
-!#endif
+#ifdef DO_PHYSICS
+ if (debug) write(0,*) ' add physics tendencies '
+ block => domain % blocklist
+ do while (associated(block))
+ call physics_addtend( block % mesh, block % tend, block % tend_physics, &
+ block % state % time_levs(2) % state % h % array(:,:) )
+ block => block % next
+ end do
+ if (debug) write(0,*) ' finished add physics tendencies '
+#endif
!
! --- update halos for tendencies
@@ -386,7 +383,8 @@
!call microphysics schemes:
if(config_microp_scheme .ne. 'off') &
- call microphysics_driver ( block % state % time_levs(2) % state, block % mesh, itimestep )
+ call microphysics_driver ( block % state % time_levs(2) % state, block % diag, block % diag_physics, &
+ block % tend, block % mesh, itimestep )
do iScalar = 1, block % state % time_levs(2) % state % num_scalars
scalar_min = 0.
</font>
</pre>