Index: /issm/trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 13813) @@ -169,17 +169,17 @@ int num_procs; - Patch *patch = NULL; - int *resultsenums = NULL; - int *resultssizes = NULL; - int *resultssteps = NULL; - IssmDouble *resultstimes = NULL; - IssmDouble *vector_serial= NULL; - Vector* vector = NULL; - bool io_gather; - bool results_as_patches; - int numberofvertices,numberofelements; - int numberofresults,vectorsize; - int rank; - int minrank; + Patch *patch = NULL; + int *resultsenums = NULL; + int *resultssizes = NULL; + int *resultssteps = NULL; + IssmDouble *resultstimes = NULL; + IssmDouble *vector_serial = NULL; + Vector *vector = NULL; + bool io_gather; + bool results_as_patches; + int numberofvertices ,numberofelements; + int numberofresults ,vectorsize; + int rank; + int minrank; /*recover my_rank:*/ Index: /issm/trunk-jpl/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 13813) @@ -363,11 +363,8 @@ void Inputs::DuplicateInput(int original_enum,int new_enum){ - Input* original=NULL; - Input* copy=NULL; - /*Make a copy of the original input: */ - original=dynamic_cast(this->GetInput(original_enum)); + Input* original=dynamic_cast(this->GetInput(original_enum)); if(!original)_error_("could not find input with enum: " << EnumToStringx(original_enum)); - copy=dynamic_cast(original->copy()); + Input* copy=dynamic_cast(original->copy()); /*Change copy enum to reinitialized_enum: */ @@ -407,10 +404,7 @@ void Inputs::AXPY(int MeshYEnum, IssmDouble scalar, int MeshXEnum){ - Input* xinput=NULL; - Input* yinput=NULL; - /*Find x and y inputs: */ - xinput=dynamic_cast(this->GetInput(MeshXEnum)); - yinput=dynamic_cast(this->GetInput(MeshYEnum)); + Input* xinput=dynamic_cast(this->GetInput(MeshXEnum)); + Input* yinput=dynamic_cast(this->GetInput(MeshYEnum)); /*some checks: */ Index: /issm/trunk-jpl/src/c/Container/Nodes.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 13813) @@ -153,6 +153,5 @@ int i; int num_procs; - - int numnodes; + int numnodes; /*recover num_procs: */ Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 13813) @@ -827,5 +827,4 @@ /*Intermediary*/ - int i; int num_responses; Element *element = NULL; Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13813) @@ -4565,7 +4565,4 @@ ElementMatrix* Penta::CreateKMatrixAdjointPattyn(void){ - /*Constants*/ - const int numdof=NDOF2*NUMVERTICES; - /*Intermediaries */ int i,j; @@ -6781,5 +6778,5 @@ /*Intermediaries */ - int i,j,approximation; + int i,approximation; IssmDouble Jdet,viscosity,stokesreconditioning; IssmDouble xyz_list[NUMVERTICES][3]; @@ -6932,5 +6929,4 @@ /*Intermediaries */ - int i,j; IssmDouble Jdet; IssmDouble xyz_list[NUMVERTICES][3]; @@ -7188,5 +7184,5 @@ /*Intermediaries */ - int i,j; + int i; int approximation; IssmDouble viscosity,Jdet; @@ -7397,7 +7393,4 @@ ElementVector* Penta::CreatePVectorDiagnosticHutter(void){ - /*Constants*/ - const int numdofs=NDOF2*NUMVERTICES; - /*Intermediaries*/ int i,j; Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13813) @@ -405,5 +405,5 @@ /*Intermediaries */ - int i,j,dim; + int dim; IssmDouble xyz_list[NUMVERTICES][3]; IssmDouble Jdettria,dt,vx,vy; @@ -593,5 +593,4 @@ /*Intermediaries */ - int i,j; IssmDouble Jdettria,dt; IssmDouble surface_mass_balance_g,basal_melting_g,basal_melting_correction_g,thickness_g; @@ -629,5 +628,5 @@ basal_melting_correction_g=0.; - for(i=0;ivalues[i]+=Jdettria*gauss->weight*(thickness_g+dt*(surface_mass_balance_g-basal_melting_g-basal_melting_correction_g))*L[i]; + for(int i=0;ivalues[i]+=Jdettria*gauss->weight*(thickness_g+dt*(surface_mass_balance_g-basal_melting_g-basal_melting_correction_g))*L[i]; } @@ -644,5 +643,4 @@ /*Intermediaries */ - int i,j; IssmDouble Jdettria,dt; IssmDouble surface_mass_balance_g,basal_melting_g,thickness_g; @@ -674,5 +672,5 @@ thickness_input->GetInputValue(&thickness_g,gauss); - for(i=0;ivalues[i]+=Jdettria*gauss->weight*(thickness_g+dt*(surface_mass_balance_g-basal_melting_g))*L[i]; + for(int i=0;ivalues[i]+=Jdettria*gauss->weight*(thickness_g+dt*(surface_mass_balance_g-basal_melting_g))*L[i]; } @@ -689,5 +687,5 @@ /*Intermediaries */ - int i,j; + int i; int analysis_type; IssmDouble Jdet; @@ -1375,10 +1373,11 @@ void Tria::InputToResult(int enum_type,int step,IssmDouble time){ - int i; Input *input = NULL; /*Go through all the input objects, and find the one corresponding to enum_type, if it exists: */ - if (enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyZbarEnum) input=this->material->inputs->GetInput(enum_type); - else input=this->inputs->GetInput(enum_type); + if (enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyZbarEnum) + input=this->material->inputs->GetInput(enum_type); + else + input=this->inputs->GetInput(enum_type); //if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found in tria->inputs"); if(!input)return; @@ -2564,13 +2563,12 @@ IssmDouble Tria::MassFlux( IssmDouble* segment,bool process_units){ - const int numdofs=2; - - int i,dim; - IssmDouble mass_flux=0; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble normal[2]; - IssmDouble length,rho_ice; - IssmDouble x1,y1,x2,y2,h1,h2; - IssmDouble vx1,vx2,vy1,vy2; + const int numdofs=2; + int dim; + IssmDouble mass_flux=0; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble normal[2]; + IssmDouble length,rho_ice; + IssmDouble x1,y1,x2,y2,h1,h2; + IssmDouble vx1,vx2,vy1,vy2; GaussTria* gauss_1=NULL; GaussTria* gauss_2=NULL; @@ -3987,10 +3985,9 @@ /* Intermediaries */ - int ig; - IssmDouble Jelem = 0; - IssmDouble weight; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dp[NDOF2]; + IssmDouble Jelem = 0; + IssmDouble weight; + IssmDouble Jdet; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dp[NDOF2]; GaussTria *gauss = NULL; @@ -4030,7 +4027,4 @@ IssmDouble Tria::SurfaceAverageVelMisfit(bool process_units,int weight_index){ - const int numdof=2*NUMVERTICES; - - int i; IssmDouble Jelem=0,S,Jdet; IssmDouble misfit; @@ -4091,7 +4085,4 @@ IssmDouble Tria::SurfaceLogVelMisfit(bool process_units,int weight_index){ - const int numdof=NDOF2*NUMVERTICES; - - int i; IssmDouble Jelem=0; IssmDouble misfit,Jdet; @@ -4156,7 +4147,4 @@ IssmDouble Tria::SurfaceLogVxVyMisfit(bool process_units,int weight_index){ - const int numdof=NDOF2*NUMVERTICES; - - int i; int fit=-1; IssmDouble Jelem=0, S=0; @@ -4222,6 +4210,4 @@ IssmDouble Tria::SurfaceAbsVelMisfit(bool process_units,int weight_index){ - const int numdof=NDOF2*NUMVERTICES; - IssmDouble Jelem=0; IssmDouble misfit,Jdet; @@ -4281,5 +4267,4 @@ /*FUNCTION Tria::SurfaceRelVelMisfit {{{*/ IssmDouble Tria::SurfaceRelVelMisfit(bool process_units,int weight_index){ - const int numdof=2*NUMVERTICES; IssmDouble Jelem=0; @@ -4346,10 +4331,9 @@ /* Intermediaries */ - int ig; - IssmDouble Jelem = 0; - IssmDouble weight; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dp[NDOF2]; + IssmDouble Jelem = 0; + IssmDouble weight; + IssmDouble Jdet; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dp[NDOF2]; GaussTria *gauss = NULL; @@ -4390,5 +4374,4 @@ /* Intermediaries */ - int ig; IssmDouble Jelem = 0; IssmDouble weight; @@ -4442,5 +4425,4 @@ /* Intermediaries */ - int ig; IssmDouble Jelem = 0; IssmDouble weight; @@ -4494,5 +4476,4 @@ /*Intermediaries*/ - int i; IssmDouble thickness,thicknessobs,weight; IssmDouble Jdet; @@ -4994,10 +4975,9 @@ /* Intermediaries */ - int ig; - IssmDouble Jelem = 0; - IssmDouble weight; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dp[NDOF2]; + IssmDouble Jelem = 0; + IssmDouble weight; + IssmDouble Jdet; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dp[NDOF2]; GaussTria *gauss = NULL; @@ -5316,5 +5296,4 @@ /*Intermediaries */ IssmDouble diffusivity; - int i,j; IssmDouble Jdettria,DL_scalar,dt,h; IssmDouble vx,vy,vel,dvxdx,dvydy; Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13813) @@ -100,9 +100,9 @@ output->control_id=this->control_id; - if(values) output->values=(Input*)this->values->copy(); - if(savedvalues) output->savedvalues=(Input*)this->savedvalues->copy(); - if(minvalues) output->minvalues=(Input*)this->minvalues->copy(); - if(maxvalues) output->maxvalues=(Input*)this->maxvalues->copy(); - if(gradient) output->gradient=(Input*)this->gradient->copy(); + if(values) output->values = dynamic_cast(this->values->copy()); + if(savedvalues) output->savedvalues = dynamic_cast(this->savedvalues->copy()); + if(minvalues) output->minvalues = dynamic_cast(this->minvalues->copy()); + if(maxvalues) output->maxvalues = dynamic_cast(this->maxvalues->copy()); + if(gradient) output->gradient = dynamic_cast(this->gradient->copy()); return output; @@ -255,5 +255,5 @@ if(savedvalues) delete this->savedvalues; - this->savedvalues=(Input*)this->values->copy(); + this->savedvalues=dynamic_cast(this->values->copy()); }/*}}}*/ /*FUNCTION ControlInput::UpdateValue{{{*/ @@ -263,5 +263,5 @@ if(values) delete this->values; - this->values=(Input*)this->savedvalues->copy(); + this->values=dynamic_cast(this->savedvalues->copy()); this->values->AXPY(gradient,scalar); }/*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13813) @@ -83,5 +83,5 @@ outinput=new DatasetInput(); outinput->enum_type=this->enum_type; - outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(indices); + outinput->inputs=dynamic_cast(this->inputs->SpawnTriaInputs(indices)); /*Assign output*/ @@ -110,5 +110,5 @@ /*Get requested input within dataset*/ if(index<0 || index > inputs->Size()-1) _error_("index requested (" << index << ") exceeds dataset size (" << inputs->Size() << ")"); - Input* input=(Input*)this->inputs->GetObjectByOffset(index); + Input* input=dynamic_cast(this->inputs->GetObjectByOffset(index)); input->GetInputValue(pvalue,gauss); Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 13813) @@ -472,8 +472,7 @@ ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal3d(void){ - Icefront* icefront=NULL; - Penta* penta=NULL; - Tria* tria=NULL; - bool onbed; + Icefront *icefront = NULL; + Penta *penta = NULL; + Tria *tria = NULL; /*Cast element onto Penta*/ Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13813) @@ -13,5 +13,4 @@ double* xc=NULL; double* yc=NULL; - double value; /*output: */ @@ -33,5 +32,4 @@ /*Assign output pointers: */ *pflags=flags; - return 1; } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13813) @@ -16,8 +16,6 @@ /*variable declarations: {{{*/ - int i,j,k; - + int i; Parameters* parameters = NULL; - int second_count; int* part=NULL; @@ -39,6 +37,4 @@ char tag[50]; - int M; - int m,n; bool dakota_analysis=false; char* name=NULL; Index: /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13813) @@ -58,4 +58,6 @@ /*Display message*/ + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); if(VerboseModule()) _pprintLine_(" Solving"); #if _PETSC_MAJOR_ < 3 || (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ < 2) @@ -71,4 +73,6 @@ *puf=NewVec(0,IssmComm::GetComm()); return; } + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); /*Initial guess */ @@ -85,4 +89,6 @@ } else{ + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); MatGetLocalSize(Kff,&local_m,&local_n);uf=NewVec(local_n,IssmComm::GetComm(),fromlocalsize); } @@ -104,4 +110,6 @@ KSPSetOperators(ksp,Kff,Kff,DIFFERENT_NONZERO_PATTERN); KSPSetFromOptions(ksp); + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); #if _PETSC_MAJOR_==3 @@ -115,4 +123,6 @@ #endif } + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); /*Stokes: */ @@ -146,5 +156,9 @@ /*Solve: */ if(VerboseSolver())KSPView(ksp,PETSC_VIEWER_STDOUT_WORLD); + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); KSPSolve(ksp,pf,uf); + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); /*Check convergence*/ @@ -153,4 +167,6 @@ /*Free resources:*/ + PetscSynchronizedPrintf(MPI_COMM_WORLD,"-------------- file: SolverxPetsc.cpp line: %i\n",__LINE__); + PetscSynchronizedFlush(MPI_COMM_WORLD); KSPFree(&ksp); Index: /issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (revision 13813) @@ -24,5 +24,5 @@ #ifdef _HAVE_GSL_ /*Intermediary: */ - int M,N,N2,s; + int M,N,N2; SeqVec *uf = NULL; Index: /issm/trunk-jpl/src/c/shared/Exp/exp.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/exp.h (revision 13812) +++ /issm/trunk-jpl/src/c/shared/Exp/exp.h (revision 13813) @@ -170,5 +170,4 @@ doubletype **pprofx = NULL; doubletype **pprofy = NULL; - Contour *contour = NULL; /*output: */ Index: /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 13813) @@ -43,15 +43,12 @@ int DakotaSpawnCore(double* d_responses, int d_numresponses, double* d_variables, char** d_variables_descriptors,int d_numvariables, void* void_femmodel,int counter){ - int i; - - char **responses_descriptors = NULL; //these are our! there are only numresponsedescriptors of them, not d_numresponses!!! - int numresponsedescriptors; - char *string = NULL; - int string_length; - int solution_type; - bool control_analysis = false; - void (*solutioncore)(FemModel*) = NULL; - FemModel* femmodel = NULL; - bool nodakotacore = true; + char **responses_descriptors = NULL; //these are our! there are only numresponsedescriptors of them, not d_numresponses!!! + int numresponsedescriptors; + char *string = NULL; + int solution_type; + bool control_analysis = false; + void (*solutioncore)(FemModel*) = NULL; + FemModel *femmodel = NULL; + bool nodakotacore = true; /*If counter==-1 on cpu0, it means that the dakota runs are done. In which case, bail out and return 0: */ Index: /issm/trunk-jpl/src/c/solutions/issm.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 13812) +++ /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 13813) @@ -21,4 +21,5 @@ /*Output results: */ femmodel->OutputResults(); + _error_("STOP HERE"); /*Wrap up: */ @@ -26,5 +27,5 @@ /*Finalize environment:*/ - EnvironmentFinalize(); + //EnvironmentFinalize(); /*Finalize exception trapping: */