<p><b>lipscomb</b> 2012-01-10 15:45:31 -0700 (Tue, 10 Jan 2012)</p><p><br>
Added call to land_ice_vel_init<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_mpas_core.F
===================================================================
--- branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_mpas_core.F        2012-01-10 22:42:45 UTC (rev 1346)
+++ branches/land_ice/mpas/src/core_land_ice/mpas_land_ice_mpas_core.F        2012-01-10 22:45:31 UTC (rev 1347)
@@ -112,31 +112,40 @@
subroutine mpas_init_block(block, mesh, dt)
use mpas_grid_types
- use land_ice_time_integration
use mpas_rbf_interpolation
use mpas_vector_reconstruction
-
+ use land_ice_time_integration
+ use land_ice_vel, only: land_ice_vel_init
+
implicit none
type (block_type), intent(inout) :: block
type (mesh_type), intent(inout) :: mesh
real (kind=RKIND), intent(in) :: dt
+ type (dm_info) :: dminfo
+ integer :: err, err_tmp
call land_ice_compute_solve_diagnostics(dt, block % state % time_levs(1) % state, mesh)
call compute_mesh_scaling(mesh)
call mpas_rbf_interp_initialize(mesh)
call mpas_init_reconstruct(mesh)
- call mpas_reconstruct(mesh, block % state % time_levs(1) % state % u % array, &
+ call mpas_reconstruct(mesh, block % state % time_levs(1) % state % u % array, &
block % state % time_levs(1) % state % uReconstructX % array, &
block % state % time_levs(1) % state % uReconstructY % array, &
block % state % time_levs(1) % state % uReconstructZ % array, &
block % state % time_levs(1) % state % uReconstructZonal % array, &
block % state % time_levs(1) % state % uReconstructMeridional % array &
)
+
+ call land_ice_vel_init(mesh, err_tmp)
+ err = ior(err, err_tmp)
-
+ if(err == 1) then
+ call mpas_dmpar_abort(dminfo)
+ endif
+
end subroutine mpas_init_block
</font>
</pre>