<p><b>laura@ucar.edu</b> 2010-10-07 16:01:57 -0600 (Thu, 07 Oct 2010)</p><p>added physics-related calls<br>
</p><hr noshade><pre><font color="gray">Modified: branches/atmos_physics/src/core_hyd_atmos/mpas_interface.F
===================================================================
--- branches/atmos_physics/src/core_hyd_atmos/mpas_interface.F        2010-10-07 22:00:38 UTC (rev 529)
+++ branches/atmos_physics/src/core_hyd_atmos/mpas_interface.F        2010-10-07 22:01:57 UTC (rev 530)
@@ -46,13 +46,10 @@
!proceed with initialization of physics parameterization if moist_physics is set to true:
if(moist_physics) then
+ call physics_registry_init(config_do_restart, mesh, block % time_levs(1) % state)
call physics_wrf_interface(mesh)
call physics_init(mesh, block % time_levs(1) % state)
endif
- write(6,*)
- write(6,*) '--- end physics_init:'
- stop
-
#endif
end subroutine mpas_init
@@ -72,18 +69,14 @@
end subroutine mpas_query
-subroutine mpas_timestep(domain, itimestep, dt &
-#ifdef DO_PHYSICS
- ,n_physics, config_ntimesteps &
-#endif
- )
+subroutine mpas_timestep(domain, itimestep, dt)
use grid_types
use time_integration
#ifdef DO_PHYSICS
+ use module_physics_control
use module_physics_driver
use module_physics_manager
- use module_physics_todynamics
#endif
implicit none
@@ -91,31 +84,21 @@
type (domain_type), intent(inout) :: domain
integer, intent(in) :: itimestep
real (kind=RKIND), intent(in) :: dt
-#ifdef DO_PHYSICS
- integer, intent(in) :: n_physics, config_ntimesteps
- logical:: l_physics
-#endif
#ifdef DO_PHYSICS
-! l_physics = .false.
-! call physics_timetracker(itimestep,l_physics)
-! if(l_physics) call physics_driver(domain,itimestep)
- call timestep(domain, dt, itimestep, config_ntimesteps)
-#else
- call timestep(domain, dt)
+ !proceed with physics if moist_physics is set to true:
+ if(moist_physics) then
+ call physics_timetracker(itimestep)
+ if(l_physics) call physics_driver(domain,itimestep)
+ endif
#endif
+ call timestep(domain, dt, itimestep)
end subroutine mpas_timestep
subroutine mpas_finalize()
-#ifdef DO_PHYSICS
- use module_physics_manager
- implicit none
- call physics_wrf_deallocate
-#else
implicit none
-#endif
end subroutine mpas_finalize
</font>
</pre>