Changeset 19491

Timestamp:

08/13/15 17:21:48 (10 years ago)

Author:

glperez

Message:

FIX: Updated MumpsSolve.cpp to agree with new ADOLC.
CHG: Updated install.sh to install newest version of ADOLC.

Location:

issm/trunk-jpl

Files:

• externalpackages/adolc/install.sh (modified) (1 diff)
• src/c/toolkits/mumps/MumpsSolve.cpp (modified) (1 diff)

issm/trunk-jpl/externalpackages/adolc/install.sh

@@ -5 +5 @@
 rm -rf install src
 
-git clone -b ampi git://git.mcs.anl.gov/adol-c.git src
+git clone https://gitlab.com/adol-c/adol-c.git src
 #git reset --hard b254b2a001a1b7a024a9184cd087ae06eb975cad
 

issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp

@@ -321 +321 @@
     pack_A_rhs[local_nnz+i]=rhs[i];
   }
-  IssmPDouble *passivePack_A_rhs=xNew<IssmPDouble>(local_nnz+n);
-  IssmPDouble *passiveSol=xNew<IssmPDouble>(n);
   IssmDouble *sol=xNew<IssmDouble>(n);
   call_ext_fct(xDynamicCast<GenericParam<Adolc_edf> * >(parameters->FindParamObject(AdolcParamEnum))->GetParameterValue().myEDF_for_solverx_p,
                packedDimsSparseArrLength, packedDimsSparseArr,
-               local_nnz+n, passivePack_A_rhs, pack_A_rhs, 
-               n, passiveSol,sol);
+               local_nnz+n, pack_A_rhs, 
+               n,sol);
   for (int i=0;i<n;++i) { 
     rhs[i]=sol[i];
   }
   xDelete(sol);
-  xDelete(passiveSol);
-  xDelete(passivePack_A_rhs);
   xDelete(pack_A_rhs);
   xDelete(packedDimsSparseArr);