Index: /issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp (revision 13621) @@ -24,5 +24,5 @@ switch(solutiontype){ - + case DiagnosticSolutionEnum: adjointcore=&adjointdiagnostic_core; @@ -38,5 +38,5 @@ break; } - + /*Assign output pointer:*/ _assert_(padjointcore); Index: /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 13621) @@ -26,5 +26,5 @@ /*Analyses lists*/ switch(solutiontype){ - + case DiagnosticSolutionEnum: numanalyses=5; @@ -56,5 +56,5 @@ analyses[1]=MeltingAnalysisEnum; break; - + case EnthalpySolutionEnum: numanalyses=1; @@ -62,5 +62,5 @@ analyses[0]=EnthalpyAnalysisEnum; break; - + case HydrologySolutionEnum: numanalyses=3; @@ -108,5 +108,5 @@ analyses[8]=PrognosticAnalysisEnum; break; - + default: _error_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!"); Index: /issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 13621) @@ -27,5 +27,5 @@ bool tao_analysis=false; bool dakota_analysis=false; - + /* retrieve some parameters that tell us whether wrappers are allowed, or whether we return * a pure core. Wrappers can be dakota_core (which samples many solution_cores) or control_core (which Index: /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 13621) @@ -1,4 +1,4 @@ /*!\file: DakotaSpawnCore.cpp - + * \brief: run core ISSM solution using Dakota inputs coming from CPU 0. * \sa qmu.cpp DakotaPlugin.cpp @@ -27,5 +27,4 @@ #endif - #include "../classes/objects/objects.h" #include "../io/io.h" @@ -43,7 +42,7 @@ /*Notice the d_, which prefixes anything that is being provided to us by the Dakota pluggin. Careful. some things are ours, some are dakotas!: */ 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; @@ -55,5 +54,4 @@ 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: */ @@ -70,5 +68,5 @@ femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum); - + if(VerboseQmu()) _pprintLine_("qmu iteration: " << counter); @@ -89,5 +87,5 @@ if(VerboseQmu()) _pprintLine_("compute dakota responses:"); DakotaResponsesx(d_responses,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,responses_descriptors,numresponsedescriptors,d_numresponses); - + /*Free ressources:*/ DakotaFree(&d_variables,&d_variables_descriptors,&responses_descriptors, d_numvariables, numresponsedescriptors); @@ -126,5 +124,5 @@ /*numvariables: */ MPI_Bcast(&numvariables,1,MPI_INT,0,IssmComm::GetComm()); - + /*variables:*/ if(my_rank!=0)variables=xNew(numvariables); @@ -156,10 +154,10 @@ } /*}}}*/ void DakotaFree(double** pvariables,char*** pvariables_descriptors,char*** presponses_descriptors,int numvariables,int numresponses){ /*{{{*/ - + /*\brief DakotaFree: free allocations on other cpus, not done by Dakota.*/ int i; int my_rank; - + double *variables = NULL; char **variables_descriptors = NULL; @@ -184,5 +182,5 @@ xDelete(variables_descriptors); } - + //responses descriptors on every cpu for(i=0;i* yg = NULL; @@ -16,5 +16,5 @@ if(VerboseSolution()) _pprintLine_(" updating boundary conditions..."); - + /*set current analysis: */ femmodel->SetCurrentConfiguration(analysis_type); Index: /issm/trunk-jpl/src/c/solutions/ad_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/ad_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/ad_core.cpp (revision 13621) @@ -9,5 +9,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - #include @@ -24,5 +23,5 @@ void ad_core(FemModel* femmodel){ - + /*diverse: */ int i; @@ -45,5 +44,4 @@ #ifdef _HAVE_ADOLC_ - /*First, stop tracing: */ trace_off(); @@ -53,7 +51,7 @@ femmodel->parameters->FindParam(&num_independents,AutodiffNumIndependentsEnum); if(!(num_dependents*num_independents)) return; - + if(VerboseAutodiff())_pprintLine_(" start ad core"); - + /*retrieve state variable: */ femmodel->parameters->FindParam(&axp,&dummy,AutodiffXpEnum); @@ -76,21 +74,21 @@ if (strcmp(driver,"fos_forward")==0){ - + int anIndepIndex; double *tangentDir = NULL; double *jacTimesTangentDir = NULL; double *theOutput = NULL; - + /*retrieve direction index: */ femmodel->parameters->FindParam(&anIndepIndex,AutodiffFosForwardIndexEnum); - + if (anIndepIndex<0 || anIndepIndex>=num_independents) _error_("index value for AutodiffFosForwardIndexEnum should be in [0,num_independents-1]"); tangentDir=xNewZeroInit(num_independents); tangentDir[anIndepIndex]=1.0; - + jacTimesTangentDir=xNew(num_dependents); theOutput=xNew(num_dependents); - + /*set the forward method function pointer: */ anEDF_for_solverx_p->fos_forward=EDF_fos_forward_for_solverx; @@ -105,5 +103,5 @@ /*add to results*/ femmodel->results->AddObject(new GenericExternalResult(femmodel->results->Size()+1,AutodiffJacobianEnum,jacTimesTangentDir,num_dependents,1,1,0.0)); - + /*free resources :*/ xDelete(theOutput); @@ -112,5 +110,5 @@ } else if ((strcmp(driver,"fov_forward")==0) || (strcmp(driver,"fov_forward_all")==0)){ - + int tangentDirNum; int dummy; @@ -120,6 +118,5 @@ double *theOutput = NULL; std::set anIndexSet; - - + /*retrieve directions:*/ if (strcmp(driver,"fov_forward_all")==0){ @@ -137,5 +134,5 @@ /* full Jacobian or Jacobian projection:*/ jacTimesSeed=xNew(num_dependents,tangentDirNum); - + /*set the forward method function pointers: */ anEDF_for_solverx_p->fov_forward=EDF_fov_forward_for_solverx; @@ -223,5 +220,4 @@ std::set anIndexSet; - /*retrieve directions:*/ if (strcmp(driver,"fov_reverse_all")==0){ @@ -278,5 +274,4 @@ else _error_("driver: " << driver << " not yet supported!"); - /* delete the allocated space for the parameters:*/ xDelete(anEDF_for_solverx_p->dp_x); @@ -290,5 +285,5 @@ xDelete(anEDF_for_solverx_p->dp_Z); xDelete(anEDF_for_solverx_p->dpp_Z); - + /*Print statistics:*/ tapestats(1,tape_stats); //reading of tape statistics @@ -303,5 +298,5 @@ } if(VerboseAutodiff())_pprintLine_(" end AD core"); - + /*Free resources: */ xDelete(xp); Index: /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 13621) @@ -14,5 +14,5 @@ void adjointbalancethickness_core(FemModel* femmodel){ - + /*parameters: */ bool save_results; @@ -33,5 +33,5 @@ femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum,AdjointBalancethicknessAnalysisEnum); solver_adjoint_linear(femmodel); - + /*Save results*/ if(save_results){ Index: /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 13621) @@ -14,5 +14,5 @@ void adjointdiagnostic_core(FemModel* femmodel){ - + /*parameters: */ bool isstokes; @@ -36,5 +36,5 @@ femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum); solver_adjoint_linear(femmodel); - + /*Save results*/ if(save_results){ Index: /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp (revision 13621) @@ -20,5 +20,5 @@ /*activate formulation: */ femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum); - + /*recover parameters: */ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); Index: /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 13621) @@ -26,5 +26,5 @@ femmodel->SetCurrentConfiguration(BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum); solver_linear(femmodel); - + if(save_results){ if(VerboseSolution()) _pprintLine_(" saving results"); Index: /issm/trunk-jpl/src/c/solutions/control_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 13621) @@ -16,5 +16,5 @@ int i,n; - + /*parameters: */ int num_controls,num_responses; @@ -32,5 +32,5 @@ IssmDouble* maxiter=NULL; IssmDouble* cm_jump=NULL; - + /*intermediary: */ IssmDouble search_scalar=1; @@ -72,9 +72,9 @@ J=xNew(nsteps); step_responses=xNew(num_responses); - + /*Initialize some of the BrentSearch arguments: */ optargs.femmodel=femmodel; optpars.xmin=0; optpars.xmax=1; - + /*Start looping: */ for(n=0;n(responses[n*num_responses+i]); femmodel->parameters->SetParam(step_responses,1,num_responses,StepResponsesEnum); - + /*In steady state inversion, compute new temperature field now*/ if(solution_type==SteadystateSolutionEnum) solutioncore(femmodel); @@ -104,5 +104,5 @@ if(VerboseControl()) _pprintLine_(" updating parameter using optimized search scalar"); //true means update save controls InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,true); - + if(controlconvergence(J[n],tol_cm)) break; } Index: /issm/trunk-jpl/src/c/solutions/dakota_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 13621) @@ -54,7 +54,6 @@ void dakota_core(FemModel* femmodel){ + #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in. - #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in. - int my_rank; char* dakota_input_file = NULL; @@ -69,10 +68,10 @@ femmodel->parameters->FindParam(&dakota_output_file,QmuOutNameEnum); femmodel->parameters->FindParam(&dakota_error_file,QmuErrNameEnum); - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); if(my_rank==0){ - + // Instantiate/initialize the parallel library and problem description // database objects. @@ -105,9 +104,9 @@ interface.assign_rep(new SIM::DakotaPlugin(problem_db,(void*)femmodel), false); } - + // Execute the strategy problem_db.lock(); // prevent run-time DB queries selected_strategy.run_strategy(); - + //Warn other cpus that we are done running the dakota iterator, by setting the counter to -1: DakotaSpawnCore(NULL,0, NULL,NULL,0,femmodel,-1); Index: /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 13621) @@ -60,5 +60,5 @@ if(ishutter){ - + if(VerboseSolution()) _pprintLine_(" computing hutter velocities"); @@ -68,10 +68,10 @@ femmodel->SetCurrentConfiguration(DiagnosticHutterAnalysisEnum); solver_linear(femmodel); - + if (ismacayealpattyn) ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum); } if ((ismacayealpattyn || isl1l2) ^ isstokes){ // ^ = xor - + if(VerboseSolution()) _pprintLine_(" computing velocities"); femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); @@ -105,5 +105,5 @@ RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs); } - + if(solution_type==DiagnosticSolutionEnum)RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); Index: /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 13621) @@ -44,5 +44,5 @@ /*Loop through time: */ for(i=0;ielements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVxEnum,i+1,time); //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,HydrologyWaterVyEnum,i+1,time); - + /*unload results*/ if(VerboseSolution()) _pprintLine_(" saving temporary results"); @@ -64,3 +64,2 @@ } } - Index: /issm/trunk-jpl/src/c/solutions/hydrology_core_step.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/hydrology_core_step.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/hydrology_core_step.cpp (revision 13621) @@ -14,5 +14,5 @@ void hydrology_core_step(FemModel* femmodel,int step, IssmDouble time){ - + bool modify_loads=true; Index: /issm/trunk-jpl/src/c/solutions/issm.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 13621) @@ -4,7 +4,6 @@ #include "../issm.h" - + int main(int argc,char **argv){ - /*Initialize exception trapping: */ @@ -22,5 +21,5 @@ /*Output results: */ femmodel->OutputResults(); - + /*Wrap up: */ delete femmodel; Index: /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 13621) @@ -23,8 +23,8 @@ int i; - + /*output: */ IssmDouble J; - + /*parameters: */ int solution_type,analysis_type; Index: /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 13621) @@ -23,5 +23,5 @@ /*activate formulation: */ femmodel->SetCurrentConfiguration(PrognosticAnalysisEnum); - + /*recover parameters: */ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); @@ -47,5 +47,5 @@ if(VerboseSolution()) _pprintLine_(" call computational core"); solver_linear(femmodel); - + if(save_results){ if(VerboseSolution()) _pprintLine_(" saving results"); @@ -53,7 +53,7 @@ RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs); } - + if(solution_type==PrognosticSolutionEnum)RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); - + /*Free ressources:*/ xDelete(requested_outputs); Index: /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 13621) @@ -29,5 +29,5 @@ int numoutputs = 0; int *requested_outputs = NULL; - + /* recover parameters:*/ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); @@ -42,5 +42,5 @@ for(;;){ - + if(VerboseSolution()) _pprintLine_(" computing temperature and velocity for step: " << step); #ifdef _HAVE_THERMAL_ @@ -66,5 +66,5 @@ break; } - + if(VerboseSolution()) _pprintLine_(" saving velocity, temperature and pressure to check for convergence at next step"); InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxPicardEnum); @@ -73,9 +73,9 @@ InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressurePicardEnum); InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureOldEnum); - + //increase counter step++; } - + if(save_results){ if(VerboseSolution()) _pprintLine_(" saving results"); Index: /issm/trunk-jpl/src/c/solutions/steadystateconvergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/steadystateconvergence.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/steadystateconvergence.cpp (revision 13621) @@ -18,5 +18,5 @@ bool steadystateconvergence(FemModel* femmodel){ - + /*output: */ bool converged=false; @@ -32,5 +32,5 @@ /*retrieve parameters: */ femmodel->parameters->FindParam(&convergencecriterionvalue[0],SteadystateReltolEnum); - + /*figure out convergence at the input level, because we don't have the solution vectors!: */ velocity_converged=InputConvergencex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,&velocityenums[0],8,&convergencecriterion[0],&convergencecriterionvalue[0],1); Index: /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 13621) @@ -26,5 +26,5 @@ femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum); solver_linear(femmodel); - + if(save_results){ if(VerboseSolution()) _pprintLine_("saving results:"); Index: /issm/trunk-jpl/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 13620) +++ /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 13621) @@ -31,5 +31,5 @@ int numoutputs = 0; int *requested_outputs = NULL; - + /*intermediary: */ int step; @@ -107,5 +107,5 @@ #endif } - + if(isdiagnostic){ if(VerboseSolution()) _pprintLine_(" computing new velocity"); @@ -153,5 +153,5 @@ RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); - + /*Free ressources:*/ xDelete(requested_outputs);