Ignore:
Timestamp:
Jul 6, 2012, 9:17:33 PM (12 years ago)
Author:
steve
Message:

Changing extrapolate routines to use struct domain

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/source/anuga/shallow_water/sw_domain.h

    r8456 r8457  
    217217
    218218    centroid_coordinates = get_consecutive_array(domain, "centroid_coordinates");
    219     D->edge_coordinates = (double *) centroid_coordinates->data;
     219    D->centroid_coordinates = (double *) centroid_coordinates->data;
    220220   
    221221    max_speed = get_consecutive_array(domain, "max_speed");
    … …  
    262262
    263263
    264     printf("D->number_of_elements %ld  \n", D->number_of_elements);
    265     printf("D->epsilon %g \n", D->epsilon);
    266     printf("D->H0 %g \n", D->H0);
    267     printf("D->g %g \n", D->g);
    268     printf("D->optimise_dry_cells %ld \n", D->optimise_dry_cells);
    269     printf("D->evolve_max_timestep %g \n", D->evolve_max_timestep);
     264    printf("D->number_of_elements     %ld  \n", D->number_of_elements);
     265    printf("D->epsilon                %g \n", D->epsilon);
     266    printf("D->H0                     %g \n", D->H0);
     267    printf("D->g                      %g \n", D->g);
     268    printf("D->optimise_dry_cells     %ld \n", D->optimise_dry_cells);
     269    printf("D->evolve_max_timestep    %g \n", D->evolve_max_timestep);
    270270    printf("D->minimum_allowed_height %g \n", D->minimum_allowed_height);
    271271    printf("D->extrapolate_velocity_second_order %ld \n", D->extrapolate_velocity_second_order);
    272     printf("D->beta_w %g \n", D->beta_w);
    273     printf("D->beta_w_dry %g \n", D->beta_w_dry);
    274     printf("D->beta_uh %g \n", D->beta_uh);
    275     printf("D->beta_uh_dry %g \n", D->beta_uh_dry);
    276     printf("D->beta_vh %g \n", D->beta_vh);
    277     printf("D->beta_vh_dry %g \n", D->beta_vh_dry);
    278 
    279 
    280 
    281     printf("D->neighbours            %p \n", D->neighbours);
    282     printf("D->surrogate_neighbours  %p \n", D->surrogate_neighbours);
    283     printf("D->neighbour_edges       %p \n", D->neighbour_edges);
    284     printf("D->normals               %p \n", D->normals);
    285     printf("D->edgelengths           %p \n", D->edgelengths);
    286     printf("D->radii                 %p \n", D->radii);
    287     printf("D->areas                 %p \n", D->areas);
    288     printf("D->tri_full_flag         %p \n", D->tri_full_flag);
    289     printf("D->already_computed_flux %p \n", D->already_computed_flux);
    290     printf("D->vertex_coordinates    %p \n", D->vertex_coordinates);
    291     printf("D->neighbours %p \n", D->neighbours);
    292     printf("D->neighbours %p \n", D->neighbours);
    293     printf("D->neighbours %p \n", D->neighbours);
    294     printf("D->neighbours %p \n", D->neighbours);
    295     printf("D->neighbours %p \n", D->neighbours);
    296     printf("D->neighbours %p \n", D->neighbours);
    297     printf("D->neighbours %p \n", D->neighbours);
    298     printf("D->neighbours %p \n", D->neighbours);
    299     printf("D->neighbours %p \n", D->neighbours);
    300     printf("D->neighbours %p \n", D->neighbours);
    301     printf("D->neighbours %p \n", D->neighbours);
    302     printf("D->neighbours %p \n", D->neighbours);
    303     printf("D->neighbours %p \n", D->neighbours);
    304     printf("D->neighbours %p \n", D->neighbours);
    305     printf("D->neighbours %p \n", D->neighbours);
    306     printf("D->neighbours %p \n", D->neighbours);
    307     printf("D->neighbours %p \n", D->neighbours);
    308     printf("D->neighbours %p \n", D->neighbours);
    309     printf("D->neighbours %p \n", D->neighbours);
    310     printf("D->neighbours %p \n", D->neighbours);
    311     printf("D->neighbours %p \n", D->neighbours);
    312     printf("D->neighbours %p \n", D->neighbours);
    313 
    314 
    315 
    316 //
    317 //    edge_coordinates = get_consecutive_array(domain, "edge_coordinates");
    318 //    D->edge_coordinates = (double *) edge_coordinates->data;
    319 //
    320 //
    321 //    centroid_coordinates = get_consecutive_array(domain, "centroid_coordinates");
    322 //    D->edge_coordinates = (double *) centroid_coordinates->data;
    323 //
    324 //    max_speed = get_consecutive_array(domain, "max_speed");
    325 //    D->max_speed = (double *) max_speed->data;
    326 //
    327 //    number_of_boundaries = get_consecutive_array(domain, "number_of_boundaries");
    328 //    D->number_of_boundaries = (long *) number_of_boundaries->data;
    329 //
    330 //
    331 //
    332 //    quantities = get_python_object(domain, "quantities");
    333 //
    334 //    D->stage_edge_values     = get_python_array_data_from_dict(quantities, "stage",     "edge_values");
    335 //    D->xmom_edge_values      = get_python_array_data_from_dict(quantities, "xmomentum", "edge_values");
    336 //    D->ymom_edge_values      = get_python_array_data_from_dict(quantities, "ymomentum", "edge_values");
    337 //    D->bed_edge_values       = get_python_array_data_from_dict(quantities, "elevation", "edge_values");
    338 //
    339 //    D->stage_centroid_values     = get_python_array_data_from_dict(quantities, "stage",     "centroid_values");
    340 //    D->xmom_centroid_values      = get_python_array_data_from_dict(quantities, "xmomentum", "centroid_values");
    341 //    D->ymom_centroid_values      = get_python_array_data_from_dict(quantities, "ymomentum", "centroid_values");
    342 //    D->bed_centroid_values       = get_python_array_data_from_dict(quantities, "elevation", "centroid_values");
    343 //
    344 //    D->stage_vertex_values     = get_python_array_data_from_dict(quantities, "stage",     "vertex_values");
    345 //    D->xmom_vertex_values      = get_python_array_data_from_dict(quantities, "xmomentum", "vertex_values");
    346 //    D->ymom_vertex_values      = get_python_array_data_from_dict(quantities, "ymomentum", "vertex_values");
    347 //    D->bed_vertex_values       = get_python_array_data_from_dict(quantities, "elevation", "vertex_values");
    348 //
    349 //    D->stage_boundary_values = get_python_array_data_from_dict(quantities, "stage",     "boundary_values");
    350 //    D->xmom_boundary_values  = get_python_array_data_from_dict(quantities, "xmomentum", "boundary_values");
    351 //    D->ymom_boundary_values  = get_python_array_data_from_dict(quantities, "ymomentum", "boundary_values");
    352 //    D->bed_boundary_values   = get_python_array_data_from_dict(quantities, "elevation", "boundary_values");
    353 //
    354 //    D->stage_explicit_update = get_python_array_data_from_dict(quantities, "stage",     "explicit_update");
    355 //    D->xmom_explicit_update  = get_python_array_data_from_dict(quantities, "xmomentum", "explicit_update");
    356 //    D->ymom_explicit_update  = get_python_array_data_from_dict(quantities, "ymomentum", "explicit_update");
    357 //
     272    printf("D->beta_w                 %g \n", D->beta_w);
     273    printf("D->beta_w_dry             %g \n", D->beta_w_dry);
     274    printf("D->beta_uh                %g \n", D->beta_uh);
     275    printf("D->beta_uh_dry            %g \n", D->beta_uh_dry);
     276    printf("D->beta_vh                %g \n", D->beta_vh);
     277    printf("D->beta_vh_dry            %g \n", D->beta_vh_dry);
     278
     279
     280
     281    printf("D->neighbours             %p \n", D->neighbours);
     282    printf("D->surrogate_neighbours   %p \n", D->surrogate_neighbours);
     283    printf("D->neighbour_edges        %p \n", D->neighbour_edges);
     284    printf("D->normals                %p \n", D->normals);
     285    printf("D->edgelengths            %p \n", D->edgelengths);
     286    printf("D->radii                  %p \n", D->radii);
     287    printf("D->areas                  %p \n", D->areas);
     288    printf("D->tri_full_flag          %p \n", D->tri_full_flag);
     289    printf("D->already_computed_flux  %p \n", D->already_computed_flux);
     290    printf("D->vertex_coordinates     %p \n", D->vertex_coordinates);
     291    printf("D->edge_coordinates       %p \n", D->edge_coordinates);
     292    printf("D->centroid_coordinates   %p \n", D->centroid_coordinates);
     293    printf("D->max_speed              %p \n", D->max_speed);
     294    printf("D->number_of_boundaries   %p \n", D->number_of_boundaries);
     295    printf("D->stage_edge_values      %p \n", D->stage_edge_values);
     296    printf("D->xmom_edge_values       %p \n", D->xmom_edge_values);
     297    printf("D->ymom_edge_values       %p \n", D->ymom_edge_values);
     298    printf("D->bed_edge_values        %p \n", D->bed_edge_values);
     299    printf("D->stage_centroid_values  %p \n", D->stage_centroid_values);
     300    printf("D->xmom_centroid_values   %p \n", D->xmom_centroid_values);
     301    printf("D->ymom_centroid_values   %p \n", D->ymom_centroid_values);
     302    printf("D->bed_centroid_values    %p \n", D->bed_centroid_values);
     303    printf("D->stage_vertex_values    %p \n", D->stage_vertex_values);
     304    printf("D->xmom_vertex_values     %p \n", D->xmom_vertex_values);
     305    printf("D->ymom_vertex_values     %p \n", D->ymom_vertex_values);
     306    printf("D->bed_vertex_values      %p \n", D->bed_vertex_values);
     307    printf("D->stage_boundary_values  %p \n", D->stage_boundary_values);
     308    printf("D->xmom_boundary_values   %p \n", D->xmom_boundary_values);
     309    printf("D->ymom_boundary_values   %p \n", D->ymom_boundary_values);
     310    printf("D->bed_boundary_values    %p \n", D->bed_boundary_values);
     311    printf("D->stage_explicit_update  %p \n", D->stage_explicit_update);
     312    printf("D->xmom_explicit_update   %p \n", D->xmom_explicit_update);
     313    printf("D->ymom_explicit_update   %p \n", D->ymom_explicit_update);
     314
    358315
    359316    return 0;
Note: See TracChangeset for help on using the changeset viewer.