message: Using vdim and cdim in CurlCurl and VectorFEMass integrators
diff: @@ -1592,7 +1592,7 @@ void CurlCurlIntegrator::AssembleElementMatrix
  {
  int nd = el.GetDof();
  int dim = el.GetDim();
  - int dimc = (dim == 3) ? 3 : 1;
  + int dimc = el.GetCDim();
  double w;
  #ifdef MFEM_THREAD_SAFE
  @@ -1908,16 +1908,17 @@ void VectorFEMassIntegrator::AssembleElementMatrix(
  DenseMatrix &elmat)
  {
  int dof = el.GetDof();
  + int vdim = el.GetVDim();
  int spaceDim = Trans.GetSpaceDim();
  double w;
  #ifdef MFEM_THREAD_SAFE
  Vector D(VQ ? VQ->GetVDim() : 0);
  - DenseMatrix trial_vshape(dof, spaceDim);
  + DenseMatrix trial_vshape(dof, vdim);
  DenseMatrix K(MQ ? MQ->GetVDim() : 0, MQ ? MQ->GetVDim() : 0);
  #else
  - trial_vshape.SetSize(dof, spaceDim);
  + trial_vshape.SetSize(dof, vdim);
  D.SetSize(VQ ? VQ->GetVDim() : 0);
  K.SetSize(MQ ? MQ->GetVDim() : 0, MQ ? MQ->GetVDim() : 0);
  #endif
  @@ -1976,7 +1977,7 @@ void VectorFEMassIntegrator::AssembleElementMatrix2(
  {
  // assume test_fe is scalar FE and trial_fe is vector FE
  int spaceDim = Trans.GetSpaceDim();
  - int vdim = MQ ? MQ->GetHeight() : spaceDim;
  + int vdim = trial_fe.GetVDim();
  int trial_dof = trial_fe.GetDof();
  int test_dof = test_fe.GetDof();
  double w;
  @@ -2074,18 +2075,20 @@ void VectorFEMassIntegrator::AssembleElementMatrix2(
  {
  // assume both test_fe and trial_fe are vector FE
  int spaceDim = Trans.GetSpaceDim();
  + int trial_vdim = trial_fe.GetVDim();
  + int test_vdim = test_fe.GetVDim();
  int trial_dof = trial_fe.GetDof();
  int test_dof = test_fe.GetDof();
  double w;
  #ifdef MFEM_THREAD_SAFE
  - DenseMatrix trial_vshape(trial_dof,spaceDim);
  - DenseMatrix test_vshape(test_dof,spaceDim);
  + DenseMatrix trial_vshape(trial_dof,trial_vdim);
  + DenseMatrix test_vshape(test_dof,test_vdim);
  Vector D(VQ ? VQ->GetVDim() : 0);
  DenseMatrix K(MQ ? MQ->GetVDim() : 0, MQ ? MQ->GetVDim() : 0);
  #else
  - trial_vshape.SetSize(trial_dof,spaceDim);
  - test_vshape.SetSize(test_dof,spaceDim);
  + trial_vshape.SetSize(trial_dof,trial_vdim);
  + test_vshape.SetSize(test_dof,test_vdim);
  D.SetSize(VQ ? VQ->GetVDim() : 0);
  K.SetSize(MQ ? MQ->GetVDim() : 0, MQ ? MQ->GetVDim() : 0);
  #endif
  