Mentions légales du service

Skip to content
Snippets Groups Projects
Commit b90b5a29 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Cleaned up the spm_2dense

parent b0e9a465
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 56 additions and 35 deletions
z_spm_2dense.c
+ 56
− 35
View file @ b90b5a29
...@@ -104,14 +104,14 @@ z_spmCSC2dense( const pastix_spm_t *spm ) ...@@ -104,14 +104,14 @@ z_spmCSC2dense( const pastix_spm_t *spm )
case PastixHermitian: case PastixHermitian:
for(j=0; j<spm->n; j++, colptr++) for(j=0; j<spm->n; j++, colptr++)
{ {
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j];
col = dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j];
for(k=colptr[0]; k<colptr[1]; k++, rowptr++) for(k=colptr[0]; k<colptr[1]; k++, rowptr++)
{ {
i = (*rowptr - baseval); i = (*rowptr - baseval);
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i];
row = dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i];
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -128,14 +128,14 @@ z_spmCSC2dense( const pastix_spm_t *spm ) ...@@ -128,14 +128,14 @@ z_spmCSC2dense( const pastix_spm_t *spm )
case PastixSymmetric: case PastixSymmetric:
for(j=0; j<spm->n; j++, colptr++) for(j=0; j<spm->n; j++, colptr++)
{ {
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j];
col = dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j];
for(k=colptr[0]; k<colptr[1]; k++, rowptr++) for(k=colptr[0]; k<colptr[1]; k++, rowptr++)
{ {
i = (*rowptr - baseval); i = (*rowptr - baseval);
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i];
row = dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i];
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -152,14 +152,14 @@ z_spmCSC2dense( const pastix_spm_t *spm ) ...@@ -152,14 +152,14 @@ z_spmCSC2dense( const pastix_spm_t *spm )
default: default:
for(j=0; j<spm->n; j++, colptr++) for(j=0; j<spm->n; j++, colptr++)
{ {
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j];
col = dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j];
for(k=colptr[0]; k<colptr[1]; k++, rowptr++) for(k=colptr[0]; k<colptr[1]; k++, rowptr++)
{ {
i = (*rowptr - baseval); i = (*rowptr - baseval);
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i];
row = dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i];
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -255,14 +255,14 @@ z_spmCSR2dense( const pastix_spm_t *spm ) ...@@ -255,14 +255,14 @@ z_spmCSR2dense( const pastix_spm_t *spm )
case PastixHermitian: case PastixHermitian:
for(i=0; i<spm->n; i++, rowptr++) for(i=0; i<spm->n; i++, rowptr++)
{ {
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i];
row = dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i];
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++) for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{ {
j = (*colptr - baseval); j = (*colptr - baseval);
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j];
col = dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j];
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -280,13 +280,13 @@ z_spmCSR2dense( const pastix_spm_t *spm ) ...@@ -280,13 +280,13 @@ z_spmCSR2dense( const pastix_spm_t *spm )
for(i=0; i<spm->n; i++, rowptr++) for(i=0; i<spm->n; i++, rowptr++)
{ {
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i];
row = dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i];
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++) for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{ {
j = (*colptr - baseval); j = (*colptr - baseval);
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j];
col = dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j];
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -304,13 +304,13 @@ z_spmCSR2dense( const pastix_spm_t *spm ) ...@@ -304,13 +304,13 @@ z_spmCSR2dense( const pastix_spm_t *spm )
for(i=0; i<spm->n; i++, rowptr++) for(i=0; i<spm->n; i++, rowptr++)
{ {
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i];
row = dofs[i]; row = ( spm->dof > 1 ) ? (spm->dof * i) : dofs[i];
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++) for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{ {
j = (*colptr - baseval); j = (*colptr - baseval);
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j];
col = dofs[j]; col = ( spm->dof > 1 ) ? (spm->dof * j) : dofs[j];
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -406,11 +406,18 @@ z_spmIJV2dense( const pastix_spm_t *spm ) ...@@ -406,11 +406,18 @@ z_spmIJV2dense( const pastix_spm_t *spm )
i = *rowptr - baseval; i = *rowptr - baseval;
j = *colptr - baseval; j = *colptr - baseval;
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; if ( spm->dof > 1 ) {
row = dofs[i]; dofi = spm->dof;
row = spm->dof * i;
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = spm->dof;
col = dofs[j]; col = spm->dof * j;
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
}
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -435,11 +442,18 @@ z_spmIJV2dense( const pastix_spm_t *spm ) ...@@ -435,11 +442,18 @@ z_spmIJV2dense( const pastix_spm_t *spm )
i = *rowptr - baseval; i = *rowptr - baseval;
j = *colptr - baseval; j = *colptr - baseval;
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; if ( spm->dof > 1 ) {
row = dofs[i]; dofi = spm->dof;
row = spm->dof * i;
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = spm->dof;
col = dofs[j]; col = spm->dof * j;
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
}
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
...@@ -459,11 +473,18 @@ z_spmIJV2dense( const pastix_spm_t *spm ) ...@@ -459,11 +473,18 @@ z_spmIJV2dense( const pastix_spm_t *spm )
i = *rowptr - baseval; i = *rowptr - baseval;
j = *colptr - baseval; j = *colptr - baseval;
dofi = ( spm->dof > 1 ) ? spm->dof : dofs[i+1] - dofs[i]; if ( spm->dof > 1 ) {
row = dofs[i]; dofi = spm->dof;
row = spm->dof * i;
dofj = ( spm->dof > 1 ) ? spm->dof : dofs[j+1] - dofs[j]; dofj = spm->dof;
col = dofs[j]; col = spm->dof * j;
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
}
for(jj=0; jj<dofj; jj++) for(jj=0; jj<dofj; jj++)
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment