Ignore:
Timestamp:
04/20/12 19:07:47 (13 years ago)
Author:
Eric.Larour
Message:

Stripped out the following layers:
METIS: if not running with MPI, do not partition!
MPI: can now run without PETSC and MPI, just using the gsl matrix format.
PETSC and MPI: idem.

Can not run MPI and PETSC separately.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp

    r12016 r12102  
    3232        }
    3333
     34        #ifdef _HAVE_MPI_
    3435        MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
    3536        MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD);               
    3637        found=mpi_found;
     38        #endif
    3739
    3840        return found;
    … …  
    9395        }
    9496
     97        #ifdef _HAVE_MPI_
    9598        MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
    9699        MPI_Bcast(&sum_num_unstable_constraints,1,MPI_INT,0,MPI_COMM_WORLD);               
    97100        num_unstable_constraints=sum_num_unstable_constraints;
     101        #endif
    98102       
    99103        /*Assign output pointers: */
    … …  
    131135       
    132136        /*Is there just one found? that would mean we have frozen! : */
     137        #ifdef _HAVE_MPI_
    133138        MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_MAX,0,MPI_COMM_WORLD );
    134139        MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD);               
    135140        found=mpi_found;
     141        #endif
    136142
    137143        return found;
    … …  
    189195        }
    190196
     197        #ifdef _HAVE_MPI_
    191198        MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
    192199        MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD);               
    193200        found=mpi_found;
     201        #endif
    194202
    195203        return found;
    … …  
    220228        }
    221229
     230        #ifdef _HAVE_MPI_
    222231        MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
    223232        MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD);               
    224233        found=mpi_found;
     234        #endif
    225235
    226236        if (found){
    … …  
    279289        }
    280290
     291        #ifdef _HAVE_MPI_
    281292        MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
    282293        MPI_Bcast(&sum_num_unstable_constraints,1,MPI_INT,0,MPI_COMM_WORLD);               
    283294        num_unstable_constraints=sum_num_unstable_constraints;
     295        #endif
    284296       
    285297        /*Assign output pointers: */
    … …  
    317329        }
    318330
     331        #ifdef _HAVE_MPI_
    319332        MPI_Reduce (&max_penetration,&mpi_max_penetration,1,MPI_DOUBLE,MPI_MAX,0,MPI_COMM_WORLD );
    320333        MPI_Bcast(&mpi_max_penetration,1,MPI_DOUBLE,0,MPI_COMM_WORLD);               
    321334        max_penetration=mpi_max_penetration;
     335        #endif
    322336
    323337        /*feed max_penetration to inputs: */
    … …  
    354368        }
    355369
     370        #ifdef _HAVE_MPI_
    356371        MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
    357372        MPI_Bcast(&sum_num_unstable_constraints,1,MPI_INT,0,MPI_COMM_WORLD);               
    358373        num_unstable_constraints=sum_num_unstable_constraints;
     374        #endif
    359375
    360376        return num_unstable_constraints;
Note: See TracChangeset for help on using the changeset viewer.