Mentions légales du service

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

Fix baseval

parent 3838cfae
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
spm_dofs.c
+ 3
− 3
View file @ 9ca6a78c
......@@ -64,14 +64,14 @@ spmDofExtend( const int type,
* Initialize the dofs array where the degree of freedom of vertex i is
* dof[i+1] - dof[i]
*/
*dofptr = 0;
*dofptr = baseval;
for(i=0; i<spm->n; i++, dofptr++) {
dofi = 1 + ( rand() % dof );
dofptr[1] = dofptr[0] + dofi;
}
newspm->nexp = *dofptr;
newspm->gNexp = *dofptr;
newspm->nexp = *dofptr - baseval;
newspm->gNexp = newspm->nexp;
/**
* Count the number of non zeroes
......
z_spm_print.c
+ 18
− 18
View file @ 9ca6a78c
......@@ -49,13 +49,13 @@ z_spmCSCPrint( FILE *f, const pastix_spm_t *spm )
for(j=0; j<spm->n; j++, colptr++)
{
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j] - baseval;
for(k=colptr[0]; k<colptr[1]; k++, rowptr++)
{
i = (*rowptr - baseval);
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i] - baseval;
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
......@@ -93,13 +93,13 @@ z_spmCSCPrint( FILE *f, const pastix_spm_t *spm )
for(j=0; j<spm->n; j++, colptr++)
{
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j] - baseval;
for(k=colptr[0]; k<colptr[1]; k++, rowptr++)
{
i = (*rowptr - baseval);
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i] - baseval;
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
......@@ -137,13 +137,13 @@ z_spmCSCPrint( FILE *f, const pastix_spm_t *spm )
for(j=0; j<spm->n; j++, colptr++)
{
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j] - baseval;
for(k=colptr[0]; k<colptr[1]; k++, rowptr++)
{
i = (*rowptr - baseval);
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i] - baseval;
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
......@@ -194,13 +194,13 @@ z_spmCSRPrint( FILE *f, const pastix_spm_t *spm )
for(i=0; i<spm->n; i++, rowptr++)
{
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i] - baseval;
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{
j = (*colptr - baseval);
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j] - baseval;
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
......@@ -238,13 +238,13 @@ z_spmCSRPrint( FILE *f, const pastix_spm_t *spm )
for(i=0; i<spm->n; i++, rowptr++)
{
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i] - baseval;
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{
j = (*colptr - baseval);
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j] - baseval;
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
......@@ -282,13 +282,13 @@ z_spmCSRPrint( FILE *f, const pastix_spm_t *spm )
for(i=0; i<spm->n; i++, rowptr++)
{
dofi = ( spm->dof > 0 ) ? spm->dof : dofs[i+1] - dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i];
row = ( spm->dof > 0 ) ? spm->dof * i : dofs[i] - baseval;
for(k=rowptr[0]; k<rowptr[1]; k++, colptr++)
{
j = (*colptr - baseval);
dofj = ( spm->dof > 0 ) ? spm->dof : dofs[j+1] - dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j];
col = ( spm->dof > 0 ) ? spm->dof * j : dofs[j] - baseval;
if ( spm->layout == PastixColMajor ) {
for(jj=0; jj<dofj; jj++)
......@@ -349,9 +349,9 @@ z_spmIJVPrint( FILE *f, const pastix_spm_t *spm )
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
row = dofs[i] - baseval;
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
col = dofs[j] - baseval;
}
if ( spm->layout == PastixColMajor ) {
......@@ -399,9 +399,9 @@ z_spmIJVPrint( FILE *f, const pastix_spm_t *spm )
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
row = dofs[i] - baseval;
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
col = dofs[j] - baseval;
}
if ( spm->layout == PastixColMajor ) {
......@@ -449,9 +449,9 @@ z_spmIJVPrint( FILE *f, const pastix_spm_t *spm )
}
else {
dofi = dofs[i+1] - dofs[i];
row = dofs[i];
row = dofs[i] - baseval;
dofj = dofs[j+1] - dofs[j];
col = dofs[j];
col = dofs[j] - baseval;
}
if ( spm->layout == PastixColMajor ) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment