← Back to branch summary

~corrado-maurini/dolfin/tao

« back to all changes in this revision

Viewing changes to dolfin/fem/assemble.h

  • Committer: corrado maurini
  • Date: 2012-12-18 12:16:08 UTC
  • mfrom: (6685.78.207 trunk)
  • Revision ID: corrado.maurini@upmc.fr-20121218121608-nk82ly9jgsld9u84
updating with trunk, fix uint in TAO solver and hacking the check for tao FindTAO.cmake

Show diffs side-by-side

added added

removed removed

Lines of Context:
dolfin/fem/assemble.h
66
66
  /// Assemble tensor on sub domains
67
67
  void assemble(GenericTensor& A,
68
68
                const Form& a,
69
 
                const MeshFunction<unsigned int>* cell_domains,
70
 
                const MeshFunction<unsigned int>* exterior_facet_domains,
71
 
                const MeshFunction<unsigned int>* interior_facet_domains,
 
69
                const MeshFunction<std::size_t>* cell_domains,
 
70
                const MeshFunction<std::size_t>* exterior_facet_domains,
 
71
                const MeshFunction<std::size_t>* interior_facet_domains,
72
72
                bool reset_sparsity=true,
73
73
                bool add_values=false,
74
74
                bool finalize_tensor=true,
112
112
                       const Form& a,
113
113
                       const Form& L,
114
114
                       const std::vector<const DirichletBC*> bcs,
115
 
                       const MeshFunction<unsigned int>* cell_domains,
116
 
                       const MeshFunction<unsigned int>* exterior_facet_domains,
117
 
                       const MeshFunction<unsigned int>* interior_facet_domains,
 
115
                       const MeshFunction<std::size_t>* cell_domains,
 
116
                       const MeshFunction<std::size_t>* exterior_facet_domains,
 
117
                       const MeshFunction<std::size_t>* interior_facet_domains,
118
118
                       const GenericVector* x0,
119
119
                       bool reset_sparsity=true,
120
120
                       bool add_values=false,
128
128
                          GenericMatrix& An,
129
129
                          const Form& a,
130
130
                          const std::vector<const DirichletBC*> bcs,
131
 
                          const MeshFunction<unsigned int>* cell_domains=NULL,
132
 
                          const MeshFunction<unsigned int>* exterior_facet_domains=NULL,
133
 
                          const MeshFunction<unsigned int>* interior_facet_domains=NULL,
 
131
                          const MeshFunction<std::size_t>* cell_domains=NULL,
 
132
                          const MeshFunction<std::size_t>* exterior_facet_domains=NULL,
 
133
                          const MeshFunction<std::size_t>* interior_facet_domains=NULL,
134
134
                          bool reset_sparsity=true,
135
135
                          bool add_values=false,
136
136
                          bool finalize_tensor=true,
146
146
                          const Form& a,
147
147
                          const std::vector<const DirichletBC*> row_bcs,
148
148
                          const std::vector<const DirichletBC*> col_bcs,
149
 
                          const MeshFunction<unsigned int>* cell_domains=NULL,
150
 
                          const MeshFunction<unsigned int>* exterior_facet_domains=NULL,
151
 
                          const MeshFunction<unsigned int>* interior_facet_domains=NULL,
 
149
                          const MeshFunction<std::size_t>* cell_domains=NULL,
 
150
                          const MeshFunction<std::size_t>* exterior_facet_domains=NULL,
 
151
                          const MeshFunction<std::size_t>* interior_facet_domains=NULL,
152
152
                          bool reset_sparsity=true,
153
153
                          bool add_values=false,
154
154
                          bool finalize_tensor=true,
171
171
 
172
172
  /// Assemble scalar on sub domains
173
173
  double assemble(const Form& a,
174
 
                  const MeshFunction<unsigned int>* cell_domains,
175
 
                  const MeshFunction<unsigned int>* exterior_facet_domains,
176
 
                  const MeshFunction<unsigned int>* interior_facet_domains,
 
174
                  const MeshFunction<std::size_t>* cell_domains,
 
175
                  const MeshFunction<std::size_t>* exterior_facet_domains,
 
176
                  const MeshFunction<std::size_t>* interior_facet_domains,
177
177
                  bool reset_sparsity=true,
178
178
                  bool add_values=false,
179
179
                  bool finalize_tensor=true);