Index: /issm/oecreview/Archive/11268-11286/Date.tex =================================================================== --- /issm/oecreview/Archive/11268-11286/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11268-11286/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11268-11286/ISSM-11268-11269.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11268-11269.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11268-11269.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11268) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11269) +@@ -2835,7 +2835,7 @@ + this->inputs->AddInput(new PentaVertexInput(VxMeshEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VyMeshEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VzMeshEnum,nodeinputs)); +- if (iomodel->Data(TemperatureEnum) && iomodel->Data(WaterfractionEnum)) { ++ if (iomodel->Data(TemperatureEnum) && iomodel->Data(WaterfractionEnum) && iomodel->Data(PressureEnum)) { + for(i=0;i<6;i++){ + if(iomodel->Data(TemperatureEnum)[penta_vertex_ids[i]-1] < meltingpoint-beta*iomodel->Data(PressureEnum)[penta_vertex_ids[i]-1]){ + nodeinputs[i]=heatcapacity*(iomodel->Data(TemperatureEnum)[penta_vertex_ids[i]-1]-referencetemperature); Index: /issm/oecreview/Archive/11268-11286/ISSM-11269-11270.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11269-11270.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11269-11270.diff (revision 11515) @@ -0,0 +1,16 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 11269) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 11270) +@@ -54,9 +54,9 @@ + /*keep only this partition's nodes:*/ + if((iomodel->my_vertices[i])){ + +- if ((int)spctemperature[2*i]){ ++ if (!isnan(spctemperature[i])){ + +- constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,heatcapacity*(spctemperature[2*i+1]-referencetemperature),EnthalpyAnalysisEnum)); ++ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,heatcapacity*(spctemperature[i]-referencetemperature),EnthalpyAnalysisEnum)); + count++; + + } Index: /issm/oecreview/Archive/11268-11286/ISSM-11270-11271.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11270-11271.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11270-11271.diff (revision 11515) @@ -0,0 +1,44 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11270) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11271) +@@ -41,13 +41,13 @@ + info = PetscOptionsSetValue("-tao_ls_stepmax","10e11"); if(info) _error_("STOP"); //does not work + info = PetscOptionsSetValue("-tao_ls_stepmin","10e5"); if(info) _error_("STOP"); //does not work + info = PetscOptionsSetValue("-tao_ls_maxfev","8"); if(info) _error_("STOP"); +- + /*TAO options: http://www.mcs.anl.gov/research/projects/tao/docs/manualpages/solver/TaoSetFromOptions.html*/ + info = PetscOptionsSetValue("-tao_monitor",""); if(info) _error_("STOP"); +- info = PetscOptionsSetValue("-tao_gatol","10e-18"); if(info) _error_("STOP"); + info = PetscOptionsSetValue("-tao_max_its","10"); if(info) _error_("STOP"); + info = PetscOptionsSetValue("-tao_max_funcs","40"); if(info) _error_("STOP"); + ++ ++ + /*Additional options*/ + //info = PetscOptionsSetValue("-info","/u/astrid-r1b/morlighe/svn/issm/trunk/test/NightlyRun/taolog.txt"); if(info) _error_("STOP"); + +@@ -57,10 +57,13 @@ + /*Set up and solve TAO*/ + GetVectorFromInputsx(&initial_solution,femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,MaterialsRheologyBbarEnum,VertexEnum); + info = TaoCreate(PETSC_COMM_WORLD,&tao); if(info) _error_("STOP"); +- info = TaoSetType(tao,"tao_cg"); if(info) _error_("STOP"); ++ info = TaoSetType(tao,"tao_blmvm"); if(info) _error_("STOP"); + info = TaoSetInitialVector(tao,initial_solution); if(info) _error_("STOP"); + info = TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); if(info) _error_("STOP"); + info = TaoSetFromOptions(tao); if(info) _error_("STOP"); ++ /* http://www.mcs.anl.gov/research/projects/tao/docs/manpages/taosolver/TaoSetTolerances.html*/ ++ /* fatol, frtol, gatol, grtol, gttol*/ ++ info = TaoSetTolerances(tao,10e-18,10e-18,10e-18,10e-18,10e-18); + info = TaoSolve(tao); //if(info) _error_("STOP"); + + /*Get solution status*/ +@@ -111,7 +114,7 @@ + InputUpdateFromVectorx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); + adjointdiagnostic_core(user->femmodel); + Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, MaterialsRheologyBbarEnum); +- VecScale(gradient,10e7); ++ VecScale(gradient,-10e7); + //VecScale(gradient,-1.); + VecCopy(gradient,G); + CostFunctionx(fcn, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); Index: /issm/oecreview/Archive/11268-11286/ISSM-11271-11272.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11271-11272.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11271-11272.diff (revision 11515) @@ -0,0 +1,20 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11271) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11272) +@@ -3762,12 +3762,12 @@ + double basis[NUMVERTICES]; + GaussPenta* gauss=NULL; + ++ /* Ice/ocean heat exchange flux on ice shelf base */ ++ if (!IsOnBed() || !IsFloating()) return NULL; ++ + /*Initialize Element vector*/ + ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); + +- /* Ice/ocean heat exchange flux on ice shelf base */ +- if (!IsOnBed() || !IsFloating()) return NULL; +- + /*Retrieve all inputs and parameters*/ + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); + for(i=0;iGetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); +- Input* temperature_input=NULL; +- if (dt) temperature_input=inputs->GetInput(TemperatureEnum); _assert_(inputs); ++ Input* enthalpy_input=NULL; ++ if (dt) enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(inputs); + if (stabilization==2) diameter=MinEdgeLength(xyz_list); + + /* Start looping on the number of gaussian points: */ +@@ -3719,8 +3719,8 @@ + + /* Build transient now */ + if(dt){ +- temperature_input->GetInputValue(&temperature, gauss); +- scalar_transient=temperature*Jdet*gauss->weight; ++ enthalpy_input->GetInputValue(&enthalpy, gauss); ++ scalar_transient=enthalpy*Jdet*gauss->weight; + for(i=0;ivalues[i]+=scalar_transient*L[i]; + } + Index: /issm/oecreview/Archive/11268-11286/ISSM-11273-11274.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11273-11274.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11273-11274.diff (revision 11515) @@ -0,0 +1,34 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 11273) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 11274) +@@ -604,6 +604,7 @@ + syn keyword cConstant InversionGradientOnlyEnum + syn keyword cConstant InversionGradientScalingEnum + syn keyword cConstant InversionIscontrolEnum ++syn keyword cConstant InversionTaoEnum + syn keyword cConstant InversionMaxParametersEnum + syn keyword cConstant InversionMaxiterPerStepEnum + syn keyword cConstant InversionMinParametersEnum +@@ -659,6 +660,7 @@ + syn keyword cConstant MeshZEnum + syn keyword cConstant MiscellaneousNameEnum + syn keyword cConstant PrognosticHydrostaticAdjustmentEnum ++syn keyword cConstant PrognosticMinThicknessEnum + syn keyword cConstant PrognosticPenaltyFactorEnum + syn keyword cConstant PrognosticSpcthicknessEnum + syn keyword cConstant PrognosticStabilizationEnum +@@ -884,6 +886,13 @@ + syn keyword cConstant QmuTemperatureEnum + syn keyword cConstant HydrologyWaterVxEnum + syn keyword cConstant HydrologyWaterVyEnum ++syn keyword cConstant StressTensorEnum ++syn keyword cConstant StressTensorxxEnum ++syn keyword cConstant StressTensorxyEnum ++syn keyword cConstant StressTensorxzEnum ++syn keyword cConstant StressTensoryyEnum ++syn keyword cConstant StressTensoryzEnum ++syn keyword cConstant StressTensorzzEnum + syn keyword cConstant IceVolumeEnum + syn keyword cConstant P0Enum + syn keyword cConstant P1Enum Index: /issm/oecreview/Archive/11268-11286/ISSM-11274-11275.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11274-11275.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11274-11275.diff (revision 11515) @@ -0,0 +1,192 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/issm.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/issm.cpp (revision 11274) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/issm.cpp (revision 11275) +@@ -15,8 +15,7 @@ + FILE *output_fid = NULL; + FILE *petscoptionsfid = NULL; + bool waitonlock = false; +- bool dakota_analysis; +- bool control_analysis; ++ bool dakota_analysis,control_analysis,tao_analysis; + + /*FemModel: */ + FemModel *femmodel = NULL; +@@ -80,10 +79,9 @@ + femmodel->parameters->FindParam(&waitonlock,SettingsWaitonlockEnum); + femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); + femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum); ++ femmodel->parameters->FindParam(&tao_analysis,InversionTaoEnum); + MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime(); + +- /*are we running the solution sequence, or a qmu wrapper around it? : */ +- + _printf_(true,"call computational core:\n"); + MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( ); + if(dakota_analysis){ +@@ -95,12 +93,11 @@ + } + else if(control_analysis){ + #ifdef _HAVE_CONTROL_ +- #ifdef _HAVE_TAO_ +- controltao_core(femmodel); ++ if(tao_analysis) ++ controltao_core(femmodel); ++ else ++ control_core(femmodel); + #else +- control_core(femmodel); +- #endif +- #else + _error_("ISSM was not compiled with control support, cannot carry out dakota analysis!"); + #endif + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11274) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11275) +@@ -16,6 +16,7 @@ + #include + + /*Local prototype*/ ++int FormFunction(TaoSolver tao,Vec,double *,void*); + int FormFunctionGradient(TaoSolver tao,Vec,double *,Vec,void*); + typedef struct { + FemModel* femmodel; +@@ -38,16 +39,14 @@ + if(ierr) _error_("Could not initialize Tao"); + + /*Line search options*/ +- info = PetscOptionsSetValue("-tao_ls_stepmax","10e11"); if(info) _error_("STOP"); //does not work +- info = PetscOptionsSetValue("-tao_ls_stepmin","10e5"); if(info) _error_("STOP"); //does not work +- info = PetscOptionsSetValue("-tao_ls_maxfev","8"); if(info) _error_("STOP"); ++ //info = PetscOptionsSetValue("-tao_ls_stepmax","10e11"); if(info) _error_("STOP"); //does not work ++ //info = PetscOptionsSetValue("-tao_ls_stepmin","10e5"); if(info) _error_("STOP"); //does not work ++ info = PetscOptionsSetValue("-tao_ls_maxfev","3"); if(info) _error_("STOP"); + /*TAO options: http://www.mcs.anl.gov/research/projects/tao/docs/manualpages/solver/TaoSetFromOptions.html*/ + info = PetscOptionsSetValue("-tao_monitor",""); if(info) _error_("STOP"); + info = PetscOptionsSetValue("-tao_max_its","10"); if(info) _error_("STOP"); +- info = PetscOptionsSetValue("-tao_max_funcs","40"); if(info) _error_("STOP"); ++ info = PetscOptionsSetValue("-tao_max_funcs","30"); if(info) _error_("STOP"); + +- +- + /*Additional options*/ + //info = PetscOptionsSetValue("-info","/u/astrid-r1b/morlighe/svn/issm/trunk/test/NightlyRun/taolog.txt"); if(info) _error_("STOP"); + +@@ -57,14 +56,16 @@ + /*Set up and solve TAO*/ + GetVectorFromInputsx(&initial_solution,femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,MaterialsRheologyBbarEnum,VertexEnum); + info = TaoCreate(PETSC_COMM_WORLD,&tao); if(info) _error_("STOP"); +- info = TaoSetType(tao,"tao_blmvm"); if(info) _error_("STOP"); ++ //info = TaoSetType(tao,"tao_blmvm"); if(info) _error_("STOP"); ++ info = TaoSetType(tao,"tao_cg"); if(info) _error_("STOP"); + info = TaoSetInitialVector(tao,initial_solution); if(info) _error_("STOP"); ++ info = TaoSetObjectiveRoutine(tao,FormFunction,(void*)&user); if(info) _error_("STOP"); + info = TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); if(info) _error_("STOP"); + info = TaoSetFromOptions(tao); if(info) _error_("STOP"); + /* http://www.mcs.anl.gov/research/projects/tao/docs/manpages/taosolver/TaoSetTolerances.html*/ + /* fatol, frtol, gatol, grtol, gttol*/ +- info = TaoSetTolerances(tao,10e-18,10e-18,10e-18,10e-18,10e-18); +- info = TaoSolve(tao); //if(info) _error_("STOP"); ++ info = TaoSetTolerances(tao,10e-18,10e-18,10e-18,10e-18,10e-18); if(info) _error_("STOP"); ++ info = TaoSolve(tao); if(info) _error_("STOP"); + + /*Get solution status*/ + info = TaoGetSolutionStatus(tao,&iter,&ff,&gnorm,0,0,&reason); //CHKERRQ(info); +@@ -95,6 +96,18 @@ + TaoFinalize(); + } + ++int FormFunction(TaoSolver tao, Vec X, double *fcn,void *userCtx){ ++ AppCtx *user = (AppCtx*)userCtx; ++ FemModel *femmodel = user->femmodel; ++ ++ int costfunction=SurfaceAbsVelMisfitEnum; ++ femmodel->parameters->SetParam(&costfunction,1,1,StepResponsesEnum); ++ InputUpdateFromVectorx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); ++ diagnostic_core(user->femmodel); ++ CostFunctionx(fcn, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); ++ printf("f(x) = %g\n",*fcn); ++ return 0; ++} + int FormFunctionGradient(TaoSolver tao, Vec X, double *fcn,Vec G,void *userCtx){ + + /*Retreive arguments*/ +@@ -102,13 +115,6 @@ + FemModel *femmodel = user->femmodel; + Vec gradient = NULL; + +- /*Temp*/ +-// double* Xserial=NULL; +-// VecToMPISerial(&Xserial,X); +-// printf("X= [%20.20g %20.20g %20.20g]\n",Xserial[0],Xserial[1],Xserial[2]); +- /*End Temp*/ +- +- + int costfunction=SurfaceAbsVelMisfitEnum; + femmodel->parameters->SetParam(&costfunction,1,1,StepResponsesEnum); + InputUpdateFromVectorx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); +@@ -119,13 +125,7 @@ + VecCopy(gradient,G); + CostFunctionx(fcn, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); + +- //printf("X\n"); +- //VecView(X,PETSC_VIEWER_STDOUT_SELF); +- +- //printf("Gradient\n"); +- //VecView(G,PETSC_VIEWER_STDOUT_SELF); +- +- printf("f(x) = %g\n",*fcn); ++ printf("f2(x) = %g\n",*fcn); + return 0; + } + #else +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11274) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11275) +@@ -70,6 +70,7 @@ + InversionGradientOnlyEnum, + InversionGradientScalingEnum, + InversionIscontrolEnum, ++ InversionTaoEnum, + InversionMaxParametersEnum, + InversionMaxiterPerStepEnum, + InversionMinParametersEnum, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11274) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11275) +@@ -72,6 +72,7 @@ + else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum; + else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; + else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; ++ else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; + else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; + else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; + else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11274) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11275) +@@ -74,6 +74,7 @@ + case InversionGradientOnlyEnum : return "InversionGradientOnly"; + case InversionGradientScalingEnum : return "InversionGradientScaling"; + case InversionIscontrolEnum : return "InversionIscontrol"; ++ case InversionTaoEnum : return "InversionTao"; + case InversionMaxParametersEnum : return "InversionMaxParameters"; + case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep"; + case InversionMinParametersEnum : return "InversionMinParameters"; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 11274) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 11275) +@@ -83,6 +83,7 @@ + parameters->AddObject(iomodel->CopyConstantObject(AutodiffReverseEnum)); + parameters->AddObject(iomodel->CopyConstantObject(QmuIsdakotaEnum)); + parameters->AddObject(iomodel->CopyConstantObject(InversionIscontrolEnum)); ++ parameters->AddObject(iomodel->CopyConstantObject(InversionTaoEnum)); + + /*some parameters that did not come with the iomodel: */ + parameters->AddObject(new IntParam(SolutionTypeEnum,solution_type)); Index: /issm/oecreview/Archive/11268-11286/ISSM-11275-11276.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11275-11276.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11275-11276.diff (revision 11515) @@ -0,0 +1,33 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_BC.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_BC.m (revision 11275) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_BC.m (revision 11276) +@@ -34,3 +34,8 @@ + legend(plot_h,text_strings,'location','NorthEast') + + hold off ++ ++%apply options ++options=addfielddefault(options,'title','Boundary conditions'); ++options=addfielddefault(options,'colorbar',0); ++applyoptions(md,[],options); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/inversion.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/inversion.m (revision 11275) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/inversion.m (revision 11276) +@@ -6,6 +6,7 @@ + classdef inversion + properties (SetAccess=public) + iscontrol = 0 ++ tao = 0 + control_parameters = NaN + nsteps = 0 + maxiter_per_step = NaN +@@ -134,6 +135,7 @@ + function marshall(obj,fid) % {{{ + + WriteData(fid,'object',obj,'fieldname','iscontrol','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','tao','format','Boolean'); + if ~obj.iscontrol, return; end + WriteData(fid,'object',obj,'fieldname','nsteps','format','Integer'); + WriteData(fid,'object',obj,'fieldname','maxiter_per_step','format','DoubleMat','mattype',3); Index: /issm/oecreview/Archive/11268-11286/ISSM-11276-11277.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11276-11277.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11276-11277.diff (revision 11515) @@ -0,0 +1,16 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/InversionTaoEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/InversionTaoEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/InversionTaoEnum.m (revision 11277) +@@ -0,0 +1,11 @@ ++function macro=InversionTaoEnum() ++%INVERSIONTAOENUM - Enum of InversionTao ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=InversionTaoEnum() ++ ++macro=StringToEnum('InversionTao'); Index: /issm/oecreview/Archive/11268-11286/ISSM-11277-11278.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11277-11278.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11277-11278.diff (revision 11515) @@ -0,0 +1,47 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test222.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test222.m (revision 11277) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test222.m (revision 11278) +@@ -8,13 +8,14 @@ + md=solve(md,TransientSolutionEnum); + + %Fields and tolerances to track changes +-field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... +- 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... +- 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; ++field_names={... ++ 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; + field_tolerances={... + 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... +- 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,... +- 1e-07,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; ++ 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,... ++ 1e-07,1e-07,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; + field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test122.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test122.m (revision 11277) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test122.m (revision 11278) +@@ -7,10 +7,14 @@ + md=solve(md,TransientSolutionEnum); + + %Fields and tolerances to track changes +-field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... +- 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... +- 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +-field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; ++field_names={... ++ 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; ++field_tolerances={... ++ 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... ++ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... ++ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; + field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... Index: /issm/oecreview/Archive/11268-11286/ISSM-11278-11279.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11278-11279.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11278-11279.diff (revision 11515) @@ -0,0 +1,27 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core.m (revision 11278) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core.m (revision 11279) +@@ -32,7 +32,7 @@ + issmprintf(VerboseSolution,'\n%s',[' saving results']); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,EnthalpyEnum,i,time); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,i,time); +- femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,WaterFractionEnum,i,time); ++ femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,WaterfractionEnum,i,time); + end + end + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/initialization.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/initialization.m (revision 11278) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/initialization.m (revision 11279) +@@ -61,6 +61,9 @@ + checkfield(md,'initialization.vz','NaN',1,'size',[md.mesh.numberofvertices 1]); + checkfield(md,'initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices 1]); + end ++ if ismember(EnthalpyAnalysisEnum,analyses), ++ checkfield(md,'initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices 1]); ++ end + end % }}} + function disp(obj) % {{{ + disp(sprintf(' initial field values:')); Index: /issm/oecreview/Archive/11268-11286/ISSM-11279-11280.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11279-11280.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11279-11280.diff (revision 11515) @@ -0,0 +1,12 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/scripts/Update.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/scripts/Update.sh (revision 11279) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/scripts/Update.sh (revision 11280) +@@ -10,6 +10,7 @@ + exit 1 + fi + ++cat $FILE | sed -e "s/md\.name/md.miscellaneous.name/g" > $FILE$$.bak && mv $FILE$$.bak $FILE + cat $FILE | sed -e "s/md\.spcvx/md.diagnostic.spcvx/g" > $FILE$$.bak && mv $FILE$$.bak $FILE + cat $FILE | sed -e "s/md\.spcvy/md.diagnostic.spcvy/g" > $FILE$$.bak && mv $FILE$$.bak $FILE + cat $FILE | sed -e "s/md\.spcvz/md.diagnostic.spcvz/g" > $FILE$$.bak && mv $FILE$$.bak $FILE Index: /issm/oecreview/Archive/11268-11286/ISSM-11280-11281.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11280-11281.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11280-11281.diff (revision 11515) @@ -0,0 +1,243 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test141.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test141.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test141.m (revision 11281) +@@ -0,0 +1,25 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'all',''); ++md=parameterize(md,'../Par/SquareShelfConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md.cluster=none; ++md=solve(md,EnthalpySolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy1','Waterfraction1','Temperature1',... ++ 'Enthalpy2','Waterfraction2','Temperature2',... ++ 'Enthalpy3','Waterfraction3','Temperature3'}; ++field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution(1).Enthalpy),... ++ (md.results.EnthalpySolution(1).Waterfraction),... ++ (md.results.EnthalpySolution(1).Temperature),... ++ (md.results.EnthalpySolution(2).Enthalpy),... ++ (md.results.EnthalpySolution(2).Waterfraction),... ++ (md.results.EnthalpySolution(2).Temperature),... ++ (md.results.EnthalpySolution(3).Enthalpy),... ++ (md.results.EnthalpySolution(3).Waterfraction),... ++ (md.results.EnthalpySolution(3).Temperature),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test142.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test142.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test142.m (revision 11281) +@@ -0,0 +1,26 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'all',''); ++md=parameterize(md,'../Par/SquareShelfConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.cluster=generic('name',oshostname(),'np',3); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++%md=solve(md,ThermalSolutionEnum); ++md=solve(md,EnthalpySolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy1','Waterfraction1','Temperature1',... ++ 'Enthalpy2','Waterfraction2','Temperature2',... ++ 'Enthalpy3','Waterfraction3','Temperature3'}; ++field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution(1).Enthalpy),... ++ (md.results.EnthalpySolution(1).Waterfraction),... ++ (md.results.EnthalpySolution(1).Temperature),... ++ (md.results.EnthalpySolution(2).Enthalpy),... ++ (md.results.EnthalpySolution(2).Waterfraction),... ++ (md.results.EnthalpySolution(2).Temperature),... ++ (md.results.EnthalpySolution(3).Enthalpy),... ++ (md.results.EnthalpySolution(3).Waterfraction),... ++ (md.results.EnthalpySolution(3).Temperature),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test349.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test349.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test349.m (revision 11281) +@@ -0,0 +1,18 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md.timestepping.time_step=0; ++md.cluster=none; ++md=solve(md,EnthalpySolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy','Waterfraction','Temperature'}; ++field_tolerances={1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution.Enthalpy),... ++ (md.results.EnthalpySolution.Waterfraction),... ++ (md.results.EnthalpySolution.Temperature),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m (revision 11281) +@@ -0,0 +1,20 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.timestepping.time_step=0; ++md.cluster=generic('name',oshostname(),'np',3); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++%md.debug.valgrind=1; ++md=solve(md,EnthalpySolutionEnum); ++%md=solve(md,ThermalSolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy','Waterfraction','Temperature'}; ++field_tolerances={1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution.Enthalpy),... ++ (md.results.EnthalpySolution.Waterfraction),... ++ (md.results.EnthalpySolution.Temperature),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test351.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test351.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test351.m (revision 11281) +@@ -0,0 +1,25 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md.cluster=none; ++md=solve(md,EnthalpySolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy1','Waterfraction1','Temperature1',... ++ 'Enthalpy2','Waterfraction2','Temperature2',... ++ 'Enthalpy3','Waterfraction3','Temperature3'}; ++field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution(1).Enthalpy),... ++ (md.results.EnthalpySolution(1).Waterfraction),... ++ (md.results.EnthalpySolution(1).Temperature),... ++ (md.results.EnthalpySolution(2).Enthalpy),... ++ (md.results.EnthalpySolution(2).Waterfraction),... ++ (md.results.EnthalpySolution(2).Temperature),... ++ (md.results.EnthalpySolution(3).Enthalpy),... ++ (md.results.EnthalpySolution(3).Waterfraction),... ++ (md.results.EnthalpySolution(3).Temperature),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/IdToName.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/IdToName.m (revision 11280) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/IdToName.m (revision 11281) +@@ -43,6 +43,10 @@ + case 135, name='SquareShelfConstrainedBalThic2dDGSerial'; + case 136, name='SquareShelfConstrainedBalThic2dDGParallel'; + case 137, name='SquareBamgMesh'; ++ case 139, name='SquareShelfConstrainedEnthalpySteaSerial'; ++ case 140, name='SquareShelfConstrainedEnthalpySteaParallel'; ++ case 141, name='SquareShelfConstrainedEnthalpyTranSerial'; ++ case 142, name='SquareShelfConstrainedEnthalpyTranParallel'; + case 201, name='SquareShelfDiagM2dSerial'; + case 202, name='SquareShelfDiagM2dParallel'; + case 203, name='SquareShelfDiagM3dSerial'; +@@ -159,6 +163,10 @@ + case 346, name='SquareSheetConstrainedTranCflM2dParallel'; + case 347, name='SquareSheetConstrainedTranCflH3dSerial'; + case 348, name='SquareSheetConstrainedTranCflH3dParallel'; ++ case 349, name='SquareSheetConstrainedEnthalpySteaSerial'; ++ case 350, name='SquareSheetConstrainedEnthalpySteaParallel'; ++ case 351, name='SquareSheetConstrainedEnthalpyTranSerial'; ++ case 352, name='SquareSheetConstrainedEnthalpyTranParallel'; + case 401, name='SquareSheetShelfDiagM2dSerial'; + case 402, name='SquareSheetShelfDiagM2dParallel'; + case 403, name='SquareSheetShelfDiagM3dSerial'; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test352.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test352.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test352.m (revision 11281) +@@ -0,0 +1,26 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.cluster=generic('name',oshostname(),'np',3); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++%md=solve(md,ThermalSolutionEnum); ++md=solve(md,EnthalpySolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy1','Waterfraction1','Temperature1',... ++ 'Enthalpy2','Waterfraction2','Temperature2',... ++ 'Enthalpy3','Waterfraction3','Temperature3'}; ++field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution(1).Enthalpy),... ++ (md.results.EnthalpySolution(1).Waterfraction),... ++ (md.results.EnthalpySolution(1).Temperature),... ++ (md.results.EnthalpySolution(2).Enthalpy),... ++ (md.results.EnthalpySolution(2).Waterfraction),... ++ (md.results.EnthalpySolution(2).Temperature),... ++ (md.results.EnthalpySolution(3).Enthalpy),... ++ (md.results.EnthalpySolution(3).Waterfraction),... ++ (md.results.EnthalpySolution(3).Temperature),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m (revision 11281) +@@ -0,0 +1,18 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'all',''); ++md=parameterize(md,'../Par/SquareShelfConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.timestepping.time_step=0; ++md.cluster=none; ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md=solve(md,EnthalpySolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy','Waterfraction','Temperature'}; ++field_tolerances={1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution.Enthalpy),... ++ (md.results.EnthalpySolution.Waterfraction),... ++ (md.results.EnthalpySolution.Temperature),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test140.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test140.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test140.m (revision 11281) +@@ -0,0 +1,19 @@ ++md=triangle(model,'../Exp/Square.exp',180000); ++md=setmask(md,'all',''); ++md=parameterize(md,'../Par/SquareShelfConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'macayeal','all'); ++md.timestepping.time_step=0; ++md.cluster=generic('name',oshostname(),'np',3); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++%md=solve(md,ThermalSolutionEnum); ++md=solve(md,EnthalpySolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Enthalpy','Waterfraction','Temperature'}; ++field_tolerances={1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.EnthalpySolution.Enthalpy),... ++ (md.results.EnthalpySolution.Waterfraction),... ++ (md.results.EnthalpySolution.Temperature),... ++ }; Index: /issm/oecreview/Archive/11268-11286/ISSM-11281-11282.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11281-11282.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11281-11282.diff (revision 11515) @@ -0,0 +1,80 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive350.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive350.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive141.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive141.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive351.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive351.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive142.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive142.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive352.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive352.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive139.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive139.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive140.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive140.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive349.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive349.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + Index: /issm/oecreview/Archive/11268-11286/ISSM-11282-11283.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11282-11283.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11282-11283.diff (revision 11515) @@ -0,0 +1,154 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11282) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11283) +@@ -16,8 +16,7 @@ + #include + + /*Local prototype*/ +-int FormFunction(TaoSolver tao,Vec,double *,void*); +-int FormFunctionGradient(TaoSolver tao,Vec,double *,Vec,void*); ++int FormFunctionGradient(TaoSolver tao,Vec,double*,Vec,void*); + typedef struct { + FemModel* femmodel; + } AppCtx; +@@ -25,13 +24,10 @@ + void controltao_core(FemModel* femmodel){ + + /*TAO*/ +- int i,n,info; +- TaoSolverTerminationReason reason; +- TaoSolver tao; +- Vec initial_solution = NULL; +- AppCtx user; +- PetscInt iter; +- double ff ,gnorm; ++ int i,n,info; ++ TaoSolver tao; ++ Vec initial_solution = NULL; ++ AppCtx user; + + /*Initialize TAO*/ + int argc; char **args; PetscGetArgs(&argc,&args); +@@ -39,75 +35,49 @@ + if(ierr) _error_("Could not initialize Tao"); + + /*Line search options*/ +- //info = PetscOptionsSetValue("-tao_ls_stepmax","10e11"); if(info) _error_("STOP"); //does not work +- //info = PetscOptionsSetValue("-tao_ls_stepmin","10e5"); if(info) _error_("STOP"); //does not work +- info = PetscOptionsSetValue("-tao_ls_maxfev","3"); if(info) _error_("STOP"); + /*TAO options: http://www.mcs.anl.gov/research/projects/tao/docs/manualpages/solver/TaoSetFromOptions.html*/ + info = PetscOptionsSetValue("-tao_monitor",""); if(info) _error_("STOP"); +- info = PetscOptionsSetValue("-tao_max_its","10"); if(info) _error_("STOP"); +- info = PetscOptionsSetValue("-tao_max_funcs","30"); if(info) _error_("STOP"); ++ info = PetscOptionsSetValue("-tao_max_its","20"); if(info) _error_("STOP"); ++ info = PetscOptionsSetValue("-tao_max_funcs","50"); if(info) _error_("STOP"); + +- /*Additional options*/ +- //info = PetscOptionsSetValue("-info","/u/astrid-r1b/morlighe/svn/issm/trunk/test/NightlyRun/taolog.txt"); if(info) _error_("STOP"); +- + /*Initialize argument*/ + user.femmodel=femmodel; + + /*Set up and solve TAO*/ +- GetVectorFromInputsx(&initial_solution,femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,MaterialsRheologyBbarEnum,VertexEnum); + info = TaoCreate(PETSC_COMM_WORLD,&tao); if(info) _error_("STOP"); +- //info = TaoSetType(tao,"tao_blmvm"); if(info) _error_("STOP"); +- info = TaoSetType(tao,"tao_cg"); if(info) _error_("STOP"); ++ info = TaoSetType(tao,"tao_blmvm"); if(info) _error_("STOP"); ++ //info = TaoSetType(tao,"tao_cg"); if(info) _error_("STOP"); ++ ++ int size=femmodel->vertices->NumberOfVertices(); ++ Vec XL=NULL; ++ Vec XU=NULL; ++ VecCreate(PETSC_COMM_WORLD,&XL); VecCreate(PETSC_COMM_WORLD,&XU); ++ VecSetSizes(XL,PetscDetermineLocalSize(size),PETSC_DECIDE); VecSetSizes(XU,PetscDetermineLocalSize(size),PETSC_DECIDE); ++ VecSetFromOptions(XL); VecSetFromOptions(XU); ++ VecSet(XL,1); VecSet(XU,200.); ++ TaoSetVariableBounds(tao,XL,XU); VecFree(&XL); VecFree(&XU); ++ ++ GetVectorFromInputsx(&initial_solution,femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,FrictionCoefficientEnum,VertexEnum); + info = TaoSetInitialVector(tao,initial_solution); if(info) _error_("STOP"); +- info = TaoSetObjectiveRoutine(tao,FormFunction,(void*)&user); if(info) _error_("STOP"); ++ VecFree(&initial_solution); ++ + info = TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); if(info) _error_("STOP"); + info = TaoSetFromOptions(tao); if(info) _error_("STOP"); + /* http://www.mcs.anl.gov/research/projects/tao/docs/manpages/taosolver/TaoSetTolerances.html*/ +- /* fatol, frtol, gatol, grtol, gttol*/ +- info = TaoSetTolerances(tao,10e-18,10e-18,10e-18,10e-18,10e-18); if(info) _error_("STOP"); ++ /* fatol ,frtol ,gatol ,grtol ,gttol*/ ++ info = TaoSetTolerances(tao,10e-28,0.0000,0.0000,0.0000,10e-28); if(info) _error_("STOP"); + info = TaoSolve(tao); if(info) _error_("STOP"); + + /*Get solution status*/ +- info = TaoGetSolutionStatus(tao,&iter,&ff,&gnorm,0,0,&reason); //CHKERRQ(info); +- switch(reason){ +- /*http://www.mcs.anl.gov/research/projects/tao/docs/manpages/taosolver/TaoGetTerminationReason.html*/ +- case TAO_DIVERGED_MAXITS: _printf_(true,"TAO_DIVERGED_MAXITS (its>maxits)\n"); break; +- case TAO_DIVERGED_NAN: _printf_(true,"TAO_DIVERGED_NAN (Numerical problems)\n"); break; +- case TAO_DIVERGED_MAXFCN: _printf_(true,"TAO_DIVERGED_MAXFCN (nfunc > maxnfuncts)\n"); break; +- case TAO_DIVERGED_LS_FAILURE: _printf_(true,"TAO_DIVERGED_LS_FAILURE (line search failure)\n"); break; +- case TAO_DIVERGED_TR_REDUCTION:_printf_(true,"TAO_DIVERGED_TR_REDUCTION \n"); break; +- case TAO_DIVERGED_USER: _printf_(true,"TAO_DIVERGED_USER (user defined)\n"); break; +- default: _printf_(true,"unknown reason"); +- } +- if (reason<=0){ +- _printf_(true,"Try a different TAO method, adjust some parameters, or check the function evaluation routines\n"); +- _printf_(true," Iterations: %d, Function Value: %4.2e, Residual: %4.2e \n",iter,ff,gnorm); +- } +- else{ +- _printf_(true,"TAO found a solution"); +- } +- info = TaoView(tao,PETSC_VIEWER_STDOUT_SELF); if(info) _error_("STOP"); ++ info = TaoView(tao,PETSC_VIEWER_STDOUT_WORLD); if(info) _error_("STOP"); + + /*Clean up*/ + info = TaoDestroy(&tao); if(info) _error_("STOP"); +- VecFree(&initial_solution); ++ InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,FrictionCoefficientEnum); + + /* Finalize TAO */ + TaoFinalize(); + } +- +-int FormFunction(TaoSolver tao, Vec X, double *fcn,void *userCtx){ +- AppCtx *user = (AppCtx*)userCtx; +- FemModel *femmodel = user->femmodel; +- +- int costfunction=SurfaceAbsVelMisfitEnum; +- femmodel->parameters->SetParam(&costfunction,1,1,StepResponsesEnum); +- InputUpdateFromVectorx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); +- diagnostic_core(user->femmodel); +- CostFunctionx(fcn, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); +- printf("f(x) = %g\n",*fcn); +- return 0; +-} + int FormFunctionGradient(TaoSolver tao, Vec X, double *fcn,Vec G,void *userCtx){ + + /*Retreive arguments*/ +@@ -117,17 +87,18 @@ + + int costfunction=SurfaceAbsVelMisfitEnum; + femmodel->parameters->SetParam(&costfunction,1,1,StepResponsesEnum); +- InputUpdateFromVectorx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); ++ //InputUpdateFromVectorx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); ++ InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,FrictionCoefficientEnum,VertexEnum); + adjointdiagnostic_core(user->femmodel); +- Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, MaterialsRheologyBbarEnum); +- VecScale(gradient,-10e7); +- //VecScale(gradient,-1.); ++ //Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, MaterialsRheologyBbarEnum); ++ Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,FrictionCoefficientEnum); ++ VecScale(gradient,-1.); + VecCopy(gradient,G); ++ VecFree(&gradient); + CostFunctionx(fcn, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); +- +- printf("f2(x) = %g\n",*fcn); + return 0; + } ++ + #else + void controltao_core(FemModel* femmodel){ + _error_("TAO not installed or PETSc version not supported"); Index: /issm/oecreview/Archive/11268-11286/ISSM-11283-11284.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11283-11284.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11283-11284.diff (revision 11515) @@ -0,0 +1,110 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11283) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11284) +@@ -21,7 +21,7 @@ + Vec ys = NULL; + + Loads* loads=NULL; +- int converged; ++ bool converged; + int constraints_converged; + int num_unstable_constraints; + int count; +@@ -42,13 +42,14 @@ + else loads=(Loads*)femmodel->loads; //modify loads in this solution + + count=1; +- converged=0; ++ converged=false; + + /*Start non-linear iteration using input velocity: */ + GetSolutionFromInputsx(&ug, femmodel->elements, femmodel->nodes, femmodel->vertices, loads, femmodel->materials, femmodel->parameters); + Reducevectorgtofx(&uf, ug, femmodel->nodes,femmodel->parameters); + + //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate) ++ InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum); + InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); + + for(;;){ +@@ -73,14 +74,14 @@ + //rift convergence + if (!constraints_converged) { + if (converged){ +- if (num_unstable_constraints <= min_mechanical_constraints) converged=1; +- else converged=0; ++ if (num_unstable_constraints <= min_mechanical_constraints) converged=true; ++ else converged=false; + } + } + + /*Increase count: */ + count++; +- if(converged==1)break; ++ if(converged==true)break; + if(count>=max_nonlinear_iterations){ + _printf_(true," maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); + break; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 11283) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 11284) +@@ -13,24 +13,24 @@ + void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads){ + + /*intermediary: */ +- Mat Kff_horiz = NULL, Kfs_horiz = NULL; +- Vec ug_horiz = NULL, uf_horiz = NULL, old_uf_horiz = NULL; +- Vec pf_horiz = NULL; +- Vec df_horiz = NULL; +- Mat Kff_vert = NULL, Kfs_vert = NULL; +- Vec ug_vert = NULL, uf_vert = NULL; +- Vec pf_vert = NULL; +- Vec df_vert = NULL; +- Vec ys = NULL; +- int converged; +- int constraints_converged; +- int num_unstable_constraints; +- int count; ++ Mat Kff_horiz = NULL, Kfs_horiz = NULL; ++ Vec ug_horiz = NULL, uf_horiz = NULL, old_uf_horiz = NULL; ++ Vec pf_horiz = NULL; ++ Vec df_horiz = NULL; ++ Mat Kff_vert = NULL, Kfs_vert = NULL; ++ Vec ug_vert = NULL, uf_vert = NULL; ++ Vec pf_vert = NULL; ++ Vec df_vert = NULL; ++ Vec ys = NULL; ++ bool converged; ++ int constraints_converged; ++ int num_unstable_constraints; ++ int count; + + /*parameters:*/ +- int min_mechanical_constraints; +- int max_nonlinear_iterations; +- int configuration_type; ++ int min_mechanical_constraints; ++ int max_nonlinear_iterations; ++ int configuration_type; + + /*Recover parameters: */ + femmodel->parameters->FindParam(&min_mechanical_constraints,DiagnosticRiftPenaltyThresholdEnum); +@@ -38,7 +38,7 @@ + UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters); + + count=1; +- converged=0; ++ converged=false; + + /*First get ug_horiz:*/ + femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); +@@ -83,7 +83,7 @@ + + /*Increase count: */ + count++; +- if(converged==1)break; ++ if(converged==true)break; + if(count>=max_nonlinear_iterations){ + _printf_(true," maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); + break; Index: /issm/oecreview/Archive/11268-11286/ISSM-11284-11285.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11284-11285.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11284-11285.diff (revision 11515) @@ -0,0 +1,58 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/convergence.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/convergence.cpp (revision 11284) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/convergence.cpp (revision 11285) +@@ -7,10 +7,10 @@ + #include "../io/io.h" + #include "../EnumDefinitions/EnumDefinitions.h" + +-void convergence(int* pconverged, Mat Kff,Vec pf,Vec uf,Vec old_uf,Parameters* parameters){ ++void convergence(bool* pconverged, Mat Kff,Vec pf,Vec uf,Vec old_uf,Parameters* parameters){ + + /*output*/ +- int converged=0; ++ bool converged=false; + + /*intermediary*/ + Vec KU=NULL; +@@ -33,7 +33,7 @@ + /*If uf is NULL in input, f-set is nil, model is fully constrained, therefore converged from + * the get go: */ + if(!uf){ +- *pconverged=1; ++ *pconverged=true; + return; + } + +@@ -81,11 +81,11 @@ + //print + if(res ",eps_res*100," %"); +- converged=0; ++ converged=false; + } + + /*Relative criterion (optional)*/ +@@ -107,7 +107,7 @@ + } + else{ + _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n"," Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %"); +- converged=0; ++ converged=false; + } + } + else _printf_(true,"%-50s%g%s\n"," Convergence criterion: norm(du)/norm(u)",ndu/nu*100," %"); +@@ -132,7 +132,7 @@ + } + else{ + _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n"," Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr"); +- converged=0; ++ converged=false; + } + } + else _printf_(true,"%-50s%g%s\n"," Convergence criterion: max(du)",nduinf*yts," m/yr"); Index: /issm/oecreview/Archive/11268-11286/ISSM-11285-11286.diff =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-11285-11286.diff (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-11285-11286.diff (revision 11515) @@ -0,0 +1,21 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11285) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11286) +@@ -21,6 +21,7 @@ + void thermal_core(FemModel* femmodel); + void thermal_core_step(FemModel* femmodel,int step, double time); + void enthalpy_core(FemModel* femmodel); ++void enthalpy_core_step(FemModel* femmodel,int step, double time); + void surfaceslope_core(FemModel* femmodel); + void bedslope_core(FemModel* femmodel); + void control_core(FemModel* femmodel); +@@ -33,7 +34,7 @@ + double objectivefunctionC(double search_scalar,OptArgs* optargs); + + //convergence: +-void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters); ++void convergence(bool* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters); + bool controlconvergence(double J,double tol_cm); + bool steadystateconvergence(FemModel* femmodel); + Index: /issm/oecreview/Archive/11268-11286/ISSM-DocReview-11268-11286.tex =================================================================== --- /issm/oecreview/Archive/11268-11286/ISSM-DocReview-11268-11286.tex (revision 11515) +++ /issm/oecreview/Archive/11268-11286/ISSM-DocReview-11268-11286.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11268-11286/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11268-11286/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11268-11286/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11268-11286 Index: /issm/oecreview/Archive/11268-11286/Makefile =================================================================== --- /issm/oecreview/Archive/11268-11286/Makefile (revision 11515) +++ /issm/oecreview/Archive/11268-11286/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11268-11286 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11268-11286/log.tex =================================================================== --- /issm/oecreview/Archive/11268-11286/log.tex (revision 11515) +++ /issm/oecreview/Archive/11268-11286/log.tex (revision 11515) @@ -0,0 +1,36 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11268-11269.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: minor tao initialization +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp pressure needed for enthalpy, add assert to avoid crash \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11269-11270.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: pressure needed for enthalpy, add assert to avoid crash +M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp spctemperature is now a column (for enthalpy solution), need to be improved to use IoModelCreateConstraints \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11270-11271.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp \\ Export determination: 6. \\Rationale: spctemperature is now a column (for enthalpy solution), need to be improved to use IoModelCreateConstraints +M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp minor \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11271-11272.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp minor \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11272-11273.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp fixed major problem for transient enthalpy \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11273-11274.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: fixed major problem for transient enthalpy +M /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim Added new enums to vim syntax \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11274-11275.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim \\ Export determination: 6. \\Rationale: Added new enums to vim syntax +M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/issm.cpp TAO is now optional depending on a model flag (md.inversion.tao), to avoid having to recompile all the time \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11275-11276.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/issm.cpp \\ Export determination: 6. \\Rationale: TAO is now optional depending on a model flag (md.inversion.tao), to avoid having to recompile all the time +M /issm/trunk-jpl/src/m/classes/inversion.m M /issm/trunk-jpl/src/m/model/plot/plot\_BC.m TAO is now optional depending on a model flag (md.inversion.tao), to avoid having to recompile all the time \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11276-11277.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/inversion.m M /issm/trunk-jpl/src/m/model/plot/plot\_BC.m \\ Export determination: 6. \\Rationale: TAO is now optional depending on a model flag (md.inversion.tao), to avoid having to recompile all the time +A /issm/trunk-jpl/src/m/enum/InversionTaoEnum.m Forgot to add enum/InversionTaoEnum.m \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11277-11278.diff: \\ Function name: \\A /issm/trunk-jpl/src/m/enum/InversionTaoEnum.m \\ Export determination: 6. \\Rationale: Forgot to add enum/InversionTaoEnum.m +M /issm/trunk-jpl/test/NightlyRun/test122.m M /issm/trunk-jpl/test/NightlyRun/test222.m tolerances \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11278-11279.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test122.m M /issm/trunk-jpl/test/NightlyRun/test222.m \\ Export determination: 6. \\Rationale: tolerances +M /issm/trunk-jpl/src/m/classes/initialization.m M /issm/trunk-jpl/src/m/solutions/enthalpy\_core.m minor for enthalpy solution \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11279-11280.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/initialization.m M /issm/trunk-jpl/src/m/solutions/enthalpy\_core.m \\ Export determination: 6. \\Rationale: minor for enthalpy solution +M /issm/trunk-jpl/scripts/Update.sh Added convertion of md.name \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11280-11281.diff: \\ Function name: \\M /issm/trunk-jpl/scripts/Update.sh \\ Export determination: 6. \\Rationale: Added convertion of md.name +M /issm/trunk-jpl/test/NightlyRun/IdToName.m A /issm/trunk-jpl/test/NightlyRun/test139.m A /issm/trunk-jpl/test/NightlyRun/test140.m A /issm/trunk-jpl/test/NightlyRun/test141.m A /issm/trunk-jpl/test/NightlyRun/test142.m A /issm/trunk-jpl/test/NightlyRun/test349.m A /issm/trunk-jpl/test/NightlyRun/test350.m A /issm/trunk-jpl/test/NightlyRun/test351.m A /issm/trunk-jpl/test/NightlyRun/test352.m added NR for enthalpy solution \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11281-11282.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/IdToName.m A /issm/trunk-jpl/test/NightlyRun/test139.m A /issm/trunk-jpl/test/NightlyRun/test140.m A /issm/trunk-jpl/test/NightlyRun/test141.m A /issm/trunk-jpl/test/NightlyRun/test142.m A /issm/trunk-jpl/test/NightlyRun/test349.m A /issm/trunk-jpl/test/NightlyRun/test350.m A /issm/trunk-jpl/test/NightlyRun/test351.m A /issm/trunk-jpl/test/NightlyRun/test352.m \\ Export determination: 6. \\Rationale: added NR for enthalpy solution +A /issm/trunk-jpl/test/Archives/Archive139.mat A /issm/trunk-jpl/test/Archives/Archive140.mat A /issm/trunk-jpl/test/Archives/Archive141.mat A /issm/trunk-jpl/test/Archives/Archive142.mat A /issm/trunk-jpl/test/Archives/Archive349.mat A /issm/trunk-jpl/test/Archives/Archive350.mat A /issm/trunk-jpl/test/Archives/Archive351.mat A /issm/trunk-jpl/test/Archives/Archive352.mat added archives for enthalpy NR \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11282-11283.diff: \\ Function name: \\A /issm/trunk-jpl/test/Archives/Archive139.mat A /issm/trunk-jpl/test/Archives/Archive140.mat A /issm/trunk-jpl/test/Archives/Archive141.mat A /issm/trunk-jpl/test/Archives/Archive142.mat A /issm/trunk-jpl/test/Archives/Archive349.mat A /issm/trunk-jpl/test/Archives/Archive350.mat A /issm/trunk-jpl/test/Archives/Archive351.mat A /issm/trunk-jpl/test/Archives/Archive352.mat \\ Export determination: 6. \\Rationale: added archives for enthalpy NR +M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp Fixed tao, now working smoothly \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11283-11284.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: Fixed tao, now working smoothly +M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp M /issm/trunk-jpl/src/c/solvers/solver\_stokescoupling\_nonlinear.cpp minor ConvergedEnum should always be a bool \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11284-11285.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp M /issm/trunk-jpl/src/c/solvers/solver\_stokescoupling\_nonlinear.cpp \\ Export determination: 6. \\Rationale: minor ConvergedEnum should always be a bool +M /issm/trunk-jpl/src/c/solutions/convergence.cpp minor convergenceEnum is a bool \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11285-11286.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/convergence.cpp \\ Export determination: 6. \\Rationale: minor convergenceEnum is a bool +M /issm/trunk-jpl/src/c/solutions/solutions.h header file missing \\\\ Index: /issm/oecreview/Archive/11268-11286/r1.tex =================================================================== --- /issm/oecreview/Archive/11268-11286/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11268-11286/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11268 Index: /issm/oecreview/Archive/11268-11286/r2.tex =================================================================== --- /issm/oecreview/Archive/11268-11286/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11268-11286/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11286 Index: /issm/oecreview/Archive/11286-11300/Date.tex =================================================================== --- /issm/oecreview/Archive/11286-11300/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11286-11300/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11286-11300/ISSM-11286-11287.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11286-11287.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11286-11287.diff (revision 11515) @@ -0,0 +1,12 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11286) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11287) +@@ -412,6 +412,7 @@ + thermal_psources = ./solutions/thermal_core.cpp\ + ./solutions/thermal_core_step.cpp\ + ./solutions/enthalpy_core.cpp\ ++ ./solutions/enthalpy_core_step.cpp\ + ./solvers/solver_thermal_nonlinear.cpp + #}}} + #Control sources {{{1 Index: /issm/oecreview/Archive/11286-11300/ISSM-11287-11288.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11287-11288.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11287-11288.diff (revision 11515) @@ -0,0 +1,31 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp (revision 11288) +@@ -0,0 +1,26 @@ ++/*!\file: enthalpy_core_step.cpp ++ * \brief: core of the enthalpy solution ++ */ ++ ++#include "../toolkits/toolkits.h" ++#include "../objects/objects.h" ++#include "../shared/shared.h" ++#include "../io/io.h" ++#include "../EnumDefinitions/EnumDefinitions.h" ++#include "./solutions.h" ++#include "../modules/modules.h" ++#include "../include/include.h" ++#include "../solvers/solvers.h" ++ ++void enthalpy_core_step(FemModel* femmodel,int step, double time){ ++ ++ bool modify_loads=true; ++ ++ _printf_(VerboseSolution()," computing enthalpy\n"); ++ femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum); ++ solver_nonlinear(femmodel,modify_loads); ++ ++ /*transfer water column thickness to old water column thickness: */ ++ //InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,EnthalpyOldEnum); ++ ++} Index: /issm/oecreview/Archive/11286-11300/ISSM-11288-11289.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11288-11289.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11288-11289.diff (revision 11515) @@ -0,0 +1,33 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11288) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11289) +@@ -34,11 +34,7 @@ + int ierr=TaoInitialize(&argc,&args,(char*)0,""); + if(ierr) _error_("Could not initialize Tao"); + +- /*Line search options*/ +- /*TAO options: http://www.mcs.anl.gov/research/projects/tao/docs/manualpages/solver/TaoSetFromOptions.html*/ + info = PetscOptionsSetValue("-tao_monitor",""); if(info) _error_("STOP"); +- info = PetscOptionsSetValue("-tao_max_its","20"); if(info) _error_("STOP"); +- info = PetscOptionsSetValue("-tao_max_funcs","50"); if(info) _error_("STOP"); + + /*Initialize argument*/ + user.femmodel=femmodel; +@@ -47,6 +43,8 @@ + info = TaoCreate(PETSC_COMM_WORLD,&tao); if(info) _error_("STOP"); + info = TaoSetType(tao,"tao_blmvm"); if(info) _error_("STOP"); + //info = TaoSetType(tao,"tao_cg"); if(info) _error_("STOP"); ++ TaoSetMaximumFunctionEvaluations(tao,10); ++ TaoSetMaximumIterations(tao,3); + + int size=femmodel->vertices->NumberOfVertices(); + Vec XL=NULL; +@@ -96,6 +94,7 @@ + VecCopy(gradient,G); + VecFree(&gradient); + CostFunctionx(fcn, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); ++ _printf_(true,"f(x)=%g\n",*fcn); + return 0; + } + Index: /issm/oecreview/Archive/11286-11300/ISSM-11289-11290.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11289-11290.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11289-11290.diff (revision 11515) @@ -0,0 +1,18 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11289) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11290) +@@ -415,7 +415,12 @@ + /*}}}1*/ + /*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{1*/ + double Matpar::GetEnthalpyDiffusionParameter(double enthalpy,double pressure){ +- return thermalconductivity/(rho_ice*heatcapacity); ++ if(enthalpyDemarshall(&marshalled_dataset); + dataset->AddObject(tria);} + break; +- case TriaVertexInputEnum:{ +- TriaVertexInput* triavertexinput=NULL; +- triavertexinput=new TriaVertexInput(); ++ case TriaP1InputEnum:{ ++ TriaP1Input* triavertexinput=NULL; ++ triavertexinput=new TriaP1Input(); + triavertexinput->Demarshall(&marshalled_dataset); + dataset->AddObject(triavertexinput);} + break; + #ifdef _HAVE_THREED_ +- case PentaVertexInputEnum:{ +- PentaVertexInput* pentavertexinput=NULL; +- pentavertexinput=new PentaVertexInput(); ++ case PentaP1InputEnum:{ ++ PentaP1Input* pentavertexinput=NULL; ++ pentavertexinput=new PentaP1Input(); + pentavertexinput->Demarshall(&marshalled_dataset); + dataset->AddObject(pentavertexinput);} + break; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11291) +@@ -254,7 +254,7 @@ + else if (strcmp(name,"Pengrid")==0) return PengridEnum; + else if (strcmp(name,"Penpair")==0) return PenpairEnum; + else if (strcmp(name,"Penta")==0) return PentaEnum; +- else if (strcmp(name,"PentaVertexInput")==0) return PentaVertexInputEnum; ++ else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum; + else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum; + else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum; + else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; +@@ -267,7 +267,7 @@ + else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; + else if (strcmp(name,"StringParam")==0) return StringParamEnum; + else if (strcmp(name,"Tria")==0) return TriaEnum; +- else if (strcmp(name,"TriaVertexInput")==0) return TriaVertexInputEnum; ++ else if (strcmp(name,"TriaP1Input")==0) return TriaP1InputEnum; + else if (strcmp(name,"Vertex")==0) return VertexEnum; + else if (strcmp(name,"Air")==0) return AirEnum; + else if (strcmp(name,"Ice")==0) return IceEnum; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11291) +@@ -256,7 +256,7 @@ + case PengridEnum : return "Pengrid"; + case PenpairEnum : return "Penpair"; + case PentaEnum : return "Penta"; +- case PentaVertexInputEnum : return "PentaVertexInput"; ++ case PentaP1InputEnum : return "PentaP1Input"; + case PetscMatParamEnum : return "PetscMatParam"; + case PetscVecParamEnum : return "PetscVecParam"; + case RiftfrontEnum : return "Riftfront"; +@@ -269,7 +269,7 @@ + case StringArrayParamEnum : return "StringArrayParam"; + case StringParamEnum : return "StringParam"; + case TriaEnum : return "Tria"; +- case TriaVertexInputEnum : return "TriaVertexInput"; ++ case TriaP1InputEnum : return "TriaP1Input"; + case VertexEnum : return "Vertex"; + case AirEnum : return "Air"; + case IceEnum : return "Ice"; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11291) +@@ -87,8 +87,8 @@ + ./objects/Elements/TriaRef.cpp\ + ./objects/Inputs/Input.h\ + ./objects/Inputs/InputLocal.h\ +- ./objects/Inputs/TriaVertexInput.h\ +- ./objects/Inputs/TriaVertexInput.cpp\ ++ ./objects/Inputs/TriaP1Input.h\ ++ ./objects/Inputs/TriaP1Input.cpp\ + ./objects/Inputs/BoolInput.h\ + ./objects/Inputs/BoolInput.cpp\ + ./objects/Inputs/IntInput.h\ +@@ -560,8 +560,8 @@ + ./objects/Gauss/GaussPenta.cpp\ + ./objects/ElementResults/PentaVertexElementResult.h\ + ./objects/ElementResults/PentaVertexElementResult.cpp\ +- ./objects/Inputs/PentaVertexInput.h\ +- ./objects/Inputs/PentaVertexInput.cpp\ ++ ./objects/Inputs/PentaP1Input.h\ ++ ./objects/Inputs/PentaP1Input.cpp\ + ./objects/Elements/Penta.h\ + ./objects/Elements/Penta.cpp\ + ./objects/Elements/PentaHook.h\ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11291) +@@ -551,7 +551,7 @@ + case TriaEnum: + double values[3]; + for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->nodes[i]->GetVertexDof()]; +- this->inputs->AddInput(new TriaVertexInput(name,values)); ++ this->inputs->AddInput(new TriaP1Input(name,values)); + return; + + default: _error_("element %s not implemented yet",EnumToStringx(element->ObjectEnum())); +@@ -593,7 +593,7 @@ + case TriaEnum: + double values[3]; + for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->nodes[i]->GetSidList()]; //use sid list, to index into serial oriented vector +- this->inputs->AddInput(new TriaVertexInput(name,values)); ++ this->inputs->AddInput(new TriaP1Input(name,values)); + /*Special case for rheology B in 2D: Pourave land for this solution{{{2*/ + if(name==MaterialsRheologyBEnum){ + /*Are we in 2D?:*/ +@@ -606,7 +606,7 @@ + parameters->FindParam(&dim,MeshDimensionEnum); + if(dim==2){ + /*Dupliacte rheology input: */ +- this->inputs->AddInput(new TriaVertexInput(MaterialsRheologyBbarEnum,values)); ++ this->inputs->AddInput(new TriaP1Input(MaterialsRheologyBbarEnum,values)); + } + } + /*}}}*/ +@@ -682,13 +682,13 @@ + /*Get B*/ + if (iomodel->Data(MaterialsRheologyBEnum)) { + for(i=0;iData(MaterialsRheologyBEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+i]-1)]; +- this->inputs->AddInput(new TriaVertexInput(MaterialsRheologyBbarEnum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(MaterialsRheologyBbarEnum,nodeinputs)); + } + + /*Get n*/ + if (iomodel->Data(MaterialsRheologyNEnum)) { + for(i=0;iData(MaterialsRheologyNEnum)[index]; +- this->inputs->AddInput(new TriaVertexInput(MaterialsRheologyNEnum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(MaterialsRheologyNEnum,nodeinputs)); + } + + /*Control Inputs*/ +@@ -702,7 +702,7 @@ + for(j=0;jData(MaterialsRheologyBEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)]; + for(j=0;jData(InversionMinParametersEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; +- this->inputs->AddInput(new ControlInput(MaterialsRheologyBbarEnum,TriaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(MaterialsRheologyBbarEnum,TriaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + } +@@ -724,13 +724,13 @@ + /*Get B*/ + if (iomodel->Data(MaterialsRheologyBEnum)) { + for(i=0;iData(MaterialsRheologyBEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+i]-1)]; +- this->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,nodeinputs)); + } + + /*Get n*/ + if (iomodel->Data(MaterialsRheologyNEnum)) { + for(i=0;iData(MaterialsRheologyNEnum)[index]; +- this->inputs->AddInput(new PentaVertexInput(MaterialsRheologyNEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(MaterialsRheologyNEnum,nodeinputs)); + } + + /*Control Inputs*/ +@@ -744,7 +744,7 @@ + for(j=0;jData(MaterialsRheologyBEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)]; + for(j=0;jData(InversionMinParametersEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; + for(j=0;jData(InversionMaxParametersEnum)[int(iomodel->Data(MeshElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; +- this->inputs->AddInput(new ControlInput(MaterialsRheologyBEnum,PentaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(MaterialsRheologyBEnum,PentaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 11291) +@@ -1,6 +1,6 @@ + /*! \file PentaVertexElementResult.h + * \brief: header file for penta vertex result object. +- * this object is just a PentaVertexInput with additional time and step info. ++ * this object is just a PentaP1Input with additional time and step info. + */ + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11291) +@@ -937,12 +937,12 @@ + } + + /*Add Stress tensor components into inputs*/ +- this->inputs->AddInput(new TriaVertexInput(StressTensorxxEnum,&sigma_xx[0])); +- this->inputs->AddInput(new TriaVertexInput(StressTensorxyEnum,&sigma_xy[0])); +- this->inputs->AddInput(new TriaVertexInput(StressTensorxzEnum,&sigma_xz[0])); +- this->inputs->AddInput(new TriaVertexInput(StressTensoryyEnum,&sigma_yy[0])); +- this->inputs->AddInput(new TriaVertexInput(StressTensoryzEnum,&sigma_yz[0])); +- this->inputs->AddInput(new TriaVertexInput(StressTensorzzEnum,&sigma_zz[0])); ++ this->inputs->AddInput(new TriaP1Input(StressTensorxxEnum,&sigma_xx[0])); ++ this->inputs->AddInput(new TriaP1Input(StressTensorxyEnum,&sigma_xy[0])); ++ this->inputs->AddInput(new TriaP1Input(StressTensorxzEnum,&sigma_xz[0])); ++ this->inputs->AddInput(new TriaP1Input(StressTensoryyEnum,&sigma_yy[0])); ++ this->inputs->AddInput(new TriaP1Input(StressTensoryzEnum,&sigma_yz[0])); ++ this->inputs->AddInput(new TriaP1Input(StressTensorzzEnum,&sigma_zz[0])); + + /*Clean up and return*/ + delete gauss; +@@ -1515,7 +1515,7 @@ + for(j=0;j<3;j++)nodeinputs[j]=iomodel->Data(BalancethicknessThickeningRateEnum)[tria_vertex_ids[j]-1]/yts; + for(j=0;j<3;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;j<3;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]/yts; +- this->inputs->AddInput(new ControlInput(BalancethicknessThickeningRateEnum,TriaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(BalancethicknessThickeningRateEnum,TriaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case VxEnum: +@@ -1523,7 +1523,7 @@ + for(j=0;j<3;j++)nodeinputs[j]=iomodel->Data(VxEnum)[tria_vertex_ids[j]-1]/yts; + for(j=0;j<3;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;j<3;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]/yts; +- this->inputs->AddInput(new ControlInput(VxEnum,TriaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(VxEnum,TriaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case VyEnum: +@@ -1531,7 +1531,7 @@ + for(j=0;j<3;j++)nodeinputs[j]=iomodel->Data(VyEnum)[tria_vertex_ids[j]-1]/yts; + for(j=0;j<3;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;j<3;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]/yts; +- this->inputs->AddInput(new ControlInput(VyEnum,TriaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(VyEnum,TriaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case FrictionCoefficientEnum: +@@ -1539,7 +1539,7 @@ + for(j=0;j<3;j++)nodeinputs[j]=iomodel->Data(FrictionCoefficientEnum)[tria_vertex_ids[j]-1]; + for(j=0;j<3;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;j<3;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(tria_vertex_ids[j]-1)*num_control_type+i]; +- this->inputs->AddInput(new ControlInput(FrictionCoefficientEnum,TriaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(FrictionCoefficientEnum,TriaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case MaterialsRheologyBbarEnum: +@@ -1558,7 +1558,7 @@ + DatasetInput* datasetinput=new DatasetInput(InversionCostFunctionsCoefficientsEnum); + for(i=0;iData(InversionCostFunctionsCoefficientsEnum)[(tria_vertex_ids[j]-1)*num_cm_responses+i]; +- datasetinput->inputs->AddObject(new TriaVertexInput(InversionCostFunctionsCoefficientsEnum,nodeinputs)); ++ datasetinput->inputs->AddObject(new TriaP1Input(InversionCostFunctionsCoefficientsEnum,nodeinputs)); + } + + /*Add datasetinput to element inputs*/ +@@ -1639,7 +1639,7 @@ + } + + /*Add input to the element: */ +- this->inputs->AddInput(new TriaVertexInput(enum_type,values)); ++ this->inputs->AddInput(new TriaP1Input(enum_type,values)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -1704,9 +1704,9 @@ + } + + /*Add input to the element: */ +- this->inputs->AddInput(new TriaVertexInput(ThicknessEnum,newthickness)); +- this->inputs->AddInput(new TriaVertexInput(SurfaceEnum,newsurface)); +- this->inputs->AddInput(new TriaVertexInput(BedEnum,newbed)); ++ this->inputs->AddInput(new TriaP1Input(ThicknessEnum,newthickness)); ++ this->inputs->AddInput(new TriaP1Input(SurfaceEnum,newsurface)); ++ this->inputs->AddInput(new TriaP1Input(BedEnum,newbed)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -1722,7 +1722,7 @@ + + case VertexEnum: + +- /*New TriaVertexInput*/ ++ /*New TriaP1Input*/ + double values[3]; + + /*Get values on the 3 vertices*/ +@@ -1732,10 +1732,10 @@ + + /*update input*/ + if (name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum){ +- matice->inputs->AddInput(new TriaVertexInput(name,values)); ++ matice->inputs->AddInput(new TriaP1Input(name,values)); + } + else{ +- this->inputs->AddInput(new TriaVertexInput(name,values)); ++ this->inputs->AddInput(new TriaP1Input(name,values)); + } + return; + +@@ -1811,7 +1811,7 @@ + UnitConversion(&nodeinputs[0], 3 ,ExtToIuEnum, vector_enum); + + /*create static input: */ +- this->inputs->AddInput(new TriaVertexInput(vector_enum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(vector_enum,nodeinputs)); + } + else if(M==numberofvertices+1){ + /*create transient input: */ +@@ -1830,7 +1830,7 @@ + time=(double)vector[(M-1)*N+t]*yts; + + if(t==0) transientinput=new TransientInput(vector_enum); +- transientinput->AddTimeInput(new TriaVertexInput(vector_enum,nodeinputs),time); ++ transientinput->AddTimeInput(new TriaP1Input(vector_enum,nodeinputs),time); + } + this->inputs->AddInput(transientinput); + } +@@ -2066,15 +2066,15 @@ + /*Add basal melting rate if element just ungrounded*/ + if(!this->IsFloating() && elementonshelf==true){ + for(i=0;iinputs->AddInput(new TriaVertexInput(BasalforcingsMeltingRateEnum,&melting[0])); ++ this->inputs->AddInput(new TriaP1Input(BasalforcingsMeltingRateEnum,&melting[0])); + } + + /*Update inputs*/ + this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf)); + + /*Update inputs*/ +- this->inputs->AddInput(new TriaVertexInput(SurfaceEnum,&s[0])); +- this->inputs->AddInput(new TriaVertexInput(BedEnum,&b[0])); ++ this->inputs->AddInput(new TriaP1Input(SurfaceEnum,&s[0])); ++ this->inputs->AddInput(new TriaP1Input(BedEnum,&b[0])); + } + /*}}}*/ + /*FUNCTION Tria::MyRank {{{1*/ +@@ -2397,24 +2397,24 @@ + /*default vx,vy and vz: either observation or 0 */ + if(!iomodel->Data(VxEnum)){ + for(i=0;i<3;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs)); +- if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(VxEnum,nodeinputs)); ++ if(dakota_analysis) this->inputs->AddInput(new TriaP1Input(QmuVxEnum,nodeinputs)); + } + if(!iomodel->Data(VyEnum)){ + for(i=0;i<3;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs)); +- if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(VyEnum,nodeinputs)); ++ if(dakota_analysis) this->inputs->AddInput(new TriaP1Input(QmuVyEnum,nodeinputs)); + } + if(!iomodel->Data(VzEnum)){ + for(i=0;i<3;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs)); +- if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(VzEnum,nodeinputs)); ++ if(dakota_analysis) this->inputs->AddInput(new TriaP1Input(QmuVzEnum,nodeinputs)); + } + if(!iomodel->Data(PressureEnum)){ + for(i=0;i<3;i++)nodeinputs[i]=0; + if(dakota_analysis){ +- this->inputs->AddInput(new TriaVertexInput(PressureEnum,nodeinputs)); +- this->inputs->AddInput(new TriaVertexInput(QmuPressureEnum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(PressureEnum,nodeinputs)); ++ this->inputs->AddInput(new TriaP1Input(QmuPressureEnum,nodeinputs)); + } + } + break; +@@ -3157,10 +3157,10 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new TriaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new TriaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new TriaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new TriaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new TriaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new TriaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new TriaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new TriaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -3217,10 +3217,10 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new TriaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new TriaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new TriaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new TriaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new TriaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new TriaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new TriaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new TriaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -3318,7 +3318,7 @@ + + this->GetDofList1(&doflist1[0]); + for(int i=0;iSetGradient(grad_input); + +@@ -4677,8 +4677,8 @@ + } + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new TriaVertexInput(AdjointxEnum,lambdax)); +- this->inputs->AddInput(new TriaVertexInput(AdjointyEnum,lambday)); ++ this->inputs->AddInput(new TriaP1Input(AdjointxEnum,lambdax)); ++ this->inputs->AddInput(new TriaP1Input(AdjointyEnum,lambday)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -4707,7 +4707,7 @@ + } + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new TriaVertexInput(AdjointEnum,lambda)); ++ this->inputs->AddInput(new TriaP1Input(AdjointEnum,lambda)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -4767,8 +4767,8 @@ + delete gauss; + + /*Add to inputs*/ +- this->inputs->AddInput(new TriaVertexInput(HydrologyWaterVxEnum,vx)); +- this->inputs->AddInput(new TriaVertexInput(HydrologyWaterVyEnum,vy)); ++ this->inputs->AddInput(new TriaP1Input(HydrologyWaterVxEnum,vx)); ++ this->inputs->AddInput(new TriaP1Input(HydrologyWaterVyEnum,vy)); + } + /*}}}*/ + /*FUNCTION Tria::CreateKMatrixHydrology{{{1*/ +@@ -4983,7 +4983,7 @@ + } + + /*Add input to the element: */ +- this->inputs->AddInput(new TriaVertexInput(WatercolumnEnum,values)); ++ this->inputs->AddInput(new TriaP1Input(WatercolumnEnum,values)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -5004,7 +5004,7 @@ + + case VertexEnum: + +- /*New TriaVertexInput*/ ++ /*New TriaP1Input*/ + double values[3]; + + /*Get values on the 3 vertices*/ +@@ -5077,14 +5077,14 @@ + } + + /*Add new inputs: */ +- this->inputs->AddInput(new TriaVertexInput(ThicknessEnum,thickness)); +- this->inputs->AddInput(new TriaVertexInput(BedEnum,bed)); +- this->inputs->AddInput(new TriaVertexInput(SurfaceEnum,surface)); ++ this->inputs->AddInput(new TriaP1Input(ThicknessEnum,thickness)); ++ this->inputs->AddInput(new TriaP1Input(BedEnum,bed)); ++ this->inputs->AddInput(new TriaP1Input(SurfaceEnum,surface)); + + /*}}}*/ + break; + default: +- this->inputs->AddInput(new TriaVertexInput(name,values)); ++ this->inputs->AddInput(new TriaP1Input(name,values)); + } + break; + +@@ -5136,7 +5136,7 @@ + time=(double)matrix[(nrows-1)*ncols+t]*yts; + + if(t==0) transientinput=new TransientInput(name); +- transientinput->AddTimeInput(new TriaVertexInput(name,values),time); ++ transientinput->AddTimeInput(new TriaP1Input(name,values),time); + transientinput->Configure(parameters); + } + this->inputs->AddInput(transientinput); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11291) +@@ -346,7 +346,7 @@ + /* Basal friction can only be found at the base of an ice sheet: */ + if (!IsOnBed() || IsFloating()){ + //empty friction: +- this->inputs->AddInput(new PentaVertexInput(BasalFrictionEnum,&basalfriction[0])); ++ this->inputs->AddInput(new PentaP1Input(BasalFrictionEnum,&basalfriction[0])); + return; + } + +@@ -374,7 +374,7 @@ + } + + /*Create PentaVertex input, which will hold the basal friction:*/ +- this->inputs->AddInput(new PentaVertexInput(BasalFrictionEnum,&basalfriction[0])); ++ this->inputs->AddInput(new PentaP1Input(BasalFrictionEnum,&basalfriction[0])); + + /*Clean up and return*/ + delete gauss; +@@ -522,12 +522,12 @@ + } + + /*Add Stress tensor components into inputs*/ +- this->inputs->AddInput(new PentaVertexInput(StressTensorxxEnum,&sigma_xx[0])); +- this->inputs->AddInput(new PentaVertexInput(StressTensorxyEnum,&sigma_xy[0])); +- this->inputs->AddInput(new PentaVertexInput(StressTensorxzEnum,&sigma_xz[0])); +- this->inputs->AddInput(new PentaVertexInput(StressTensoryyEnum,&sigma_yy[0])); +- this->inputs->AddInput(new PentaVertexInput(StressTensoryzEnum,&sigma_yz[0])); +- this->inputs->AddInput(new PentaVertexInput(StressTensorzzEnum,&sigma_zz[0])); ++ this->inputs->AddInput(new PentaP1Input(StressTensorxxEnum,&sigma_xx[0])); ++ this->inputs->AddInput(new PentaP1Input(StressTensorxyEnum,&sigma_xy[0])); ++ this->inputs->AddInput(new PentaP1Input(StressTensorxzEnum,&sigma_xz[0])); ++ this->inputs->AddInput(new PentaP1Input(StressTensoryyEnum,&sigma_yy[0])); ++ this->inputs->AddInput(new PentaP1Input(StressTensoryzEnum,&sigma_yz[0])); ++ this->inputs->AddInput(new PentaP1Input(StressTensorzzEnum,&sigma_zz[0])); + + /*Clean up and return*/ + delete gauss; +@@ -1346,7 +1346,7 @@ + UnitConversion(&nodeinputs[0], 6 ,ExtToIuEnum, vector_enum); + + /*create static input: */ +- this->inputs->AddInput(new PentaVertexInput(vector_enum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(vector_enum,nodeinputs)); + } + else if(M==numberofvertices+1){ + /*create transient input: */ +@@ -1365,7 +1365,7 @@ + time=(double)vector[(M-1)*N+t]*yts; + + if(t==0)transientinput=new TransientInput(vector_enum); +- transientinput->AddTimeInput(new PentaVertexInput(vector_enum,nodeinputs),time); ++ transientinput->AddTimeInput(new PentaP1Input(vector_enum,nodeinputs),time); + } + this->inputs->AddInput(transientinput); + } +@@ -1419,7 +1419,7 @@ + if(!IsOnBed()) return; + + /*OK, we are on bed. Initialize global inputs as 0*/ +- total_thickness_input =new PentaVertexInput(ThicknessEnum,zeros_list); ++ total_thickness_input =new PentaP1Input(ThicknessEnum,zeros_list); + + /*Now follow all the upper element from the base to the surface to integrate the input*/ + penta=this; +@@ -1437,10 +1437,10 @@ + + /*If first time, initialize total_integrated_input*/ + if (step==0){ +- if (original_input->ObjectEnum()==PentaVertexInputEnum) +- total_integrated_input=new PentaVertexInput(average_enum_type,zeros_list); ++ if (original_input->ObjectEnum()==PentaP1InputEnum) ++ total_integrated_input=new PentaP1Input(average_enum_type,zeros_list); + else if (original_input->ObjectEnum()==ControlInputEnum) +- total_integrated_input=new PentaVertexInput(average_enum_type,zeros_list); ++ total_integrated_input=new PentaP1Input(average_enum_type,zeros_list); + else if (original_input->ObjectEnum()==DoubleInputEnum) + total_integrated_input=new DoubleInput(average_enum_type,0.0); + else +@@ -1453,7 +1453,7 @@ + Helem_list[i]=xyz_list[i+3][2]-xyz_list[i][2]; + Helem_list[i+3]=Helem_list[i]; + } +- element_thickness_input=new PentaVertexInput(ThicknessEnum,Helem_list); ++ element_thickness_input=new PentaP1Input(ThicknessEnum,Helem_list); + + /*Step3: Vertically integrate A COPY of the original*/ + element_integrated_input=(Input*)original_input->copy(); +@@ -1680,7 +1680,7 @@ + for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(BalancethicknessThickeningRateEnum)[penta_vertex_ids[j]-1]/yts; + for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; +- this->inputs->AddInput(new ControlInput(BalancethicknessThickeningRateEnum,PentaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(BalancethicknessThickeningRateEnum,PentaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case VxEnum: +@@ -1688,7 +1688,7 @@ + for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(VxEnum)[penta_vertex_ids[j]-1]/yts; + for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; +- this->inputs->AddInput(new ControlInput(VxEnum,PentaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(VxEnum,PentaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case VyEnum: +@@ -1696,7 +1696,7 @@ + for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(VyEnum)[penta_vertex_ids[j]-1]/yts; + for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; + for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; +- this->inputs->AddInput(new ControlInput(VyEnum,PentaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(VyEnum,PentaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case FrictionCoefficientEnum: +@@ -1704,7 +1704,7 @@ + for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(FrictionCoefficientEnum)[penta_vertex_ids[j]-1]; + for(j=0;j<6;j++)cmmininputs[j]=iomodel->Data(InversionMinParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; + for(j=0;j<6;j++)cmmaxinputs[j]=iomodel->Data(InversionMaxParametersEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; +- this->inputs->AddInput(new ControlInput(FrictionCoefficientEnum,PentaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); ++ this->inputs->AddInput(new ControlInput(FrictionCoefficientEnum,PentaP1InputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); + } + break; + case MaterialsRheologyBbarEnum: +@@ -1754,7 +1754,7 @@ + DatasetInput* datasetinput=new DatasetInput(InversionCostFunctionsCoefficientsEnum); + for(i=0;iData(InversionCostFunctionsCoefficientsEnum)[(penta_vertex_ids[j]-1)*num_cm_responses+i]; +- datasetinput->inputs->AddObject(new PentaVertexInput(InversionCostFunctionsCoefficientsEnum,nodeinputs)); ++ datasetinput->inputs->AddObject(new PentaP1Input(InversionCostFunctionsCoefficientsEnum,nodeinputs)); + } + + /*Add datasetinput to element inputs*/ +@@ -1899,9 +1899,9 @@ + penta=this; + for(;;){ + /*Add input to the element: */ +- penta->inputs->AddInput(new PentaVertexInput(ThicknessEnum,newthickness)); +- penta->inputs->AddInput(new PentaVertexInput(SurfaceEnum,newsurface)); +- penta->inputs->AddInput(new PentaVertexInput(BedEnum,newbed)); ++ penta->inputs->AddInput(new PentaP1Input(ThicknessEnum,newthickness)); ++ penta->inputs->AddInput(new PentaP1Input(SurfaceEnum,newsurface)); ++ penta->inputs->AddInput(new PentaP1Input(BedEnum,newbed)); + + /*Stop if we have reached the surface*/ + if (penta->IsOnSurface()) break; +@@ -1932,7 +1932,7 @@ + } + + /*Add input to the element: */ +- this->inputs->AddInput(new PentaVertexInput(enum_type,values)); ++ this->inputs->AddInput(new PentaP1Input(enum_type,values)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -1965,7 +1965,7 @@ + penta=this; + for(;;){ + /*Add input to the element: */ +- penta->inputs->AddInput(new PentaVertexInput(enum_type,values)); ++ penta->inputs->AddInput(new PentaP1Input(enum_type,values)); + + /*Stop if we have reached the surface*/ + if (penta->IsOnSurface()) break; +@@ -1999,7 +1999,7 @@ + } + + /*update input*/ +- this->inputs->AddInput(new PentaVertexInput(name,values)); ++ this->inputs->AddInput(new PentaP1Input(name,values)); + return; + + default: +@@ -2240,12 +2240,12 @@ + /*Add basal melting rate if element just ungrounded*/ + if(!this->IsFloating() && elementonshelf==true){ + for(i=0;iinputs->AddInput(new PentaVertexInput(BasalforcingsMeltingRateEnum,&melting[0])); ++ this->inputs->AddInput(new PentaP1Input(BasalforcingsMeltingRateEnum,&melting[0])); + } + + /*Update inputs*/ +- this->inputs->AddInput(new PentaVertexInput(SurfaceEnum,&s[0])); +- this->inputs->AddInput(new PentaVertexInput(BedEnum,&b[0])); ++ this->inputs->AddInput(new PentaP1Input(SurfaceEnum,&s[0])); ++ this->inputs->AddInput(new PentaP1Input(BedEnum,&b[0])); + this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf)); + + /*Extrude inputs*/ +@@ -2767,56 +2767,56 @@ + /*default vx,vy and vz: either observation or 0 */ + if(!iomodel->Data(VxEnum)){ + for(i=0;i<6;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs)); +- if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VxEnum,nodeinputs)); ++ if(dakota_analysis) this->inputs->AddInput(new PentaP1Input(QmuVxEnum,nodeinputs)); + } + if(!iomodel->Data(VyEnum)){ + for(i=0;i<6;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs)); +- if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VyEnum,nodeinputs)); ++ if(dakota_analysis) this->inputs->AddInput(new PentaP1Input(QmuVyEnum,nodeinputs)); + } + if(!iomodel->Data(VzEnum)){ + for(i=0;i<6;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs)); +- if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzEnum,nodeinputs)); ++ if(dakota_analysis) this->inputs->AddInput(new PentaP1Input(QmuVzEnum,nodeinputs)); + } + if(!iomodel->Data(PressureEnum)){ + for(i=0;i<6;i++)nodeinputs[i]=0; + if(dakota_analysis){ +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(QmuPressureEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(QmuPressureEnum,nodeinputs)); + } + if(isstokes){ +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(PressurePicardEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(PressurePicardEnum,nodeinputs)); + } + } + if(*(iomodel->Data(FlowequationElementEquationEnum)+index)==PattynStokesApproximationEnum){ + /*Create VzPattyn and VzStokes Enums*/ + if(iomodel->Data(VzEnum) && iomodel->Data(FlowequationBorderstokesEnum)){ + for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->Data(FlowequationBorderstokesEnum)[penta_vertex_ids[i]-1]; +- this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzStokesEnum,nodeinputs)); + for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*(1-iomodel->Data(FlowequationBorderstokesEnum)[penta_vertex_ids[i]-1]); +- this->inputs->AddInput(new PentaVertexInput(VzPattynEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzPattynEnum,nodeinputs)); + } + else{ + for(i=0;i<6;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(VzPattynEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzStokesEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzPattynEnum,nodeinputs)); + } + } + if(*(iomodel->Data(FlowequationElementEquationEnum)+index)==MacAyealStokesApproximationEnum){ + /*Create VzMacAyeal and VzStokes Enums*/ + if(iomodel->Data(VzEnum) && iomodel->Data(FlowequationBorderstokesEnum)){ + for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->Data(FlowequationBorderstokesEnum)[penta_vertex_ids[i]-1]; +- this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzStokesEnum,nodeinputs)); + for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*(1-iomodel->Data(FlowequationBorderstokesEnum)[penta_vertex_ids[i]-1]); +- this->inputs->AddInput(new PentaVertexInput(VzMacAyealEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzMacAyealEnum,nodeinputs)); + } + else{ + for(i=0;i<6;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(VzMacAyealEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzStokesEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzMacAyealEnum,nodeinputs)); + } + } + break; +@@ -2824,17 +2824,17 @@ + case ThermalAnalysisEnum: + /*Initialize mesh velocity*/ + for(i=0;i<6;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new PentaVertexInput(VxMeshEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(VyMeshEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(VzMeshEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VxMeshEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VyMeshEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzMeshEnum,nodeinputs)); + break; + + case EnthalpyAnalysisEnum: + /*Initialize mesh velocity*/ + for(i=0;i<6;i++)nodeinputs[i]=0; +- this->inputs->AddInput(new PentaVertexInput(VxMeshEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(VyMeshEnum,nodeinputs)); +- this->inputs->AddInput(new PentaVertexInput(VzMeshEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VxMeshEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VyMeshEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(VzMeshEnum,nodeinputs)); + if (iomodel->Data(TemperatureEnum) && iomodel->Data(WaterfractionEnum) && iomodel->Data(PressureEnum)) { + for(i=0;i<6;i++){ + if(iomodel->Data(TemperatureEnum)[penta_vertex_ids[i]-1] < meltingpoint-beta*iomodel->Data(PressureEnum)[penta_vertex_ids[i]-1]){ +@@ -2844,7 +2844,7 @@ + (meltingpoint-beta*iomodel->Data(PressureEnum)[penta_vertex_ids[i]-1]-referencetemperature) + +latentheat*iomodel->Data(WaterfractionEnum)[penta_vertex_ids[i]-1]; + } +- this->inputs->AddInput(new PentaVertexInput(EnthalpyEnum,nodeinputs)); ++ this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,nodeinputs)); + } + else _error_("temperature and waterfraction required for the enthalpy solution"); + break; +@@ -2917,7 +2917,7 @@ + } + + /*Create PentaVertex input, which will hold the basal friction:*/ +- this->inputs->AddInput(new PentaVertexInput(ViscousHeatingEnum,&viscousheating[0])); ++ this->inputs->AddInput(new PentaP1Input(ViscousHeatingEnum,&viscousheating[0])); + + /*Clean up and return*/ + delete gauss; +@@ -4198,7 +4198,7 @@ + + this->inputs->GetInputValue(&converged,ConvergedEnum); + if(converged){ +- this->inputs->AddInput(new PentaVertexInput(TemperatureEnum,values)); ++ this->inputs->AddInput(new PentaP1Input(TemperatureEnum,values)); + + /*Update Rheology only if converged (we must make sure that the temperature is below melting point + * otherwise the rheology could be negative*/ +@@ -4210,7 +4210,7 @@ + case PatersonEnum: + B_average=Paterson((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0); + for(i=0;imatice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B)); ++ this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); + break; + case ArrheniusEnum: + surface_input->GetInputAverage(&s_average); +@@ -4218,7 +4218,7 @@ + s_average-((xyz_list[0][2]+xyz_list[1][2]+xyz_list[2][2]+xyz_list[3][2]+xyz_list[4][2]+xyz_list[5][2])/6.0), + matice->GetN()); + for(i=0;imatice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B)); ++ this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); + break; + default: + _error_("Rheology law %s not supported yet",EnumToStringx(rheology_law)); +@@ -4226,7 +4226,7 @@ + } + } + else{ +- this->inputs->AddInput(new PentaVertexInput(TemperaturePicardEnum,values)); ++ this->inputs->AddInput(new PentaP1Input(TemperaturePicardEnum,values)); + } + + /*Free ressources:*/ +@@ -4271,9 +4271,9 @@ + /*Convert enthalpy into temperature and water fraction*/ + for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); + +- this->inputs->AddInput(new PentaVertexInput(EnthalpyEnum,values)); +- this->inputs->AddInput(new PentaVertexInput(WaterfractionEnum,waterfraction)); +- this->inputs->AddInput(new PentaVertexInput(TemperatureEnum,temperatures)); ++ this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,values)); ++ this->inputs->AddInput(new PentaP1Input(WaterfractionEnum,waterfraction)); ++ this->inputs->AddInput(new PentaP1Input(TemperatureEnum,temperatures)); + + /*Update Rheology only if converged (we must make sure that the temperature is below melting point + * otherwise the rheology could be negative*/ +@@ -4285,7 +4285,7 @@ + case PatersonEnum: + B_average=Paterson((temperatures[0]+temperatures[1]+temperatures[2]+temperatures[3]+temperatures[4]+temperatures[5])/6.0); + for(i=0;imatice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B)); ++ this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); + break; + case ArrheniusEnum: + surface_input->GetInputAverage(&s_average); +@@ -4293,7 +4293,7 @@ + s_average-((xyz_list[0][2]+xyz_list[1][2]+xyz_list[2][2]+xyz_list[3][2]+xyz_list[4][2]+xyz_list[5][2])/6.0), + matice->GetN()); + for(i=0;imatice->inputs->AddInput(new PentaVertexInput(MaterialsRheologyBEnum,B)); ++ this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); + break; + default: + _error_("Rheology law %s not supported yet",EnumToStringx(rheology_law)); +@@ -4301,7 +4301,7 @@ + } + // } + // else{ +-// this->inputs->AddInput(new PentaVertexInput(EnthalpyPicardEnum,values)); ++// this->inputs->AddInput(new PentaP1Input(EnthalpyPicardEnum,values)); + // } + + /*Free ressources:*/ +@@ -4366,7 +4366,7 @@ + + this->GetDofList1(&doflist1[0]); + for(int i=0;iSetGradient(grad_input); + + }/*}}}*/ +@@ -4822,10 +4822,10 @@ + } + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(AdjointxEnum,lambdax)); +- this->inputs->AddInput(new PentaVertexInput(AdjointyEnum,lambday)); +- this->inputs->AddInput(new PentaVertexInput(AdjointzEnum,lambdaz)); +- this->inputs->AddInput(new PentaVertexInput(AdjointpEnum,lambdap)); ++ this->inputs->AddInput(new PentaP1Input(AdjointxEnum,lambdax)); ++ this->inputs->AddInput(new PentaP1Input(AdjointyEnum,lambday)); ++ this->inputs->AddInput(new PentaP1Input(AdjointzEnum,lambdaz)); ++ this->inputs->AddInput(new PentaP1Input(AdjointpEnum,lambdap)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -4859,8 +4859,8 @@ + } + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(AdjointxEnum,lambdax)); +- this->inputs->AddInput(new PentaVertexInput(AdjointyEnum,lambday)); ++ this->inputs->AddInput(new PentaP1Input(AdjointxEnum,lambdax)); ++ this->inputs->AddInput(new PentaP1Input(AdjointyEnum,lambday)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -5124,7 +5124,7 @@ + + case VertexEnum: + +- /*New PentaVertexInput*/ ++ /*New PentaP1Input*/ + double values[6]; + + /*Get values on the 6 vertices*/ +@@ -5197,14 +5197,14 @@ + } + + /*Add new inputs: */ +- this->inputs->AddInput(new PentaVertexInput(ThicknessEnum,thickness)); +- this->inputs->AddInput(new PentaVertexInput(BedEnum,bed)); +- this->inputs->AddInput(new PentaVertexInput(SurfaceEnum,surface)); ++ this->inputs->AddInput(new PentaP1Input(ThicknessEnum,thickness)); ++ this->inputs->AddInput(new PentaP1Input(BedEnum,bed)); ++ this->inputs->AddInput(new PentaP1Input(SurfaceEnum,surface)); + + /*}}}*/ + break; + default: +- this->inputs->AddInput(new PentaVertexInput(name,values)); ++ this->inputs->AddInput(new PentaP1Input(name,values)); + } + break; + +@@ -5257,7 +5257,7 @@ + time=(double)matrix[(nrows-1)*ncols+t]*yts; + + if(t==0) transientinput=new TransientInput(name); +- transientinput->AddTimeInput(new PentaVertexInput(name,values),time); ++ transientinput->AddTimeInput(new PentaP1Input(name,values),time); + transientinput->Configure(parameters); + } + this->inputs->AddInput(transientinput); +@@ -7568,10 +7568,10 @@ + penta->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- penta->inputs->AddInput(new PentaVertexInput(VxEnum,vx)); +- penta->inputs->AddInput(new PentaVertexInput(VyEnum,vy)); +- penta->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); +- penta->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ penta->inputs->AddInput(new PentaP1Input(VxEnum,vx)); ++ penta->inputs->AddInput(new PentaP1Input(VyEnum,vy)); ++ penta->inputs->AddInput(new PentaP1Input(VelEnum,vel)); ++ penta->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + + /*Stop if we have reached the surface*/ + if (penta->IsOnSurface()) break; +@@ -7658,10 +7658,10 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new PentaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new PentaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new PentaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new PentaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflistp); +@@ -7733,7 +7733,7 @@ + /*Get Vz*/ + Input* vzmacayeal_input=inputs->GetInput(VzMacAyealEnum); + if (vzmacayeal_input){ +- if (vzmacayeal_input->ObjectEnum()!=PentaVertexInputEnum){ ++ if (vzmacayeal_input->ObjectEnum()!=PentaP1InputEnum){ + _error_("Cannot compute Vel as VzMacAyeal is of type %s",EnumToStringx(vzmacayeal_input->ObjectEnum())); + } + GetInputListOnVertices(&vzmacayeal[0],VzMacAyealEnum); +@@ -7756,12 +7756,12 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new PentaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new PentaVertexInput(VzEnum,vz)); +- this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,vzstokes)); +- this->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new PentaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new PentaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new PentaP1Input(VzEnum,vz)); ++ this->inputs->AddInput(new PentaP1Input(VzStokesEnum,vzstokes)); ++ this->inputs->AddInput(new PentaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflistm); +@@ -7833,10 +7833,10 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new PentaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new PentaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new PentaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new PentaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -7901,7 +7901,7 @@ + /*Get Vz*/ + Input* vzpattyn_input=inputs->GetInput(VzPattynEnum); + if (vzpattyn_input){ +- if (vzpattyn_input->ObjectEnum()!=PentaVertexInputEnum){ ++ if (vzpattyn_input->ObjectEnum()!=PentaP1InputEnum){ + _error_("Cannot compute Vel as VzPattyn is of type %s",EnumToStringx(vzpattyn_input->ObjectEnum())); + } + GetInputListOnVertices(&vzpattyn[0],VzPattynEnum); +@@ -7924,12 +7924,12 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new PentaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new PentaVertexInput(VzEnum,vz)); +- this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,vzstokes)); +- this->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new PentaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new PentaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new PentaP1Input(VzEnum,vz)); ++ this->inputs->AddInput(new PentaP1Input(VzStokesEnum,vzstokes)); ++ this->inputs->AddInput(new PentaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflistp); +@@ -7990,10 +7990,10 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new PentaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new PentaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new PentaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new PentaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -8048,7 +8048,7 @@ + if(approximation==PattynStokesApproximationEnum){ + Input* vzstokes_input=inputs->GetInput(VzStokesEnum); + if (vzstokes_input){ +- if (vzstokes_input->ObjectEnum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vzstokes_input->ObjectEnum())); ++ if (vzstokes_input->ObjectEnum()!=PentaP1InputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vzstokes_input->ObjectEnum())); + GetInputListOnVertices(&vzstokes[0],VzStokesEnum); + } + else _error_("Cannot compute Vz as VzStokes in not present in PattynStokes element"); +@@ -8060,7 +8060,7 @@ + else if(approximation==MacAyealStokesApproximationEnum){ + Input* vzstokes_input=inputs->GetInput(VzStokesEnum); + if (vzstokes_input){ +- if (vzstokes_input->ObjectEnum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vzstokes_input->ObjectEnum())); ++ if (vzstokes_input->ObjectEnum()!=PentaP1InputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vzstokes_input->ObjectEnum())); + GetInputListOnVertices(&vzstokes[0],VzStokesEnum); + } + else _error_("Cannot compute Vz as VzStokes in not present in MacAyealStokes element"); +@@ -8088,16 +8088,16 @@ + + if(approximation!=PattynStokesApproximationEnum && approximation!=MacAyealStokesApproximationEnum){ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + } + else if(approximation==PattynStokesApproximationEnum){ +- this->inputs->AddInput(new PentaVertexInput(VzPattynEnum,vzpattyn)); ++ this->inputs->AddInput(new PentaP1Input(VzPattynEnum,vzpattyn)); + } + else if(approximation==MacAyealStokesApproximationEnum){ +- this->inputs->AddInput(new PentaVertexInput(VzMacAyealEnum,vzmacayeal)); ++ this->inputs->AddInput(new PentaP1Input(VzMacAyealEnum,vzmacayeal)); + } +- this->inputs->AddInput(new PentaVertexInput(VzEnum,vz)); +- this->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); ++ this->inputs->AddInput(new PentaP1Input(VzEnum,vz)); ++ this->inputs->AddInput(new PentaP1Input(VelEnum,vel)); + + /*Free ressources:*/ + xfree((void**)&doflist); +@@ -8154,11 +8154,11 @@ + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); + + /*Add vx and vy as inputs to the tria element: */ +- this->inputs->AddInput(new PentaVertexInput(VxEnum,vx)); +- this->inputs->AddInput(new PentaVertexInput(VyEnum,vy)); +- this->inputs->AddInput(new PentaVertexInput(VzEnum,vz)); +- this->inputs->AddInput(new PentaVertexInput(VelEnum,vel)); +- this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); ++ this->inputs->AddInput(new PentaP1Input(VxEnum,vx)); ++ this->inputs->AddInput(new PentaP1Input(VyEnum,vy)); ++ this->inputs->AddInput(new PentaP1Input(VzEnum,vz)); ++ this->inputs->AddInput(new PentaP1Input(VelEnum,vel)); ++ this->inputs->AddInput(new PentaP1Input(PressureEnum,pressure)); + + /*Free ressources:*/ + xfree((void**)&doflist); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h (revision 11291) +@@ -87,8 +87,8 @@ + #include "./Inputs/BoolInput.h" + #include "./Inputs/DoubleInput.h" + #include "./Inputs/IntInput.h" +-#include "./Inputs/PentaVertexInput.h" +-#include "./Inputs/TriaVertexInput.h" ++#include "./Inputs/PentaP1Input.h" ++#include "./Inputs/TriaP1Input.h" + #include "./Inputs/ControlInput.h" + #include "./Inputs/DatasetInput.h" + #include "./Inputs/TransientInput.h" +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.cpp (revision 11291) +@@ -1,473 +0,0 @@ +-/*!\file TriaVertexInput.c +- * \brief: implementation of the TriaVertexInput object +- */ +- +-#ifdef HAVE_CONFIG_H +- #include +-#else +-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +-#endif +- +-#include +-#include +-#include "../objects.h" +-#include "../../EnumDefinitions/EnumDefinitions.h" +-#include "../../shared/shared.h" +-#include "../../Container/Container.h" +-#include "../../include/include.h" +- +-/*TriaVertexInput constructors and destructor*/ +-/*FUNCTION TriaVertexInput::TriaVertexInput(){{{1*/ +-TriaVertexInput::TriaVertexInput(){ +- return; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::TriaVertexInput(int in_enum_type,double* values){{{1*/ +-TriaVertexInput::TriaVertexInput(int in_enum_type,double* in_values) +- :TriaRef(1) +-{ +- +- /*Set TriaRef*/ +- this->SetElementType(P1Enum,0); +- this->element_type=P1Enum; +- +- /*Set Enum*/ +- enum_type=in_enum_type; +- +- /*Set values*/ +- values[0]=in_values[0]; +- values[1]=in_values[1]; +- values[2]=in_values[2]; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::~TriaVertexInput(){{{1*/ +-TriaVertexInput::~TriaVertexInput(){ +- return; +-} +-/*}}}*/ +- +-/*Object virtual functions definitions:*/ +-/*FUNCTION TriaVertexInput::Echo {{{1*/ +-void TriaVertexInput::Echo(void){ +- this->DeepEcho(); +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::DeepEcho{{{1*/ +-void TriaVertexInput::DeepEcho(void){ +- +- printf("TriaVertexInput:\n"); +- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); +- printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::Id{{{1*/ +-int TriaVertexInput::Id(void){ return -1; } +-/*}}}*/ +-/*FUNCTION TriaVertexInput::MyRank{{{1*/ +-int TriaVertexInput::MyRank(void){ +- extern int my_rank; +- return my_rank; +-} +-/*}}}*/ +-#ifdef _SERIAL_ +-/*FUNCTION TriaVertexInput::Marshall{{{1*/ +-void TriaVertexInput::Marshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int enum_value=0; +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*get enum value of TriaVertexInput: */ +- enum_value=TriaVertexInputEnum; +- +- /*marshall enum: */ +- memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); +- +- /*marshall TriaVertexInput data: */ +- memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); +- +- *pmarshalled_dataset=marshalled_dataset; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::MarshallSize{{{1*/ +-int TriaVertexInput::MarshallSize(){ +- +- return sizeof(values)+ +- +sizeof(enum_type)+ +- +sizeof(int); //sizeof(int) for enum value +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::Demarshall{{{1*/ +-void TriaVertexInput::Demarshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int i; +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*this time, no need to get enum type, the pointer directly points to the beginning of the +- *object data (thanks to DataSet::Demarshall):*/ +- memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); +- +- /*return: */ +- *pmarshalled_dataset=marshalled_dataset; +- return; +-} +-/*}}}*/ +-#endif +-/*FUNCTION TriaVertexInput::ObjectEnum{{{1*/ +-int TriaVertexInput::ObjectEnum(void){ +- +- return TriaVertexInputEnum; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::copy{{{1*/ +-Object* TriaVertexInput::copy() { +- +- return new TriaVertexInput(this->enum_type,this->values); +- +-} +-/*}}}*/ +- +-/*TriaVertexInput management*/ +-/*FUNCTION TriaVertexInput::InstanceEnum{{{1*/ +-int TriaVertexInput::InstanceEnum(void){ +- +- return this->enum_type; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::SpawnTriaInput{{{1*/ +-Input* TriaVertexInput::SpawnTriaInput(int* indices){ +- +- /*output*/ +- TriaVertexInput* outinput=NULL; +- +- /*Create new Tria input (copy of current input)*/ +- outinput=new TriaVertexInput(this->enum_type,&this->values[0]); +- +- /*Assign output*/ +- return outinput; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::SpawnResult{{{1*/ +-ElementResult* TriaVertexInput::SpawnResult(int step, double time){ +- +- return new TriaVertexElementResult(this->enum_type,this->values,step,time); +- +-} +-/*}}}*/ +- +-/*Object functions*/ +-/*FUNCTION TriaVertexInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ +-void TriaVertexInput::GetInputValue(double* pvalue,GaussTria* gauss){ +- +- /*Call TriaRef function*/ +- TriaRef::GetInputValue(pvalue,&values[0],gauss); +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/ +-void TriaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){ +- +- /*Call TriaRef function*/ +- TriaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/ +-void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ +- +- /*Intermediary*/ +- int i; +- const int numnodes=3; +- double B[3][NDOF2*numnodes]; +- double velocity[3][NDOF2]; +- +- /*Get B matrix: */ +- GetBMacAyeal(&B[0][0], xyz_list, gauss); +- +- /*Here, we are computing the strain rate of (vx,0)*/ +- for(i=0;i<3;i++){ +- velocity[i][0]=this->values[i]; +- velocity[i][1]=0.0; +- } +- /*Get epsilon(vx) = B*velocity*/ +- MatrixMultiply( &B[0][0],3,NDOF2*numnodes,0, +- &velocity[0][0],NDOF2*numnodes,1,0, +- epsilonvx,0); +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::GetVyStrainRate2d{{{1*/ +-void TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ +- +- /*Intermediary*/ +- int i; +- const int numnodes=3; +- double B[3][NDOF2*numnodes]; +- double velocity[3][NDOF2]; +- +- /*Get B matrix: */ +- GetBMacAyeal(&B[0][0], xyz_list, gauss); +- +- /*Here, we are computing the strain rate of (0,vy)*/ +- for(i=0;i<3;i++){ +- velocity[i][0]=0.0; +- velocity[i][1]=this->values[i]; +- } +- /*Get epsilon(vy) = B*velocity*/ +- MatrixMultiply( &B[0][0],3,NDOF2*numnodes,0, +- &velocity[0][0],NDOF2*numnodes,1,0, +- epsilonvy,0); +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::ChangeEnum{{{1*/ +-void TriaVertexInput::ChangeEnum(int newenumtype){ +- this->enum_type=newenumtype; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::GetInputAverage{{{1*/ +-void TriaVertexInput::GetInputAverage(double* pvalue){ +- *pvalue=1./3.*(values[0]+values[1]+values[2]); +-} +-/*}}}*/ +- +-/*Intermediary*/ +-/*FUNCTION TriaVertexInput::SquareMin{{{1*/ +-void TriaVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ +- +- int i; +- const int numnodes=3; +- double valuescopy[numnodes]; +- double squaremin; +- +- /*First, copy values, to process units if requested: */ +- for(i=0;ivalues[i]; +- +- /*Process units if requested: */ +- if(process_units)UnitConversion(&valuescopy[0],numnodes,IuToExtEnum,enum_type); +- +- /*Now, figure out minimum of valuescopy: */ +- squaremin=pow(valuescopy[0],2); +- for(i=1;inorm) norm=fabs(values[i]); +- return norm; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::Max{{{1*/ +-double TriaVertexInput::Max(void){ +- +- const int numnodes=3; +- double max=values[0]; +- +- for(int i=1;imax) max=values[i]; +- } +- return max; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::MaxAbs{{{1*/ +-double TriaVertexInput::MaxAbs(void){ +- +- const int numnodes=3; +- double max=fabs(values[0]); +- +- for(int i=1;imax) max=fabs(values[i]); +- } +- return max; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::Min{{{1*/ +-double TriaVertexInput::Min(void){ +- +- const int numnodes=3; +- double min=values[0]; +- +- for(int i=1;iObjectEnum()){ +- +- case TriaVertexInputEnum : +- for(i=0;ivalues[i]=this->values[i]+scalar*xtriavertexinput->values[i]; +- return; +- +- default : +- _error_("not implemented yet"); +- } +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::Constrain{{{1*/ +-void TriaVertexInput::Constrain(double cm_min, double cm_max){ +- +- int i; +- const int numnodes=3; +- +- if(!isnan(cm_min)) for(i=0;ivalues[i]values[i]=cm_min; +- if(!isnan(cm_max)) for(i=0;ivalues[i]>cm_max)this->values[i]=cm_max; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::GetVectorFromInputs{{{1*/ +-void TriaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ +- +- const int numvertices=3; +- VecSetValues(vector,numvertices,doflist,(const double*)this->values,INSERT_VALUES); +- +-} /*}}}*/ +-/*FUNCTION TriaVertexInput::GetValuesPtr{{{1*/ +-void TriaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ +- +- *pvalues=this->values; +- if(pnum_values)*pnum_values=3; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::PointwiseMin{{{1*/ +-Input* TriaVertexInput::PointwiseMin(Input* inputB){ +- +- /*Ouput*/ +- TriaVertexInput* outinput=NULL; +- +- /*Intermediaries*/ +- int i; +- TriaVertexInput *xinputB = NULL; +- int B_numvalues; +- const int numnodes = 3; +- double minvalues[numnodes]; +- +- /*Check that inputB is of the same type*/ +- if (inputB->ObjectEnum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); +- xinputB=(TriaVertexInput*)inputB; +- +- /*Create point wise min*/ +- for(i=0;ivalues[i] > xinputB->values[i]) minvalues[i]=xinputB->values[i]; +- else minvalues[i]=this->values[i]; +- } +- +- /*Create new Tria vertex input (copy of current input)*/ +- outinput=new TriaVertexInput(this->enum_type,&minvalues[0]); +- +- /*Return output pointer*/ +- return outinput; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::PointwiseMax{{{1*/ +-Input* TriaVertexInput::PointwiseMax(Input* inputB){ +- +- /*Ouput*/ +- TriaVertexInput* outinput=NULL; +- +- /*Intermediaries*/ +- int i; +- TriaVertexInput *xinputB = NULL; +- int B_numvalues; +- const int numnodes = 3; +- double maxvalues[numnodes]; +- +- /*Check that inputB is of the same type*/ +- if (inputB->ObjectEnum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); +- xinputB=(TriaVertexInput*)inputB; +- +- /*Create point wise max*/ +- for(i=0;ivalues[i] < xinputB->values[i]) maxvalues[i]=xinputB->values[i]; +- else maxvalues[i]=this->values[i]; +- } +- +- /*Create new Tria vertex input (copy of current input)*/ +- outinput=new TriaVertexInput(this->enum_type,&maxvalues[0]); +- +- /*Return output pointer*/ +- return outinput; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexInput::Configure{{{1*/ +-void TriaVertexInput::Configure(Parameters* parameters){ +- /*do nothing: */ +-} +-/*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.h (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.h (revision 11291) +@@ -1,89 +0,0 @@ +-/*! \file TriaVertexInput.h +- * \brief: header file for triavertexinput object +- */ +- +- +-#ifndef _TRIAVERTEXINPUT_H_ +-#define _TRIAVERTEXINPUT_H_ +- +-/*Headers:*/ +-/*{{{1*/ +-#include "./Input.h" +-#include "../Elements/TriaRef.h" +-class GaussTria; +-/*}}}*/ +- +-class TriaVertexInput: public Input,public TriaRef{ +- +- public: +- /*just hold 3 values for 3 vertices: */ +- int enum_type; +- double values[3]; +- +- /*TriaVertexInput constructors, destructors: {{{1*/ +- TriaVertexInput(); +- TriaVertexInput(int enum_type,double* values); +- ~TriaVertexInput(); +- /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ +- void Echo(); +- void DeepEcho(); +- int Id(); +- int MyRank(); +- #ifdef _SERIAL_ +- void Marshall(char** pmarshalled_dataset); +- int MarshallSize(); +- void Demarshall(char** pmarshalled_dataset); +- #endif +- int ObjectEnum(); +- Object* copy(); +- /*}}}*/ +- /*TriaVertexInput management: {{{1*/ +- int InstanceEnum(); +- Input* SpawnTriaInput(int* indices); +- Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; +- Input* PointwiseMin(Input* inputB); +- Input* PointwiseMax(Input* inputB); +- ElementResult* SpawnResult(int step, double time); +- void AddTimeValues(double* values,int step,double time){_error_("not supported yet");}; +- void Configure(Parameters* parameters); +- /*}}}*/ +- /*numerics: {{{1*/ +- void GetInputValue(bool* pvalue){_error_("not implemented yet");} +- void GetInputValue(int* pvalue){_error_("not implemented yet");} +- void GetInputValue(double* pvalue){_error_("not implemented yet");} +- void GetInputValue(double* pvalue,GaussTria* gauss); +- void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; +- void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; +- void GetInputValue(double* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");}; +- void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); +- void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; +- void GetInputAverage(double* pvalue); +- void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss); +- void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss); +- void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; +- void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; +- void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; +- void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; +- void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; +- void ChangeEnum(int newenumtype); +- +- void SquareMin(double* psquaremin, bool process_units,Parameters* parameters); +- void ConstrainMin(double minimum); +- void Scale(double scale_factor); +- void ArtificialNoise(double min,double max); +- void AXPY(Input* xinput,double scalar); +- void Constrain(double cm_min, double cm_max); +- double InfinityNorm(void); +- double Max(void); +- double MaxAbs(void); +- double Min(void); +- double MinAbs(void); +- void Extrude(void){_error_("not supported yet");}; +- void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; +- void GetVectorFromInputs(Vec vector,int* doflist); +- void GetValuesPtr(double** pvalues,int* pnum_values); +- /*}}}*/ +- +-}; +-#endif /* _TRIAVERTEXINPUT_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.cpp (revision 11291) +@@ -1,680 +0,0 @@ +-/*!\file PentaVertexInput.c +- * \brief: implementation of the PentaVertexInput object +- */ +- +-#ifdef HAVE_CONFIG_H +- #include +-#else +-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +-#endif +- +-#include +-#include +-#include "../objects.h" +-#include "../../EnumDefinitions/EnumDefinitions.h" +-#include "../../shared/shared.h" +-#include "../../Container/Container.h" +-#include "../../include/include.h" +- +-/*PentaVertexInput constructors and destructor*/ +-/*FUNCTION PentaVertexInput::PentaVertexInput(){{{1*/ +-PentaVertexInput::PentaVertexInput(){ +- return; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::PentaVertexInput(int in_enum_type,double* values){{{1*/ +-PentaVertexInput::PentaVertexInput(int in_enum_type,double* in_values) +- :PentaRef(1) +-{ +- +- /*Set PentaRef*/ +- this->SetElementType(P1Enum,0); +- this->element_type=P1Enum; +- +- enum_type=in_enum_type; +- values[0]=in_values[0]; +- values[1]=in_values[1]; +- values[2]=in_values[2]; +- values[3]=in_values[3]; +- values[4]=in_values[4]; +- values[5]=in_values[5]; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::~PentaVertexInput(){{{1*/ +-PentaVertexInput::~PentaVertexInput(){ +- return; +-} +-/*}}}*/ +- +-/*Object virtual functions definitions:*/ +-/*FUNCTION PentaVertexInput::Echo {{{1*/ +-void PentaVertexInput::Echo(void){ +- this->DeepEcho(); +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::DeepEcho{{{1*/ +-void PentaVertexInput::DeepEcho(void){ +- +- printf("PentaVertexInput:\n"); +- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); +- printf(" values: [%g %g %g %g %g %g]\n",this->values[0],this->values[1],this->values[2],this->values[3],this->values[4],this->values[5]); +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::Id{{{1*/ +-int PentaVertexInput::Id(void){ return -1; } +-/*}}}*/ +-/*FUNCTION PentaVertexInput::MyRank{{{1*/ +-int PentaVertexInput::MyRank(void){ +- extern int my_rank; +- return my_rank; +-} +-/*}}}*/ +-#ifdef _SERIAL_ +-/*FUNCTION PentaVertexInput::Marshall{{{1*/ +-void PentaVertexInput::Marshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int enum_value=0; +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*get enum value of PentaVertexInput: */ +- enum_value=PentaVertexInputEnum; +- +- /*marshall enum: */ +- memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); +- +- /*marshall PentaVertexInput data: */ +- memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); +- +- *pmarshalled_dataset=marshalled_dataset; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::MarshallSize{{{1*/ +-int PentaVertexInput::MarshallSize(){ +- +- return sizeof(values)+ +- +sizeof(enum_type)+ +- +sizeof(int); //sizeof(int) for enum value +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::Demarshall{{{1*/ +-void PentaVertexInput::Demarshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int i; +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*this time, no need to get enum type, the pointer directly points to the beginning of the +- *object data (thanks to DataSet::Demarshall):*/ +- memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); +- +- /*return: */ +- *pmarshalled_dataset=marshalled_dataset; +- return; +-} +-/*}}}*/ +-#endif +-/*FUNCTION PentaVertexInput::ObjectEnum{{{1*/ +-int PentaVertexInput::ObjectEnum(void){ +- +- return PentaVertexInputEnum; +- +-} +-/*}}}*/ +- +-/*PentaVertexInput management*/ +-/*FUNCTION PentaVertexInput::copy{{{1*/ +-Object* PentaVertexInput::copy() { +- +- return new PentaVertexInput(this->enum_type,this->values); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::InstanceEnum{{{1*/ +-int PentaVertexInput::InstanceEnum(void){ +- +- return this->enum_type; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::SpawnTriaInput{{{1*/ +-Input* PentaVertexInput::SpawnTriaInput(int* indices){ +- +- /*output*/ +- TriaVertexInput* outinput=NULL; +- double newvalues[3]; +- +- /*Loop over the new indices*/ +- for(int i=0;i<3;i++){ +- +- /*Check index value*/ +- _assert_(indices[i]>=0 && indices[i]<6); +- +- /*Assign value to new input*/ +- newvalues[i]=this->values[indices[i]]; +- } +- +- /*Create new Tria input*/ +- outinput=new TriaVertexInput(this->enum_type,&newvalues[0]); +- +- /*Assign output*/ +- return outinput; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::SpawnResult{{{1*/ +-ElementResult* PentaVertexInput::SpawnResult(int step, double time){ +- +- return new PentaVertexElementResult(this->enum_type,this->values,step,time); +- +-} +-/*}}}*/ +- +-/*Object functions*/ +-/*FUNCTION PentaVertexInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ +-void PentaVertexInput::GetInputValue(double* pvalue,GaussPenta* gauss){ +- +- /*Call PentaRef function*/ +- PentaRef::GetInputValue(pvalue,&values[0],gauss); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{1*/ +-void PentaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){ +- +- /*Call PentaRef function*/ +- PentaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetVxStrainRate3d{{{1*/ +-void PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ +- int i,j; +- +- const int numnodes=6; +- const int DOFVELOCITY=3; +- double B[8][27]; +- double B_reduced[6][DOFVELOCITY*numnodes]; +- double velocity[numnodes][DOFVELOCITY]; +- +- /*Get B matrix: */ +- GetBStokes(&B[0][0], xyz_list, gauss); +- /*Create a reduced matrix of B to get rid of pressure */ +- for (i=0;i<6;i++){ +- for (j=0;j<3;j++){ +- B_reduced[i][j]=B[i][j]; +- } +- for (j=4;j<7;j++){ +- B_reduced[i][j-1]=B[i][j]; +- } +- for (j=8;j<11;j++){ +- B_reduced[i][j-2]=B[i][j]; +- } +- for (j=12;j<15;j++){ +- B_reduced[i][j-3]=B[i][j]; +- } +- for (j=16;j<19;j++){ +- B_reduced[i][j-4]=B[i][j]; +- } +- for (j=20;j<23;j++){ +- B_reduced[i][j-5]=B[i][j]; +- } +- } +- +- /*Here, we are computing the strain rate of (vx,0,0)*/ +- for(i=0;ivalues[i]; +- velocity[i][1]=0.0; +- velocity[i][2]=0.0; +- } +- /*Multiply B by velocity, to get strain rate: */ +- MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numnodes,0,&velocity[0][0],DOFVELOCITY*numnodes,1,0,epsilonvx,0); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetVyStrainRate3d{{{1*/ +-void PentaVertexInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ +- int i,j; +- +- const int numnodes=6; +- const int DOFVELOCITY=3; +- double B[8][27]; +- double B_reduced[6][DOFVELOCITY*numnodes]; +- double velocity[numnodes][DOFVELOCITY]; +- +- /*Get B matrix: */ +- GetBStokes(&B[0][0], xyz_list, gauss); +- /*Create a reduced matrix of B to get rid of pressure */ +- for (i=0;i<6;i++){ +- for (j=0;j<3;j++){ +- B_reduced[i][j]=B[i][j]; +- } +- for (j=4;j<7;j++){ +- B_reduced[i][j-1]=B[i][j]; +- } +- for (j=8;j<11;j++){ +- B_reduced[i][j-2]=B[i][j]; +- } +- for (j=12;j<15;j++){ +- B_reduced[i][j-3]=B[i][j]; +- } +- for (j=16;j<19;j++){ +- B_reduced[i][j-4]=B[i][j]; +- } +- for (j=20;j<23;j++){ +- B_reduced[i][j-5]=B[i][j]; +- } +- } +- +- /*Here, we are computing the strain rate of (0,vy,0)*/ +- for(i=0;ivalues[i]; +- velocity[i][2]=0.0; +- } +- /*Multiply B by velocity, to get strain rate: */ +- MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numnodes,0,&velocity[0][0],DOFVELOCITY*numnodes,1,0,epsilonvy,0); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetVzStrainRate3d{{{1*/ +-void PentaVertexInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){ +- int i,j; +- +- const int numnodes=6; +- const int DOFVELOCITY=3; +- double B[8][27]; +- double B_reduced[6][DOFVELOCITY*numnodes]; +- double velocity[numnodes][DOFVELOCITY]; +- +- /*Get B matrix: */ +- GetBStokes(&B[0][0], xyz_list, gauss); +- /*Create a reduced matrix of B to get rid of pressure */ +- for (i=0;i<6;i++){ +- for (j=0;j<3;j++){ +- B_reduced[i][j]=B[i][j]; +- } +- for (j=4;j<7;j++){ +- B_reduced[i][j-1]=B[i][j]; +- } +- for (j=8;j<11;j++){ +- B_reduced[i][j-2]=B[i][j]; +- } +- for (j=12;j<15;j++){ +- B_reduced[i][j-3]=B[i][j]; +- } +- for (j=16;j<19;j++){ +- B_reduced[i][j-4]=B[i][j]; +- } +- for (j=20;j<23;j++){ +- B_reduced[i][j-5]=B[i][j]; +- } +- } +- +- /*Here, we are computing the strain rate of (0,0,vz)*/ +- for(i=0;ivalues[i]; +- } +- +- /*Multiply B by velocity, to get strain rate: */ +- MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numnodes,0,&velocity[0][0],DOFVELOCITY*numnodes,1,0,epsilonvz,0); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn{{{1*/ +-void PentaVertexInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ +- +- int i; +- const int numnodes=6; +- double B[5][NDOF2*numnodes]; +- double velocity[numnodes][NDOF2]; +- +- /*Get B matrix: */ +- GetBPattyn(&B[0][0], xyz_list, gauss); +- +- /*Here, we are computing the strain rate of (vx,0)*/ +- for(i=0;ivalues[i]; +- velocity[i][1]=0.0; +- } +- +- /*Multiply B by velocity, to get strain rate: */ +- MatrixMultiply( &B[0][0],5,NDOF2*numnodes,0, +- &velocity[0][0],NDOF2*numnodes,1,0, +- epsilonvx,0); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn{{{1*/ +-void PentaVertexInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ +- +- int i; +- const int numnodes=6; +- double B[5][NDOF2*numnodes]; +- double velocity[numnodes][NDOF2]; +- +- /*Get B matrix: */ +- GetBPattyn(&B[0][0], xyz_list, gauss); +- +- /*Here, we are computing the strain rate of (0,vy)*/ +- for(i=0;ivalues[i]; +- } +- +- /*Multiply B by velocity, to get strain rate: */ +- MatrixMultiply( &B[0][0],5,NDOF2*numnodes,0, +- &velocity[0][0],NDOF2*numnodes,1,0, +- epsilonvy,0); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::ChangeEnum{{{1*/ +-void PentaVertexInput::ChangeEnum(int newenumtype){ +- this->enum_type=newenumtype; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetInputAverage{{{1*/ +-void PentaVertexInput::GetInputAverage(double* pvalue){ +- *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]); +-} +-/*}}}*/ +- +-/*Intermediary*/ +-/*FUNCTION PentaVertexInput::SquareMin{{{1*/ +-void PentaVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ +- +- int i; +- const int numnodes=6; +- double valuescopy[numnodes]; +- double squaremin; +- +- /*First, copy values, to process units if requested: */ +- for(i=0;ivalues[i]; +- +- /*Process units if requested: */ +- if(process_units)UnitConversion(&valuescopy[0],numnodes,IuToExtEnum,enum_type); +- +- /*Now, figure out minimum of valuescopy: */ +- squaremin=pow(valuescopy[0],2); +- for(i=1;inorm) norm=fabs(values[i]); +- return norm; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::Max{{{1*/ +-double PentaVertexInput::Max(void){ +- +- const int numnodes=6; +- double max=values[0]; +- +- for(int i=1;imax) max=values[i]; +- } +- return max; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::MaxAbs{{{1*/ +-double PentaVertexInput::MaxAbs(void){ +- +- const int numnodes=6; +- double max=fabs(values[0]); +- +- for(int i=1;imax) max=fabs(values[i]); +- } +- return max; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::Min{{{1*/ +-double PentaVertexInput::Min(void){ +- +- const int numnodes=6; +- double min=values[0]; +- +- for(int i=1;iObjectEnum()){ +- +- case PentaVertexInputEnum:{ +- PentaVertexInput* cast_input=(PentaVertexInput*)xinput; +- for(i=0;ivalues[i]=this->values[i]+scalar*(cast_input->values[i]);} +- return; +- case ControlInputEnum:{ +- ControlInput* cont_input=(ControlInput*)xinput; +- if(cont_input->values->ObjectEnum()!=PentaVertexInputEnum) _error_("not supported yet"); +- PentaVertexInput* cast_input=(PentaVertexInput*)cont_input->values; +- for(i=0;ivalues[i]=this->values[i]+scalar*(cast_input->values[i]);} +- return; +- default: +- _error_("not implemented yet"); +- } +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::Constrain{{{1*/ +-void PentaVertexInput::Constrain(double cm_min, double cm_max){ +- +- int i; +- const int numnodes=6; +- +- if(!isnan(cm_min)) for(i=0;ivalues[i]values[i]=cm_min; +- if(!isnan(cm_max)) for(i=0;ivalues[i]>cm_max)this->values[i]=cm_max; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::Extrude{{{1*/ +-void PentaVertexInput::Extrude(void){ +- +- int i; +- +- /*First 3 values copied on 3 last values*/ +- for(i=0;i<3;i++) this->values[3+i]=this->values[i]; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::VerticallyIntegrate{{{1*/ +-void PentaVertexInput::VerticallyIntegrate(Input* thickness_input){ +- +- /*Intermediaries*/ +- int i; +- const int numnodes = 6; +- int num_thickness_values; +- double *thickness_values = NULL; +- +- /*Check that input provided is a thickness*/ +- if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is %s)",EnumToStringx(thickness_input->InstanceEnum())); +- +- /*Get Thickness value pointer*/ +- thickness_input->GetValuesPtr(&thickness_values,&num_thickness_values); +- +- /*vertically integrate depending on type:*/ +- switch(thickness_input->ObjectEnum()){ +- +- case PentaVertexInputEnum: +- for(i=0;i<3;i++){ +- this->values[i]=0.5*(this->values[i]+this->values[i+3]) * thickness_values[i]; +- this->values[i+3]=this->values[i]; +- } +- return; +- +- default: +- _error_("not implemented yet"); +- } +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::PointwiseDivide{{{1*/ +-Input* PentaVertexInput::PointwiseDivide(Input* inputB){ +- +- /*Ouput*/ +- PentaVertexInput* outinput=NULL; +- +- /*Intermediaries*/ +- int i; +- PentaVertexInput *xinputB = NULL; +- int B_numvalues; +- const int numnodes = 6; +- double AdotBvalues[numnodes]; +- +- /*Check that inputB is of the same type*/ +- if (inputB->ObjectEnum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); +- xinputB=(PentaVertexInput*)inputB; +- +- /*Create point wise sum*/ +- for(i=0;ivalues[i]!=0); +- AdotBvalues[i]=this->values[i]/xinputB->values[i]; +- } +- +- /*Create new Penta vertex input (copy of current input)*/ +- outinput=new PentaVertexInput(this->enum_type,&AdotBvalues[0]); +- +- /*Return output pointer*/ +- return outinput; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::PointwiseMin{{{1*/ +-Input* PentaVertexInput::PointwiseMin(Input* inputB){ +- +- /*Ouput*/ +- PentaVertexInput* outinput=NULL; +- +- /*Intermediaries*/ +- int i; +- PentaVertexInput *xinputB = NULL; +- int B_numvalues; +- const int numnodes = 6; +- double minvalues[numnodes]; +- +- /*Check that inputB is of the same type*/ +- if (inputB->ObjectEnum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); +- xinputB=(PentaVertexInput*)inputB; +- +- /*Create point wise min*/ +- for(i=0;ivalues[i] > xinputB->values[i]) minvalues[i]=xinputB->values[i]; +- else minvalues[i]=this->values[i]; +- } +- +- /*Create new Penta vertex input (copy of current input)*/ +- outinput=new PentaVertexInput(this->enum_type,&minvalues[0]); +- +- /*Return output pointer*/ +- return outinput; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::PointwiseMax{{{1*/ +-Input* PentaVertexInput::PointwiseMax(Input* inputB){ +- +- /*Ouput*/ +- PentaVertexInput* outinput=NULL; +- +- /*Intermediaries*/ +- int i; +- PentaVertexInput *xinputB = NULL; +- int B_numvalues; +- const int numnodes = 6; +- double maxvalues[numnodes]; +- +- /*Check that inputB is of the same type*/ +- if (inputB->ObjectEnum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); +- xinputB=(PentaVertexInput*)inputB; +- +- /*Create point wise max*/ +- for(i=0;ivalues[i] < xinputB->values[i]) maxvalues[i]=xinputB->values[i]; +- else maxvalues[i]=this->values[i]; +- } +- +- /*Create new Penta vertex input (copy of current input)*/ +- outinput=new PentaVertexInput(this->enum_type,&maxvalues[0]); +- +- /*Return output pointer*/ +- return outinput; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::GetVectorFromInputs{{{1*/ +-void PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ +- +- const int numvertices=6; +- VecSetValues(vector,numvertices,doflist,(const double*)this->values,INSERT_VALUES); +- +-} /*}}}*/ +-/*FUNCTION PentaVertexInput::GetValuesPtr{{{1*/ +-void PentaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ +- +- *pvalues=this->values; +- *pnum_values=6; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexInput::Configure{{{1*/ +-void PentaVertexInput::Configure(Parameters* parameters){ +- /*do nothing: */ +-} +-/*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.h (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.h (revision 11291) +@@ -1,89 +0,0 @@ +-/*! \file PentaVertexInput.h +- * \brief: header file for triavertexinput object +- */ +- +- +-#ifndef _PENTAVERTEXINPUT_H_ +-#define _PENTAVERTEXINPUT_H_ +- +-/*Headers:*/ +-/*{{{1*/ +-#include "./Input.h" +-#include "../Elements/PentaRef.h" +-class GaussTria; +-/*}}}*/ +- +-class PentaVertexInput: public Input, public PentaRef{ +- +- public: +- /*just hold 6 values for 6 vertices: */ +- int enum_type; +- double values[6]; +- +- /*PentaVertexInput constructors, destructors: {{{1*/ +- PentaVertexInput(); +- PentaVertexInput(int enum_type,double* values); +- ~PentaVertexInput(); +- /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ +- void Echo(); +- void DeepEcho(); +- int Id(); +- int MyRank(); +- #ifdef _SERIAL_ +- void Marshall(char** pmarshalled_dataset); +- int MarshallSize(); +- void Demarshall(char** pmarshalled_dataset); +- #endif +- int ObjectEnum(); +- Object* copy(); +- /*}}}*/ +- /*PentaVertexInput management: {{{1*/ +- int InstanceEnum(); +- Input* SpawnTriaInput(int* indices); +- Input* PointwiseDivide(Input* inputB); +- Input* PointwiseMin(Input* inputB); +- Input* PointwiseMax(Input* inputB); +- ElementResult* SpawnResult(int step, double time); +- void AddTimeValues(double* values,int step,double time){_error_("not supported yet");}; +- void Configure(Parameters* parameters); +- /*}}}*/ +- /*numerics: {{{1*/ +- void GetInputValue(bool* pvalue){_error_("not implemented yet");}; +- void GetInputValue(int* pvalue){_error_("not implemented yet");}; +- void GetInputValue(double* pvalue){_error_("not implemented yet");}; +- void GetInputValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");}; +- void GetInputValue(double* pvalue,GaussPenta* gauss); +- void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; +- void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; +- void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; +- void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); +- void GetInputAverage(double* pvalue); +- void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; +- void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; +- void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss); +- void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss); +- void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss); +- void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss); +- void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss); +- void ChangeEnum(int newenumtype); +- +- void SquareMin(double* psquaremin, bool process_units,Parameters* parameters); +- void ConstrainMin(double minimum); +- void Scale(double scale_factor); +- void ArtificialNoise(double min,double max){_error_("not implemented yet");}; +- void AXPY(Input* xinput,double scalar); +- void Constrain(double cm_min, double cm_max); +- double InfinityNorm(void); +- double Max(void); +- double MaxAbs(void); +- double Min(void); +- double MinAbs(void); +- void Extrude(void); +- void VerticallyIntegrate(Input* thickness_input); +- void GetVectorFromInputs(Vec vector,int* doflist); +- void GetValuesPtr(double** pvalues,int* pnum_values); +- /*}}}*/ +- +-}; +-#endif /* _PENTAVERTEXINPUT_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 11291) +@@ -34,17 +34,17 @@ + enum_type=in_enum_type; + + switch(enum_input){ +- case TriaVertexInputEnum: +- values =new TriaVertexInput(enum_type,pvalues); +- savedvalues=new TriaVertexInput(enum_type,pvalues); +- minvalues =new TriaVertexInput(enum_type,pmin); +- maxvalues =new TriaVertexInput(enum_type,pmax); ++ case TriaP1InputEnum: ++ values =new TriaP1Input(enum_type,pvalues); ++ savedvalues=new TriaP1Input(enum_type,pvalues); ++ minvalues =new TriaP1Input(enum_type,pmin); ++ maxvalues =new TriaP1Input(enum_type,pmax); + break; +- case PentaVertexInputEnum: +- values =new PentaVertexInput(enum_type,pvalues); +- savedvalues=new PentaVertexInput(enum_type,pvalues); +- minvalues =new PentaVertexInput(enum_type,pmin); +- maxvalues =new PentaVertexInput(enum_type,pmax); ++ case PentaP1InputEnum: ++ values =new PentaP1Input(enum_type,pvalues); ++ savedvalues=new PentaP1Input(enum_type,pvalues); ++ minvalues =new PentaP1Input(enum_type,pmin); ++ maxvalues =new PentaP1Input(enum_type,pmax); + break; + default: + _error_("Input of Enum %s not supported yet by ControlInput",EnumToStringx(enum_input)); +@@ -205,12 +205,12 @@ + memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); + if(flag){ + memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); +- if(input_enum_type==PentaVertexInputEnum){ +- values=new PentaVertexInput(); ++ if(input_enum_type==PentaP1InputEnum){ ++ values=new PentaP1Input(); + values->Demarshall(&marshalled_dataset); + } +- else if(input_enum_type==TriaVertexInputEnum){ +- values=new TriaVertexInput(); ++ else if(input_enum_type==TriaP1InputEnum){ ++ values=new TriaP1Input(); + values->Demarshall(&marshalled_dataset); + } + else _error_("Not supported yet"); +@@ -223,12 +223,12 @@ + memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); + if(flag){ + memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); +- if(input_enum_type==PentaVertexInputEnum){ +- savedvalues=new PentaVertexInput(); ++ if(input_enum_type==PentaP1InputEnum){ ++ savedvalues=new PentaP1Input(); + savedvalues->Demarshall(&marshalled_dataset); + } +- else if(input_enum_type==TriaVertexInputEnum){ +- savedvalues=new TriaVertexInput(); ++ else if(input_enum_type==TriaP1InputEnum){ ++ savedvalues=new TriaP1Input(); + savedvalues->Demarshall(&marshalled_dataset); + } + else _error_("Not supported yet"); +@@ -241,12 +241,12 @@ + memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); + if(flag){ + memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); +- if(input_enum_type==PentaVertexInputEnum){ +- minvalues=new PentaVertexInput(); ++ if(input_enum_type==PentaP1InputEnum){ ++ minvalues=new PentaP1Input(); + minvalues->Demarshall(&marshalled_dataset); + } +- else if(input_enum_type==TriaVertexInputEnum){ +- minvalues=new TriaVertexInput(); ++ else if(input_enum_type==TriaP1InputEnum){ ++ minvalues=new TriaP1Input(); + minvalues->Demarshall(&marshalled_dataset); + } + else _error_("Not supported yet"); +@@ -259,12 +259,12 @@ + memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); + if(flag){ + memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); +- if(input_enum_type==PentaVertexInputEnum){ +- maxvalues=new PentaVertexInput(); ++ if(input_enum_type==PentaP1InputEnum){ ++ maxvalues=new PentaP1Input(); + maxvalues->Demarshall(&marshalled_dataset); + } +- else if(input_enum_type==TriaVertexInputEnum){ +- maxvalues=new TriaVertexInput(); ++ else if(input_enum_type==TriaP1InputEnum){ ++ maxvalues=new TriaP1Input(); + maxvalues->Demarshall(&marshalled_dataset); + } + else _error_("Not supported yet"); +@@ -277,12 +277,12 @@ + memcpy(&flag,marshalled_dataset,sizeof(int));marshalled_dataset+=sizeof(int); + if(flag){ + memcpy(&input_enum_type,marshalled_dataset,sizeof(int)); marshalled_dataset+=sizeof(int); +- if(input_enum_type==PentaVertexInputEnum){ +- gradient=new PentaVertexInput(); ++ if(input_enum_type==PentaP1InputEnum){ ++ gradient=new PentaP1Input(); + gradient->Demarshall(&marshalled_dataset); + } +- else if(input_enum_type==TriaVertexInputEnum){ +- gradient=new TriaVertexInput(); ++ else if(input_enum_type==TriaP1InputEnum){ ++ gradient=new TriaP1Input(); + gradient->Demarshall(&marshalled_dataset); + } + else _error_("Not supported yet"); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 11291) +@@ -0,0 +1,473 @@ ++/*!\file TriaP1Input.c ++ * \brief: implementation of the TriaP1Input object ++ */ ++ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++ ++#include ++#include ++#include "../objects.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++#include "../../shared/shared.h" ++#include "../../Container/Container.h" ++#include "../../include/include.h" ++ ++/*TriaP1Input constructors and destructor*/ ++/*FUNCTION TriaP1Input::TriaP1Input(){{{1*/ ++TriaP1Input::TriaP1Input(){ ++ return; ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::TriaP1Input(int in_enum_type,double* values){{{1*/ ++TriaP1Input::TriaP1Input(int in_enum_type,double* in_values) ++ :TriaRef(1) ++{ ++ ++ /*Set TriaRef*/ ++ this->SetElementType(P1Enum,0); ++ this->element_type=P1Enum; ++ ++ /*Set Enum*/ ++ enum_type=in_enum_type; ++ ++ /*Set values*/ ++ values[0]=in_values[0]; ++ values[1]=in_values[1]; ++ values[2]=in_values[2]; ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::~TriaP1Input(){{{1*/ ++TriaP1Input::~TriaP1Input(){ ++ return; ++} ++/*}}}*/ ++ ++/*Object virtual functions definitions:*/ ++/*FUNCTION TriaP1Input::Echo {{{1*/ ++void TriaP1Input::Echo(void){ ++ this->DeepEcho(); ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::DeepEcho{{{1*/ ++void TriaP1Input::DeepEcho(void){ ++ ++ printf("TriaP1Input:\n"); ++ printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); ++ printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::Id{{{1*/ ++int TriaP1Input::Id(void){ return -1; } ++/*}}}*/ ++/*FUNCTION TriaP1Input::MyRank{{{1*/ ++int TriaP1Input::MyRank(void){ ++ extern int my_rank; ++ return my_rank; ++} ++/*}}}*/ ++#ifdef _SERIAL_ ++/*FUNCTION TriaP1Input::Marshall{{{1*/ ++void TriaP1Input::Marshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int enum_value=0; ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*get enum value of TriaP1Input: */ ++ enum_value=TriaP1InputEnum; ++ ++ /*marshall enum: */ ++ memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); ++ ++ /*marshall TriaP1Input data: */ ++ memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); ++ ++ *pmarshalled_dataset=marshalled_dataset; ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::MarshallSize{{{1*/ ++int TriaP1Input::MarshallSize(){ ++ ++ return sizeof(values)+ ++ +sizeof(enum_type)+ ++ +sizeof(int); //sizeof(int) for enum value ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::Demarshall{{{1*/ ++void TriaP1Input::Demarshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int i; ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*this time, no need to get enum type, the pointer directly points to the beginning of the ++ *object data (thanks to DataSet::Demarshall):*/ ++ memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); ++ ++ /*return: */ ++ *pmarshalled_dataset=marshalled_dataset; ++ return; ++} ++/*}}}*/ ++#endif ++/*FUNCTION TriaP1Input::ObjectEnum{{{1*/ ++int TriaP1Input::ObjectEnum(void){ ++ ++ return TriaP1InputEnum; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::copy{{{1*/ ++Object* TriaP1Input::copy() { ++ ++ return new TriaP1Input(this->enum_type,this->values); ++ ++} ++/*}}}*/ ++ ++/*TriaP1Input management*/ ++/*FUNCTION TriaP1Input::InstanceEnum{{{1*/ ++int TriaP1Input::InstanceEnum(void){ ++ ++ return this->enum_type; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::SpawnTriaInput{{{1*/ ++Input* TriaP1Input::SpawnTriaInput(int* indices){ ++ ++ /*output*/ ++ TriaP1Input* outinput=NULL; ++ ++ /*Create new Tria input (copy of current input)*/ ++ outinput=new TriaP1Input(this->enum_type,&this->values[0]); ++ ++ /*Assign output*/ ++ return outinput; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::SpawnResult{{{1*/ ++ElementResult* TriaP1Input::SpawnResult(int step, double time){ ++ ++ return new TriaVertexElementResult(this->enum_type,this->values,step,time); ++ ++} ++/*}}}*/ ++ ++/*Object functions*/ ++/*FUNCTION TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ ++void TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){ ++ ++ /*Call TriaRef function*/ ++ TriaRef::GetInputValue(pvalue,&values[0],gauss); ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/ ++void TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){ ++ ++ /*Call TriaRef function*/ ++ TriaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::GetVxStrainRate2d{{{1*/ ++void TriaP1Input::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ ++ ++ /*Intermediary*/ ++ int i; ++ const int numnodes=3; ++ double B[3][NDOF2*numnodes]; ++ double velocity[3][NDOF2]; ++ ++ /*Get B matrix: */ ++ GetBMacAyeal(&B[0][0], xyz_list, gauss); ++ ++ /*Here, we are computing the strain rate of (vx,0)*/ ++ for(i=0;i<3;i++){ ++ velocity[i][0]=this->values[i]; ++ velocity[i][1]=0.0; ++ } ++ /*Get epsilon(vx) = B*velocity*/ ++ MatrixMultiply( &B[0][0],3,NDOF2*numnodes,0, ++ &velocity[0][0],NDOF2*numnodes,1,0, ++ epsilonvx,0); ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::GetVyStrainRate2d{{{1*/ ++void TriaP1Input::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ ++ ++ /*Intermediary*/ ++ int i; ++ const int numnodes=3; ++ double B[3][NDOF2*numnodes]; ++ double velocity[3][NDOF2]; ++ ++ /*Get B matrix: */ ++ GetBMacAyeal(&B[0][0], xyz_list, gauss); ++ ++ /*Here, we are computing the strain rate of (0,vy)*/ ++ for(i=0;i<3;i++){ ++ velocity[i][0]=0.0; ++ velocity[i][1]=this->values[i]; ++ } ++ /*Get epsilon(vy) = B*velocity*/ ++ MatrixMultiply( &B[0][0],3,NDOF2*numnodes,0, ++ &velocity[0][0],NDOF2*numnodes,1,0, ++ epsilonvy,0); ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::ChangeEnum{{{1*/ ++void TriaP1Input::ChangeEnum(int newenumtype){ ++ this->enum_type=newenumtype; ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::GetInputAverage{{{1*/ ++void TriaP1Input::GetInputAverage(double* pvalue){ ++ *pvalue=1./3.*(values[0]+values[1]+values[2]); ++} ++/*}}}*/ ++ ++/*Intermediary*/ ++/*FUNCTION TriaP1Input::SquareMin{{{1*/ ++void TriaP1Input::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ ++ ++ int i; ++ const int numnodes=3; ++ double valuescopy[numnodes]; ++ double squaremin; ++ ++ /*First, copy values, to process units if requested: */ ++ for(i=0;ivalues[i]; ++ ++ /*Process units if requested: */ ++ if(process_units)UnitConversion(&valuescopy[0],numnodes,IuToExtEnum,enum_type); ++ ++ /*Now, figure out minimum of valuescopy: */ ++ squaremin=pow(valuescopy[0],2); ++ for(i=1;inorm) norm=fabs(values[i]); ++ return norm; ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::Max{{{1*/ ++double TriaP1Input::Max(void){ ++ ++ const int numnodes=3; ++ double max=values[0]; ++ ++ for(int i=1;imax) max=values[i]; ++ } ++ return max; ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::MaxAbs{{{1*/ ++double TriaP1Input::MaxAbs(void){ ++ ++ const int numnodes=3; ++ double max=fabs(values[0]); ++ ++ for(int i=1;imax) max=fabs(values[i]); ++ } ++ return max; ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::Min{{{1*/ ++double TriaP1Input::Min(void){ ++ ++ const int numnodes=3; ++ double min=values[0]; ++ ++ for(int i=1;iObjectEnum()){ ++ ++ case TriaP1InputEnum : ++ for(i=0;ivalues[i]=this->values[i]+scalar*xtriavertexinput->values[i]; ++ return; ++ ++ default : ++ _error_("not implemented yet"); ++ } ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::Constrain{{{1*/ ++void TriaP1Input::Constrain(double cm_min, double cm_max){ ++ ++ int i; ++ const int numnodes=3; ++ ++ if(!isnan(cm_min)) for(i=0;ivalues[i]values[i]=cm_min; ++ if(!isnan(cm_max)) for(i=0;ivalues[i]>cm_max)this->values[i]=cm_max; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::GetVectorFromInputs{{{1*/ ++void TriaP1Input::GetVectorFromInputs(Vec vector,int* doflist){ ++ ++ const int numvertices=3; ++ VecSetValues(vector,numvertices,doflist,(const double*)this->values,INSERT_VALUES); ++ ++} /*}}}*/ ++/*FUNCTION TriaP1Input::GetValuesPtr{{{1*/ ++void TriaP1Input::GetValuesPtr(double** pvalues,int* pnum_values){ ++ ++ *pvalues=this->values; ++ if(pnum_values)*pnum_values=3; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::PointwiseMin{{{1*/ ++Input* TriaP1Input::PointwiseMin(Input* inputB){ ++ ++ /*Ouput*/ ++ TriaP1Input* outinput=NULL; ++ ++ /*Intermediaries*/ ++ int i; ++ TriaP1Input *xinputB = NULL; ++ int B_numvalues; ++ const int numnodes = 3; ++ double minvalues[numnodes]; ++ ++ /*Check that inputB is of the same type*/ ++ if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); ++ xinputB=(TriaP1Input*)inputB; ++ ++ /*Create point wise min*/ ++ for(i=0;ivalues[i] > xinputB->values[i]) minvalues[i]=xinputB->values[i]; ++ else minvalues[i]=this->values[i]; ++ } ++ ++ /*Create new Tria vertex input (copy of current input)*/ ++ outinput=new TriaP1Input(this->enum_type,&minvalues[0]); ++ ++ /*Return output pointer*/ ++ return outinput; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::PointwiseMax{{{1*/ ++Input* TriaP1Input::PointwiseMax(Input* inputB){ ++ ++ /*Ouput*/ ++ TriaP1Input* outinput=NULL; ++ ++ /*Intermediaries*/ ++ int i; ++ TriaP1Input *xinputB = NULL; ++ int B_numvalues; ++ const int numnodes = 3; ++ double maxvalues[numnodes]; ++ ++ /*Check that inputB is of the same type*/ ++ if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); ++ xinputB=(TriaP1Input*)inputB; ++ ++ /*Create point wise max*/ ++ for(i=0;ivalues[i] < xinputB->values[i]) maxvalues[i]=xinputB->values[i]; ++ else maxvalues[i]=this->values[i]; ++ } ++ ++ /*Create new Tria vertex input (copy of current input)*/ ++ outinput=new TriaP1Input(this->enum_type,&maxvalues[0]); ++ ++ /*Return output pointer*/ ++ return outinput; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1Input::Configure{{{1*/ ++void TriaP1Input::Configure(Parameters* parameters){ ++ /*do nothing: */ ++} ++/*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 11291) +@@ -0,0 +1,89 @@ ++/*! \file TriaP1Input.h ++ * \brief: header file for TriaP1Input object ++ */ ++ ++ ++#ifndef _TRIAP1INPUT_H_ ++#define _TRIAP1INPUT_H_ ++ ++/*Headers:*/ ++/*{{{1*/ ++#include "./Input.h" ++#include "../Elements/TriaRef.h" ++class GaussTria; ++/*}}}*/ ++ ++class TriaP1Input: public Input,public TriaRef{ ++ ++ public: ++ /*just hold 3 values for 3 vertices: */ ++ int enum_type; ++ double values[3]; ++ ++ /*TriaP1Input constructors, destructors: {{{1*/ ++ TriaP1Input(); ++ TriaP1Input(int enum_type,double* values); ++ ~TriaP1Input(); ++ /*}}}*/ ++ /*Object virtual functions definitions:{{{1 */ ++ void Echo(); ++ void DeepEcho(); ++ int Id(); ++ int MyRank(); ++ #ifdef _SERIAL_ ++ void Marshall(char** pmarshalled_dataset); ++ int MarshallSize(); ++ void Demarshall(char** pmarshalled_dataset); ++ #endif ++ int ObjectEnum(); ++ Object* copy(); ++ /*}}}*/ ++ /*TriaP1Input management: {{{1*/ ++ int InstanceEnum(); ++ Input* SpawnTriaInput(int* indices); ++ Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; ++ Input* PointwiseMin(Input* inputB); ++ Input* PointwiseMax(Input* inputB); ++ ElementResult* SpawnResult(int step, double time); ++ void AddTimeValues(double* values,int step,double time){_error_("not supported yet");}; ++ void Configure(Parameters* parameters); ++ /*}}}*/ ++ /*numerics: {{{1*/ ++ void GetInputValue(bool* pvalue){_error_("not implemented yet");} ++ void GetInputValue(int* pvalue){_error_("not implemented yet");} ++ void GetInputValue(double* pvalue){_error_("not implemented yet");} ++ void GetInputValue(double* pvalue,GaussTria* gauss); ++ void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; ++ void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; ++ void GetInputValue(double* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");}; ++ void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); ++ void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; ++ void GetInputAverage(double* pvalue); ++ void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss); ++ void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss); ++ void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; ++ void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; ++ void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; ++ void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; ++ void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; ++ void ChangeEnum(int newenumtype); ++ ++ void SquareMin(double* psquaremin, bool process_units,Parameters* parameters); ++ void ConstrainMin(double minimum); ++ void Scale(double scale_factor); ++ void ArtificialNoise(double min,double max); ++ void AXPY(Input* xinput,double scalar); ++ void Constrain(double cm_min, double cm_max); ++ double InfinityNorm(void); ++ double Max(void); ++ double MaxAbs(void); ++ double Min(void); ++ double MinAbs(void); ++ void Extrude(void){_error_("not supported yet");}; ++ void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; ++ void GetVectorFromInputs(Vec vector,int* doflist); ++ void GetValuesPtr(double** pvalues,int* pnum_values); ++ /*}}}*/ ++ ++}; ++#endif /* _TRIAP1INPUT_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 11291) +@@ -0,0 +1,680 @@ ++/*!\file PentaP1Input.c ++ * \brief: implementation of the PentaP1Input object ++ */ ++ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++ ++#include ++#include ++#include "../objects.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++#include "../../shared/shared.h" ++#include "../../Container/Container.h" ++#include "../../include/include.h" ++ ++/*PentaP1Input constructors and destructor*/ ++/*FUNCTION PentaP1Input::PentaP1Input(){{{1*/ ++PentaP1Input::PentaP1Input(){ ++ return; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::PentaP1Input(int in_enum_type,double* values){{{1*/ ++PentaP1Input::PentaP1Input(int in_enum_type,double* in_values) ++ :PentaRef(1) ++{ ++ ++ /*Set PentaRef*/ ++ this->SetElementType(P1Enum,0); ++ this->element_type=P1Enum; ++ ++ enum_type=in_enum_type; ++ values[0]=in_values[0]; ++ values[1]=in_values[1]; ++ values[2]=in_values[2]; ++ values[3]=in_values[3]; ++ values[4]=in_values[4]; ++ values[5]=in_values[5]; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::~PentaP1Input(){{{1*/ ++PentaP1Input::~PentaP1Input(){ ++ return; ++} ++/*}}}*/ ++ ++/*Object virtual functions definitions:*/ ++/*FUNCTION PentaP1Input::Echo {{{1*/ ++void PentaP1Input::Echo(void){ ++ this->DeepEcho(); ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::DeepEcho{{{1*/ ++void PentaP1Input::DeepEcho(void){ ++ ++ printf("PentaP1Input:\n"); ++ printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); ++ printf(" values: [%g %g %g %g %g %g]\n",this->values[0],this->values[1],this->values[2],this->values[3],this->values[4],this->values[5]); ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::Id{{{1*/ ++int PentaP1Input::Id(void){ return -1; } ++/*}}}*/ ++/*FUNCTION PentaP1Input::MyRank{{{1*/ ++int PentaP1Input::MyRank(void){ ++ extern int my_rank; ++ return my_rank; ++} ++/*}}}*/ ++#ifdef _SERIAL_ ++/*FUNCTION PentaP1Input::Marshall{{{1*/ ++void PentaP1Input::Marshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int enum_value=0; ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*get enum value of PentaP1Input: */ ++ enum_value=PentaP1InputEnum; ++ ++ /*marshall enum: */ ++ memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); ++ ++ /*marshall PentaP1Input data: */ ++ memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); ++ ++ *pmarshalled_dataset=marshalled_dataset; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::MarshallSize{{{1*/ ++int PentaP1Input::MarshallSize(){ ++ ++ return sizeof(values)+ ++ +sizeof(enum_type)+ ++ +sizeof(int); //sizeof(int) for enum value ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::Demarshall{{{1*/ ++void PentaP1Input::Demarshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int i; ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*this time, no need to get enum type, the pointer directly points to the beginning of the ++ *object data (thanks to DataSet::Demarshall):*/ ++ memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); ++ ++ /*return: */ ++ *pmarshalled_dataset=marshalled_dataset; ++ return; ++} ++/*}}}*/ ++#endif ++/*FUNCTION PentaP1Input::ObjectEnum{{{1*/ ++int PentaP1Input::ObjectEnum(void){ ++ ++ return PentaP1InputEnum; ++ ++} ++/*}}}*/ ++ ++/*PentaP1Input management*/ ++/*FUNCTION PentaP1Input::copy{{{1*/ ++Object* PentaP1Input::copy() { ++ ++ return new PentaP1Input(this->enum_type,this->values); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::InstanceEnum{{{1*/ ++int PentaP1Input::InstanceEnum(void){ ++ ++ return this->enum_type; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::SpawnTriaInput{{{1*/ ++Input* PentaP1Input::SpawnTriaInput(int* indices){ ++ ++ /*output*/ ++ TriaP1Input* outinput=NULL; ++ double newvalues[3]; ++ ++ /*Loop over the new indices*/ ++ for(int i=0;i<3;i++){ ++ ++ /*Check index value*/ ++ _assert_(indices[i]>=0 && indices[i]<6); ++ ++ /*Assign value to new input*/ ++ newvalues[i]=this->values[indices[i]]; ++ } ++ ++ /*Create new Tria input*/ ++ outinput=new TriaP1Input(this->enum_type,&newvalues[0]); ++ ++ /*Assign output*/ ++ return outinput; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::SpawnResult{{{1*/ ++ElementResult* PentaP1Input::SpawnResult(int step, double time){ ++ ++ return new PentaVertexElementResult(this->enum_type,this->values,step,time); ++ ++} ++/*}}}*/ ++ ++/*Object functions*/ ++/*FUNCTION PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ ++void PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){ ++ ++ /*Call PentaRef function*/ ++ PentaRef::GetInputValue(pvalue,&values[0],gauss); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{1*/ ++void PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){ ++ ++ /*Call PentaRef function*/ ++ PentaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetVxStrainRate3d{{{1*/ ++void PentaP1Input::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ ++ int i,j; ++ ++ const int numnodes=6; ++ const int DOFVELOCITY=3; ++ double B[8][27]; ++ double B_reduced[6][DOFVELOCITY*numnodes]; ++ double velocity[numnodes][DOFVELOCITY]; ++ ++ /*Get B matrix: */ ++ GetBStokes(&B[0][0], xyz_list, gauss); ++ /*Create a reduced matrix of B to get rid of pressure */ ++ for (i=0;i<6;i++){ ++ for (j=0;j<3;j++){ ++ B_reduced[i][j]=B[i][j]; ++ } ++ for (j=4;j<7;j++){ ++ B_reduced[i][j-1]=B[i][j]; ++ } ++ for (j=8;j<11;j++){ ++ B_reduced[i][j-2]=B[i][j]; ++ } ++ for (j=12;j<15;j++){ ++ B_reduced[i][j-3]=B[i][j]; ++ } ++ for (j=16;j<19;j++){ ++ B_reduced[i][j-4]=B[i][j]; ++ } ++ for (j=20;j<23;j++){ ++ B_reduced[i][j-5]=B[i][j]; ++ } ++ } ++ ++ /*Here, we are computing the strain rate of (vx,0,0)*/ ++ for(i=0;ivalues[i]; ++ velocity[i][1]=0.0; ++ velocity[i][2]=0.0; ++ } ++ /*Multiply B by velocity, to get strain rate: */ ++ MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numnodes,0,&velocity[0][0],DOFVELOCITY*numnodes,1,0,epsilonvx,0); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetVyStrainRate3d{{{1*/ ++void PentaP1Input::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ ++ int i,j; ++ ++ const int numnodes=6; ++ const int DOFVELOCITY=3; ++ double B[8][27]; ++ double B_reduced[6][DOFVELOCITY*numnodes]; ++ double velocity[numnodes][DOFVELOCITY]; ++ ++ /*Get B matrix: */ ++ GetBStokes(&B[0][0], xyz_list, gauss); ++ /*Create a reduced matrix of B to get rid of pressure */ ++ for (i=0;i<6;i++){ ++ for (j=0;j<3;j++){ ++ B_reduced[i][j]=B[i][j]; ++ } ++ for (j=4;j<7;j++){ ++ B_reduced[i][j-1]=B[i][j]; ++ } ++ for (j=8;j<11;j++){ ++ B_reduced[i][j-2]=B[i][j]; ++ } ++ for (j=12;j<15;j++){ ++ B_reduced[i][j-3]=B[i][j]; ++ } ++ for (j=16;j<19;j++){ ++ B_reduced[i][j-4]=B[i][j]; ++ } ++ for (j=20;j<23;j++){ ++ B_reduced[i][j-5]=B[i][j]; ++ } ++ } ++ ++ /*Here, we are computing the strain rate of (0,vy,0)*/ ++ for(i=0;ivalues[i]; ++ velocity[i][2]=0.0; ++ } ++ /*Multiply B by velocity, to get strain rate: */ ++ MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numnodes,0,&velocity[0][0],DOFVELOCITY*numnodes,1,0,epsilonvy,0); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetVzStrainRate3d{{{1*/ ++void PentaP1Input::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){ ++ int i,j; ++ ++ const int numnodes=6; ++ const int DOFVELOCITY=3; ++ double B[8][27]; ++ double B_reduced[6][DOFVELOCITY*numnodes]; ++ double velocity[numnodes][DOFVELOCITY]; ++ ++ /*Get B matrix: */ ++ GetBStokes(&B[0][0], xyz_list, gauss); ++ /*Create a reduced matrix of B to get rid of pressure */ ++ for (i=0;i<6;i++){ ++ for (j=0;j<3;j++){ ++ B_reduced[i][j]=B[i][j]; ++ } ++ for (j=4;j<7;j++){ ++ B_reduced[i][j-1]=B[i][j]; ++ } ++ for (j=8;j<11;j++){ ++ B_reduced[i][j-2]=B[i][j]; ++ } ++ for (j=12;j<15;j++){ ++ B_reduced[i][j-3]=B[i][j]; ++ } ++ for (j=16;j<19;j++){ ++ B_reduced[i][j-4]=B[i][j]; ++ } ++ for (j=20;j<23;j++){ ++ B_reduced[i][j-5]=B[i][j]; ++ } ++ } ++ ++ /*Here, we are computing the strain rate of (0,0,vz)*/ ++ for(i=0;ivalues[i]; ++ } ++ ++ /*Multiply B by velocity, to get strain rate: */ ++ MatrixMultiply(&B_reduced[0][0],6,DOFVELOCITY*numnodes,0,&velocity[0][0],DOFVELOCITY*numnodes,1,0,epsilonvz,0); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetVxStrainRate3dPattyn{{{1*/ ++void PentaP1Input::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ ++ ++ int i; ++ const int numnodes=6; ++ double B[5][NDOF2*numnodes]; ++ double velocity[numnodes][NDOF2]; ++ ++ /*Get B matrix: */ ++ GetBPattyn(&B[0][0], xyz_list, gauss); ++ ++ /*Here, we are computing the strain rate of (vx,0)*/ ++ for(i=0;ivalues[i]; ++ velocity[i][1]=0.0; ++ } ++ ++ /*Multiply B by velocity, to get strain rate: */ ++ MatrixMultiply( &B[0][0],5,NDOF2*numnodes,0, ++ &velocity[0][0],NDOF2*numnodes,1,0, ++ epsilonvx,0); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetVyStrainRate3dPattyn{{{1*/ ++void PentaP1Input::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ ++ ++ int i; ++ const int numnodes=6; ++ double B[5][NDOF2*numnodes]; ++ double velocity[numnodes][NDOF2]; ++ ++ /*Get B matrix: */ ++ GetBPattyn(&B[0][0], xyz_list, gauss); ++ ++ /*Here, we are computing the strain rate of (0,vy)*/ ++ for(i=0;ivalues[i]; ++ } ++ ++ /*Multiply B by velocity, to get strain rate: */ ++ MatrixMultiply( &B[0][0],5,NDOF2*numnodes,0, ++ &velocity[0][0],NDOF2*numnodes,1,0, ++ epsilonvy,0); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::ChangeEnum{{{1*/ ++void PentaP1Input::ChangeEnum(int newenumtype){ ++ this->enum_type=newenumtype; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetInputAverage{{{1*/ ++void PentaP1Input::GetInputAverage(double* pvalue){ ++ *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]); ++} ++/*}}}*/ ++ ++/*Intermediary*/ ++/*FUNCTION PentaP1Input::SquareMin{{{1*/ ++void PentaP1Input::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ ++ ++ int i; ++ const int numnodes=6; ++ double valuescopy[numnodes]; ++ double squaremin; ++ ++ /*First, copy values, to process units if requested: */ ++ for(i=0;ivalues[i]; ++ ++ /*Process units if requested: */ ++ if(process_units)UnitConversion(&valuescopy[0],numnodes,IuToExtEnum,enum_type); ++ ++ /*Now, figure out minimum of valuescopy: */ ++ squaremin=pow(valuescopy[0],2); ++ for(i=1;inorm) norm=fabs(values[i]); ++ return norm; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::Max{{{1*/ ++double PentaP1Input::Max(void){ ++ ++ const int numnodes=6; ++ double max=values[0]; ++ ++ for(int i=1;imax) max=values[i]; ++ } ++ return max; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::MaxAbs{{{1*/ ++double PentaP1Input::MaxAbs(void){ ++ ++ const int numnodes=6; ++ double max=fabs(values[0]); ++ ++ for(int i=1;imax) max=fabs(values[i]); ++ } ++ return max; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::Min{{{1*/ ++double PentaP1Input::Min(void){ ++ ++ const int numnodes=6; ++ double min=values[0]; ++ ++ for(int i=1;iObjectEnum()){ ++ ++ case PentaP1InputEnum:{ ++ PentaP1Input* cast_input=(PentaP1Input*)xinput; ++ for(i=0;ivalues[i]=this->values[i]+scalar*(cast_input->values[i]);} ++ return; ++ case ControlInputEnum:{ ++ ControlInput* cont_input=(ControlInput*)xinput; ++ if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error_("not supported yet"); ++ PentaP1Input* cast_input=(PentaP1Input*)cont_input->values; ++ for(i=0;ivalues[i]=this->values[i]+scalar*(cast_input->values[i]);} ++ return; ++ default: ++ _error_("not implemented yet"); ++ } ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::Constrain{{{1*/ ++void PentaP1Input::Constrain(double cm_min, double cm_max){ ++ ++ int i; ++ const int numnodes=6; ++ ++ if(!isnan(cm_min)) for(i=0;ivalues[i]values[i]=cm_min; ++ if(!isnan(cm_max)) for(i=0;ivalues[i]>cm_max)this->values[i]=cm_max; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::Extrude{{{1*/ ++void PentaP1Input::Extrude(void){ ++ ++ int i; ++ ++ /*First 3 values copied on 3 last values*/ ++ for(i=0;i<3;i++) this->values[3+i]=this->values[i]; ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::VerticallyIntegrate{{{1*/ ++void PentaP1Input::VerticallyIntegrate(Input* thickness_input){ ++ ++ /*Intermediaries*/ ++ int i; ++ const int numnodes = 6; ++ int num_thickness_values; ++ double *thickness_values = NULL; ++ ++ /*Check that input provided is a thickness*/ ++ if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is %s)",EnumToStringx(thickness_input->InstanceEnum())); ++ ++ /*Get Thickness value pointer*/ ++ thickness_input->GetValuesPtr(&thickness_values,&num_thickness_values); ++ ++ /*vertically integrate depending on type:*/ ++ switch(thickness_input->ObjectEnum()){ ++ ++ case PentaP1InputEnum: ++ for(i=0;i<3;i++){ ++ this->values[i]=0.5*(this->values[i]+this->values[i+3]) * thickness_values[i]; ++ this->values[i+3]=this->values[i]; ++ } ++ return; ++ ++ default: ++ _error_("not implemented yet"); ++ } ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::PointwiseDivide{{{1*/ ++Input* PentaP1Input::PointwiseDivide(Input* inputB){ ++ ++ /*Ouput*/ ++ PentaP1Input* outinput=NULL; ++ ++ /*Intermediaries*/ ++ int i; ++ PentaP1Input *xinputB = NULL; ++ int B_numvalues; ++ const int numnodes = 6; ++ double AdotBvalues[numnodes]; ++ ++ /*Check that inputB is of the same type*/ ++ if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); ++ xinputB=(PentaP1Input*)inputB; ++ ++ /*Create point wise sum*/ ++ for(i=0;ivalues[i]!=0); ++ AdotBvalues[i]=this->values[i]/xinputB->values[i]; ++ } ++ ++ /*Create new Penta vertex input (copy of current input)*/ ++ outinput=new PentaP1Input(this->enum_type,&AdotBvalues[0]); ++ ++ /*Return output pointer*/ ++ return outinput; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::PointwiseMin{{{1*/ ++Input* PentaP1Input::PointwiseMin(Input* inputB){ ++ ++ /*Ouput*/ ++ PentaP1Input* outinput=NULL; ++ ++ /*Intermediaries*/ ++ int i; ++ PentaP1Input *xinputB = NULL; ++ int B_numvalues; ++ const int numnodes = 6; ++ double minvalues[numnodes]; ++ ++ /*Check that inputB is of the same type*/ ++ if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); ++ xinputB=(PentaP1Input*)inputB; ++ ++ /*Create point wise min*/ ++ for(i=0;ivalues[i] > xinputB->values[i]) minvalues[i]=xinputB->values[i]; ++ else minvalues[i]=this->values[i]; ++ } ++ ++ /*Create new Penta vertex input (copy of current input)*/ ++ outinput=new PentaP1Input(this->enum_type,&minvalues[0]); ++ ++ /*Return output pointer*/ ++ return outinput; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::PointwiseMax{{{1*/ ++Input* PentaP1Input::PointwiseMax(Input* inputB){ ++ ++ /*Ouput*/ ++ PentaP1Input* outinput=NULL; ++ ++ /*Intermediaries*/ ++ int i; ++ PentaP1Input *xinputB = NULL; ++ int B_numvalues; ++ const int numnodes = 6; ++ double maxvalues[numnodes]; ++ ++ /*Check that inputB is of the same type*/ ++ if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); ++ xinputB=(PentaP1Input*)inputB; ++ ++ /*Create point wise max*/ ++ for(i=0;ivalues[i] < xinputB->values[i]) maxvalues[i]=xinputB->values[i]; ++ else maxvalues[i]=this->values[i]; ++ } ++ ++ /*Create new Penta vertex input (copy of current input)*/ ++ outinput=new PentaP1Input(this->enum_type,&maxvalues[0]); ++ ++ /*Return output pointer*/ ++ return outinput; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::GetVectorFromInputs{{{1*/ ++void PentaP1Input::GetVectorFromInputs(Vec vector,int* doflist){ ++ ++ const int numvertices=6; ++ VecSetValues(vector,numvertices,doflist,(const double*)this->values,INSERT_VALUES); ++ ++} /*}}}*/ ++/*FUNCTION PentaP1Input::GetValuesPtr{{{1*/ ++void PentaP1Input::GetValuesPtr(double** pvalues,int* pnum_values){ ++ ++ *pvalues=this->values; ++ *pnum_values=6; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1Input::Configure{{{1*/ ++void PentaP1Input::Configure(Parameters* parameters){ ++ /*do nothing: */ ++} ++/*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 11290) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 11291) +@@ -339,7 +339,7 @@ + /*vertically integrate depending on type:*/ + switch(thickness_input->ObjectEnum()){ + +- case PentaVertexInputEnum: ++ case PentaP1InputEnum: + thickness_input->GetInputAverage(&thickness_value); + this->value=this->value*thickness_value; + return; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 11291) +@@ -0,0 +1,89 @@ ++/*! \file PentaP1Input.h ++ * \brief: header file for triavertexinput object ++ */ ++ ++ ++#ifndef _PENTAVERTEXINPUT_H_ ++#define _PENTAVERTEXINPUT_H_ ++ ++/*Headers:*/ ++/*{{{1*/ ++#include "./Input.h" ++#include "../Elements/PentaRef.h" ++class GaussTria; ++/*}}}*/ ++ ++class PentaP1Input: public Input, public PentaRef{ ++ ++ public: ++ /*just hold 6 values for 6 vertices: */ ++ int enum_type; ++ double values[6]; ++ ++ /*PentaP1Input constructors, destructors: {{{1*/ ++ PentaP1Input(); ++ PentaP1Input(int enum_type,double* values); ++ ~PentaP1Input(); ++ /*}}}*/ ++ /*Object virtual functions definitions:{{{1 */ ++ void Echo(); ++ void DeepEcho(); ++ int Id(); ++ int MyRank(); ++ #ifdef _SERIAL_ ++ void Marshall(char** pmarshalled_dataset); ++ int MarshallSize(); ++ void Demarshall(char** pmarshalled_dataset); ++ #endif ++ int ObjectEnum(); ++ Object* copy(); ++ /*}}}*/ ++ /*PentaP1Input management: {{{1*/ ++ int InstanceEnum(); ++ Input* SpawnTriaInput(int* indices); ++ Input* PointwiseDivide(Input* inputB); ++ Input* PointwiseMin(Input* inputB); ++ Input* PointwiseMax(Input* inputB); ++ ElementResult* SpawnResult(int step, double time); ++ void AddTimeValues(double* values,int step,double time){_error_("not supported yet");}; ++ void Configure(Parameters* parameters); ++ /*}}}*/ ++ /*numerics: {{{1*/ ++ void GetInputValue(bool* pvalue){_error_("not implemented yet");}; ++ void GetInputValue(int* pvalue){_error_("not implemented yet");}; ++ void GetInputValue(double* pvalue){_error_("not implemented yet");}; ++ void GetInputValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");}; ++ void GetInputValue(double* pvalue,GaussPenta* gauss); ++ void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; ++ void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; ++ void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; ++ void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); ++ void GetInputAverage(double* pvalue); ++ void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; ++ void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; ++ void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss); ++ void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss); ++ void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss); ++ void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss); ++ void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss); ++ void ChangeEnum(int newenumtype); ++ ++ void SquareMin(double* psquaremin, bool process_units,Parameters* parameters); ++ void ConstrainMin(double minimum); ++ void Scale(double scale_factor); ++ void ArtificialNoise(double min,double max){_error_("not implemented yet");}; ++ void AXPY(Input* xinput,double scalar); ++ void Constrain(double cm_min, double cm_max); ++ double InfinityNorm(void); ++ double Max(void); ++ double MaxAbs(void); ++ double Min(void); ++ double MinAbs(void); ++ void Extrude(void); ++ void VerticallyIntegrate(Input* thickness_input); ++ void GetVectorFromInputs(Vec vector,int* doflist); ++ void GetValuesPtr(double** pvalues,int* pnum_values); ++ /*}}}*/ ++ ++}; ++#endif /* _PENTAVERTEXINPUT_H */ Index: /issm/oecreview/Archive/11286-11300/ISSM-11291-11292.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11291-11292.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11291-11292.diff (revision 11515) @@ -0,0 +1,1290 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11292) +@@ -392,11 +392,11 @@ + PatchEnum, + PatchNodesEnum, + PatchVerticesEnum, +- PentaVertexElementResultEnum, ++ PentaP1ElementResultEnum, + PetscVecExternalResultEnum, + StringExternalResultEnum, + TimeEnum, +- TriaVertexElementResultEnum, ++ TriaP1ElementResultEnum, + WaterColumnOldEnum, + /*}}}*/ + /*Responses{{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/DataSet.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/DataSet.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/DataSet.cpp (revision 11292) +@@ -257,16 +257,16 @@ + datasetinputinput->Demarshall(&marshalled_dataset); + dataset->AddObject(datasetinputinput);} + break; +- case TriaVertexElementResultEnum:{ +- TriaVertexElementResult* triavertexelementresult=NULL; +- triavertexelementresult=new TriaVertexElementResult(); ++ case TriaP1ElementResultEnum:{ ++ TriaP1ElementResult* triavertexelementresult=NULL; ++ triavertexelementresult=new TriaP1ElementResult(); + triavertexelementresult->Demarshall(&marshalled_dataset); + dataset->AddObject(triavertexelementresult);} + break; + #ifdef _HAVE_THREED_ +- case PentaVertexElementResultEnum:{ +- PentaVertexElementResult* pentavertexelementresult=NULL; +- pentavertexelementresult=new PentaVertexElementResult(); ++ case PentaP1ElementResultEnum:{ ++ PentaP1ElementResult* pentavertexelementresult=NULL; ++ pentavertexelementresult=new PentaP1ElementResult(); + pentavertexelementresult->Demarshall(&marshalled_dataset); + dataset->AddObject(pentavertexelementresult);} + break; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11292) +@@ -376,11 +376,11 @@ + else if (strcmp(name,"Patch")==0) return PatchEnum; + else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; + else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; +- else if (strcmp(name,"PentaVertexElementResult")==0) return PentaVertexElementResultEnum; ++ else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; + else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum; + else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; + else if (strcmp(name,"Time")==0) return TimeEnum; +- else if (strcmp(name,"TriaVertexElementResult")==0) return TriaVertexElementResultEnum; ++ else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; + else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; + else if (strcmp(name,"MinVel")==0) return MinVelEnum; + else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11292) +@@ -378,11 +378,11 @@ + case PatchEnum : return "Patch"; + case PatchNodesEnum : return "PatchNodes"; + case PatchVerticesEnum : return "PatchVertices"; +- case PentaVertexElementResultEnum : return "PentaVertexElementResult"; ++ case PentaP1ElementResultEnum : return "PentaP1ElementResult"; + case PetscVecExternalResultEnum : return "PetscVecExternalResult"; + case StringExternalResultEnum : return "StringExternalResult"; + case TimeEnum : return "Time"; +- case TriaVertexElementResultEnum : return "TriaVertexElementResult"; ++ case TriaP1ElementResultEnum : return "TriaP1ElementResult"; + case WaterColumnOldEnum : return "WaterColumnOld"; + case MinVelEnum : return "MinVel"; + case MaxVelEnum : return "MaxVel"; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11292) +@@ -60,8 +60,8 @@ + ./objects/ElementResults/ElementResultLocal.h\ + ./objects/ElementResults/DoubleElementResult.h\ + ./objects/ElementResults/DoubleElementResult.cpp\ +- ./objects/ElementResults/TriaVertexElementResult.h\ +- ./objects/ElementResults/TriaVertexElementResult.cpp\ ++ ./objects/ElementResults/TriaP1ElementResult.h\ ++ ./objects/ElementResults/TriaP1ElementResult.cpp\ + ./objects/ElementResults/BoolElementResult.h\ + ./objects/ElementResults/BoolElementResult.cpp\ + ./objects/ExternalResults/ExternalResult.h\ +@@ -558,8 +558,8 @@ + #3D sources {{{1 + threed_sources = ./objects/Gauss/GaussPenta.h\ + ./objects/Gauss/GaussPenta.cpp\ +- ./objects/ElementResults/PentaVertexElementResult.h\ +- ./objects/ElementResults/PentaVertexElementResult.cpp\ ++ ./objects/ElementResults/PentaP1ElementResult.h\ ++ ./objects/ElementResults/PentaP1ElementResult.cpp\ + ./objects/Inputs/PentaP1Input.h\ + ./objects/Inputs/PentaP1Input.cpp\ + ./objects/Elements/Penta.h\ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 11292) +@@ -1,210 +0,0 @@ +-/*!\file PentaVertexElementResult.c +- * \brief: implementation of the PentaVertexElementResult object +- */ +- +-#ifdef HAVE_CONFIG_H +- #include +-#else +-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +-#endif +- +-#include +-#include +-#include "./ElementResultLocal.h" +-#include "../objects.h" +-#include "../../EnumDefinitions/EnumDefinitions.h" +-#include "../../shared/shared.h" +-#include "../../Container/Container.h" +-#include "../../include/include.h" +- +-/*PentaVertexElementResult constructors and destructor*/ +-/*FUNCTION PentaVertexElementResult::PentaVertexElementResult(){{{1*/ +-PentaVertexElementResult::PentaVertexElementResult(){ +- return; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::PentaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ +-PentaVertexElementResult::PentaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ +- +- int i; +- +- enum_type=in_enum_type; +- for(i=0;i<6;i++)values[i]=in_values[i]; +- step=in_step; +- time=in_time; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::~PentaVertexElementResult(){{{1*/ +-PentaVertexElementResult::~PentaVertexElementResult(){ +- return; +-} +-/*}}}*/ +- +-/*Object virtual functions definitions:*/ +-/*FUNCTION PentaVertexElementResult::Echo {{{1*/ +-void PentaVertexElementResult::Echo(void){ +- this->DeepEcho(); +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::DeepEcho{{{1*/ +-void PentaVertexElementResult::DeepEcho(void){ +- +- printf("PentaVertexElementResult:\n"); +- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); +- printf(" values: [%g %g %g %g %g %g]\n",this->values[0],this->values[1],this->values[2],this->values[3],this->values[4],this->values[5]); +- printf(" step: %i\n",this->step); +- printf(" time: %g\n",this->time); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::Id{{{1*/ +-int PentaVertexElementResult::Id(void){ return -1; } +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::MyRank{{{1*/ +-int PentaVertexElementResult::MyRank(void){ +- extern int my_rank; +- return my_rank; +-} +-/*}}}*/ +-#ifdef _SERIAL_ +-/*FUNCTION PentaVertexElementResult::Marshall{{{1*/ +-void PentaVertexElementResult::Marshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int enum_value=0; +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*get enum value of PentaVertexElementResult: */ +- enum_value=PentaVertexElementResultEnum; +- +- /*marshall enum: */ +- memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); +- +- /*marshall PentaVertexElementResult data: */ +- memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); +- memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); +- memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); +- +- *pmarshalled_dataset=marshalled_dataset; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::MarshallSize{{{1*/ +-int PentaVertexElementResult::MarshallSize(){ +- +- return sizeof(values)+ +- +sizeof(enum_type) +- +sizeof(time) +- +sizeof(step) +- +sizeof(int); //sizeof(int) for enum value +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::Demarshall{{{1*/ +-void PentaVertexElementResult::Demarshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int i; +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*this time, no need to get enum type, the pointer directly points to the beginning of the +- *object data (thanks to DataSet::Demarshall):*/ +- memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); +- memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); +- memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); +- +- /*return: */ +- *pmarshalled_dataset=marshalled_dataset; +- return; +-} +-/*}}}*/ +-#endif +-/*FUNCTION PentaVertexElementResult::ObjectEnum{{{1*/ +-int PentaVertexElementResult::ObjectEnum(void){ +- +- return PentaVertexElementResultEnum; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::copy{{{1*/ +-Object* PentaVertexElementResult::copy() { +- +- return new PentaVertexElementResult(this->enum_type,this->values,this->step,this->time); +- +-} +-/*}}}*/ +- +-/*ElementResult management*/ +-/*FUNCTION PentaVertexElementResult::InstanceEnum{{{1*/ +-int PentaVertexElementResult::InstanceEnum(void){ +- +- return this->enum_type; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::SpawnTriaElementResult{{{1*/ +-ElementResult* PentaVertexElementResult::SpawnTriaElementResult(int* indices){ +- +- /*output*/ +- TriaVertexElementResult* outresult=NULL; +- double newvalues[3]; +- +- /*Loop over the new indices*/ +- for(int i=0;i<3;i++){ +- +- /*Check index value*/ +- _assert_(indices[i]>=0 && indices[i]<6); +- +- /*Assign value to new result*/ +- newvalues[i]=this->values[indices[i]]; +- } +- +- /*Create new Tria result*/ +- outresult=new TriaVertexElementResult(this->enum_type,&newvalues[0],this->step,this->time); +- +- /*Assign output*/ +- return outresult; +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::ProcessUnits{{{1*/ +-void PentaVertexElementResult::ProcessUnits(Parameters* parameters){ +- +- UnitConversion(this->values,6,IuToExtEnum,this->enum_type); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::NumberOfNodalValues{{{1*/ +-int PentaVertexElementResult::NumberOfNodalValues(void){ +- return 6; +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::PatchFill{{{1*/ +-void PentaVertexElementResult::PatchFill(int row, Patch* patch){ +- +- /*Here, we fill the result information into the patch object. First, let's remember what is in a row +- * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values +- * Here, we will supply the enum_type, step, time, interpolation and nodal_values: */ +- patch->fillresultinfo(row,this->enum_type,this->step,this->time,P1Enum,this->values,6); +- +-} +-/*}}}*/ +-/*FUNCTION PentaVertexElementResult::GetVectorFromResults{{{1*/ +-void PentaVertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){ +- +- double data[6]; +- +- if(numdofs!=6)_error_("Result %s is a PentaVertexElementResult and cannot write vector of %i dofs",numdofs); +- for(int i=0;i<6;i++) data[i]=this->values[i]/(double)connectivitylist[i]; +- VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES); +- +-} /*}}}*/ +-/*FUNCTION PentaVertexElementResult::GetElementVectorFromResults{{{1*/ +-void PentaVertexElementResult::GetElementVectorFromResults(Vec vector,int dof){ +- +- _error_("Result %s is a PentaVertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); +-} /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 11292) +@@ -1,59 +0,0 @@ +-/*! \file PentaVertexElementResult.h +- * \brief: header file for penta vertex result object. +- * this object is just a PentaP1Input with additional time and step info. +- */ +- +- +-#ifndef _PENTAVERTEXELEMENTRESULT_H_ +-#define _PENTAVERTEXELEMENTRESULT_H_ +- +-/*Headers:*/ +-/*{{{1*/ +-#include "../Inputs/Input.h" +-#include "../../include/include.h" +-/*}}}*/ +- +-class PentaVertexElementResult: public ElementResult{ +- +- private: +- int enum_type; +- double values[6]; +- int step; +- double time; +- +- public: +- +- /*PentaVertexElementResult constructors, destructors: {{{1*/ +- PentaVertexElementResult(); +- PentaVertexElementResult(int enum_type,double* values,int step, double time); +- ~PentaVertexElementResult(); +- /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ +- void Echo(); +- void DeepEcho(); +- int Id(); +- int MyRank(); +- #ifdef _SERIAL_ +- void Marshall(char** pmarshalled_dataset); +- int MarshallSize(); +- void Demarshall(char** pmarshalled_dataset); +- #endif +- int ObjectEnum(); +- Object* copy(); +- /*}}}*/ +- /*ElementResult virtual functions definitions: {{{1*/ +- ElementResult* SpawnTriaElementResult(int* indices); +- double GetTime(void){return time;}; +- int GetStep(void){return step;}; +- void ProcessUnits(Parameters* parameters); +- int NumberOfNodalValues(void); +- void PatchFill(int row, Patch* patch); +- /*}}}*/ +- /*PentaVertexElementResult management: {{{1*/ +- int InstanceEnum(); +- void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs); +- void GetElementVectorFromResults(Vec vector,int dof); +- /*}}}*/ +- +-}; +-#endif /* _PENTAVERTEXELEMENTRESULT_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 11292) +@@ -1,199 +0,0 @@ +-/*!\file TriaVertexElementResult.c +- * \brief: implementation of the TriaVertexElementResult object +- */ +- +-#ifdef HAVE_CONFIG_H +- #include +-#else +-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +-#endif +- +-#include +-#include +-#include "./ElementResultLocal.h" +-#include "../objects.h" +-#include "../../EnumDefinitions/EnumDefinitions.h" +-#include "../../shared/shared.h" +-#include "../../Container/Container.h" +-#include "../../include/include.h" +- +-/*TriaVertexElementResult constructors and destructor*/ +-/*FUNCTION TriaVertexElementResult::TriaVertexElementResult(){{{1*/ +-TriaVertexElementResult::TriaVertexElementResult(){ +- return; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::TriaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ +-TriaVertexElementResult::TriaVertexElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ +- +- enum_type=in_enum_type; +- values[0]=in_values[0]; +- values[1]=in_values[1]; +- values[2]=in_values[2]; +- step=in_step; +- time=in_time; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::~TriaVertexElementResult(){{{1*/ +-TriaVertexElementResult::~TriaVertexElementResult(){ +- return; +-} +-/*}}}*/ +- +-/*Object virtual functions definitions:*/ +-/*FUNCTION TriaVertexElementResult::Echo {{{1*/ +-void TriaVertexElementResult::Echo(void){ +- this->DeepEcho(); +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::DeepEcho{{{1*/ +-void TriaVertexElementResult::DeepEcho(void){ +- +- printf("TriaVertexElementResult:\n"); +- printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); +- printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); +- printf(" step: %i\n",this->step); +- printf(" time: %g\n",this->time); +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::Id{{{1*/ +-int TriaVertexElementResult::Id(void){ return -1; } +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::MyRank{{{1*/ +-int TriaVertexElementResult::MyRank(void){ +- extern int my_rank; +- return my_rank; +-} +-/*}}}*/ +-#ifdef _SERIAL_ +-/*FUNCTION TriaVertexElementResult::Marshall{{{1*/ +-void TriaVertexElementResult::Marshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int enum_value=0; +- +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*get enum value of TriaVertexElementResult: */ +- enum_value=TriaVertexElementResultEnum; +- +- /*marshall enum: */ +- memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); +- +- /*marshall TriaVertexElementResult data: */ +- memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); +- memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); +- memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); +- +- *pmarshalled_dataset=marshalled_dataset; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::MarshallSize{{{1*/ +-int TriaVertexElementResult::MarshallSize(){ +- +- return sizeof(values) +- +sizeof(enum_type) +- +sizeof(time) +- +sizeof(step) +- +sizeof(int); //sizeof(int) for enum value +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::Demarshall{{{1*/ +-void TriaVertexElementResult::Demarshall(char** pmarshalled_dataset){ +- +- char* marshalled_dataset=NULL; +- int i; +- +- /*recover marshalled_dataset: */ +- marshalled_dataset=*pmarshalled_dataset; +- +- /*this time, no need to get enum type, the pointer directly points to the beginning of the +- *object data (thanks to DataSet::Demarshall):*/ +- memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); +- memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); +- memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); +- memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); +- +- /*return: */ +- *pmarshalled_dataset=marshalled_dataset; +- return; +-} +-/*}}}*/ +-#endif +-/*FUNCTION TriaVertexElementResult::ObjectEnum{{{1*/ +-int TriaVertexElementResult::ObjectEnum(void){ +- +- return TriaVertexElementResultEnum; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::copy{{{1*/ +-Object* TriaVertexElementResult::copy() { +- +- return new TriaVertexElementResult(this->enum_type,this->values,this->step,this->time); +- +-} +-/*}}}*/ +- +-/*ElementResult management*/ +-/*FUNCTION TriaVertexElementResult::InstanceEnum{{{1*/ +-int TriaVertexElementResult::InstanceEnum(void){ +- +- return this->enum_type; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::SpawnTriaElementResult{{{1*/ +-ElementResult* TriaVertexElementResult::SpawnTriaElementResult(int* indices){ +- +- /*output*/ +- TriaVertexElementResult* outresult=NULL; +- +- /*Create new Tria result (copy of current result)*/ +- outresult=new TriaVertexElementResult(this->enum_type,&this->values[0],this->step,this->time); +- +- /*Assign output*/ +- return outresult; +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::ProcessUnits{{{1*/ +-void TriaVertexElementResult::ProcessUnits(Parameters* parameters){ +- +- UnitConversion(this->values,3,IuToExtEnum,this->enum_type); +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::NumberOfNodalValues{{{1*/ +-int TriaVertexElementResult::NumberOfNodalValues(void){ +- return 3; +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::PatchFill{{{1*/ +-void TriaVertexElementResult::PatchFill(int row, Patch* patch){ +- +- /*Here, we fill the result information into the patch object. First, let's remember what is in a row +- * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values +- * Here, we will supply the enum_type, step, time, interpolation and nodal_values: */ +- patch->fillresultinfo(row,this->enum_type,this->step,this->time,P1Enum,this->values,3); +- +-} +-/*}}}*/ +-/*FUNCTION TriaVertexElementResult::GetVectorFromResults{{{1*/ +-void TriaVertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){ +- +- double data[3]; +- +- if(numdofs!=3)_error_("Result %s is a TriaVertexElementResult and cannot write vector of %i dofs",numdofs); +- for(int i=0;i<3;i++) data[i]=this->values[i]/(double)connectivitylist[i]; +- VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES); +- +-} /*}}}*/ +-/*FUNCTION TriaVertexElementResult::GetElementVectorFromResults{{{1*/ +-void TriaVertexElementResult::GetElementVectorFromResults(Vec vector,int dof){ +- +- _error_("Result %s is a TriaVertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); +-} /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 11292) +@@ -1,58 +0,0 @@ +-/*! \file TriaVertexElementResult.h +- * \brief: header file for triavertexresult object +- */ +- +- +-#ifndef _TRIAVERTEXELEMENTRESULT_H_ +-#define _TRIAVERTEXELEMENTRESULT_H_ +- +-/*Headers:*/ +-/*{{{1*/ +-#include "../Inputs/Input.h" +-#include "../../include/include.h" +-/*}}}*/ +- +-class TriaVertexElementResult: public ElementResult{ +- +- private: +- int enum_type; +- double values[3]; +- int step; +- double time; +- +- public: +- +- /*TriaVertexElementResult constructors, destructors: {{{1*/ +- TriaVertexElementResult(); +- TriaVertexElementResult(int enum_type,double* values,int step,double time); +- ~TriaVertexElementResult(); +- /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ +- void Echo(); +- void DeepEcho(); +- int Id(); +- int MyRank(); +- #ifdef _SERIAL_ +- void Marshall(char** pmarshalled_dataset); +- int MarshallSize(); +- void Demarshall(char** pmarshalled_dataset); +- #endif +- int ObjectEnum(); +- Object* copy(); +- /*}}}*/ +- /*ElementResult virtual functions definitions: {{{1*/ +- ElementResult* SpawnTriaElementResult(int* indices); +- double GetTime(void){return time;}; +- int GetStep(void){return step;}; +- void ProcessUnits(Parameters* parameters); +- int NumberOfNodalValues(void); +- void PatchFill(int row, Patch* patch); +- /*}}}*/ +- /*TriaVertexElementResult management: {{{1*/ +- int InstanceEnum(); +- void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs); +- void GetElementVectorFromResults(Vec vector,int dof); +- /*}}}*/ +- +-}; +-#endif /* _TRIAVERTEXELEMENTRESULT_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (revision 11292) +@@ -0,0 +1,58 @@ ++/*! \file TriaP1ElementResult.h ++ * \brief: header file for TriaP1ElementResult object ++ */ ++ ++ ++#ifndef _TRIAP1ELEMENTRESULT_H_ ++#define _TRIAP1ELEMENTRESULT_H_ ++ ++/*Headers:*/ ++/*{{{1*/ ++#include "../Inputs/Input.h" ++#include "../../include/include.h" ++/*}}}*/ ++ ++class TriaP1ElementResult: public ElementResult{ ++ ++ private: ++ int enum_type; ++ double values[3]; ++ int step; ++ double time; ++ ++ public: ++ ++ /*TriaP1ElementResult constructors, destructors: {{{1*/ ++ TriaP1ElementResult(); ++ TriaP1ElementResult(int enum_type,double* values,int step,double time); ++ ~TriaP1ElementResult(); ++ /*}}}*/ ++ /*Object virtual functions definitions:{{{1 */ ++ void Echo(); ++ void DeepEcho(); ++ int Id(); ++ int MyRank(); ++ #ifdef _SERIAL_ ++ void Marshall(char** pmarshalled_dataset); ++ int MarshallSize(); ++ void Demarshall(char** pmarshalled_dataset); ++ #endif ++ int ObjectEnum(); ++ Object* copy(); ++ /*}}}*/ ++ /*ElementResult virtual functions definitions: {{{1*/ ++ ElementResult* SpawnTriaElementResult(int* indices); ++ double GetTime(void){return time;}; ++ int GetStep(void){return step;}; ++ void ProcessUnits(Parameters* parameters); ++ int NumberOfNodalValues(void); ++ void PatchFill(int row, Patch* patch); ++ /*}}}*/ ++ /*TriaP1ElementResult management: {{{1*/ ++ int InstanceEnum(); ++ void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs); ++ void GetElementVectorFromResults(Vec vector,int dof); ++ /*}}}*/ ++ ++}; ++#endif /* _TRIAP1ELEMENTRESULT_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 11292) +@@ -0,0 +1,210 @@ ++/*!\file PentaP1ElementResult.c ++ * \brief: implementation of the PentaP1ElementResult object ++ */ ++ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++ ++#include ++#include ++#include "./ElementResultLocal.h" ++#include "../objects.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++#include "../../shared/shared.h" ++#include "../../Container/Container.h" ++#include "../../include/include.h" ++ ++/*PentaP1ElementResult constructors and destructor*/ ++/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(){{{1*/ ++PentaP1ElementResult::PentaP1ElementResult(){ ++ return; ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ ++PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ ++ ++ int i; ++ ++ enum_type=in_enum_type; ++ for(i=0;i<6;i++)values[i]=in_values[i]; ++ step=in_step; ++ time=in_time; ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::~PentaP1ElementResult(){{{1*/ ++PentaP1ElementResult::~PentaP1ElementResult(){ ++ return; ++} ++/*}}}*/ ++ ++/*Object virtual functions definitions:*/ ++/*FUNCTION PentaP1ElementResult::Echo {{{1*/ ++void PentaP1ElementResult::Echo(void){ ++ this->DeepEcho(); ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::DeepEcho{{{1*/ ++void PentaP1ElementResult::DeepEcho(void){ ++ ++ printf("PentaP1ElementResult:\n"); ++ printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); ++ printf(" values: [%g %g %g %g %g %g]\n",this->values[0],this->values[1],this->values[2],this->values[3],this->values[4],this->values[5]); ++ printf(" step: %i\n",this->step); ++ printf(" time: %g\n",this->time); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::Id{{{1*/ ++int PentaP1ElementResult::Id(void){ return -1; } ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::MyRank{{{1*/ ++int PentaP1ElementResult::MyRank(void){ ++ extern int my_rank; ++ return my_rank; ++} ++/*}}}*/ ++#ifdef _SERIAL_ ++/*FUNCTION PentaP1ElementResult::Marshall{{{1*/ ++void PentaP1ElementResult::Marshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int enum_value=0; ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*get enum value of PentaP1ElementResult: */ ++ enum_value=PentaP1ElementResultEnum; ++ ++ /*marshall enum: */ ++ memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); ++ ++ /*marshall PentaP1ElementResult data: */ ++ memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); ++ memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); ++ memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); ++ ++ *pmarshalled_dataset=marshalled_dataset; ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::MarshallSize{{{1*/ ++int PentaP1ElementResult::MarshallSize(){ ++ ++ return sizeof(values)+ ++ +sizeof(enum_type) ++ +sizeof(time) ++ +sizeof(step) ++ +sizeof(int); //sizeof(int) for enum value ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::Demarshall{{{1*/ ++void PentaP1ElementResult::Demarshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int i; ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*this time, no need to get enum type, the pointer directly points to the beginning of the ++ *object data (thanks to DataSet::Demarshall):*/ ++ memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); ++ memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); ++ memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); ++ ++ /*return: */ ++ *pmarshalled_dataset=marshalled_dataset; ++ return; ++} ++/*}}}*/ ++#endif ++/*FUNCTION PentaP1ElementResult::ObjectEnum{{{1*/ ++int PentaP1ElementResult::ObjectEnum(void){ ++ ++ return PentaP1ElementResultEnum; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::copy{{{1*/ ++Object* PentaP1ElementResult::copy() { ++ ++ return new PentaP1ElementResult(this->enum_type,this->values,this->step,this->time); ++ ++} ++/*}}}*/ ++ ++/*ElementResult management*/ ++/*FUNCTION PentaP1ElementResult::InstanceEnum{{{1*/ ++int PentaP1ElementResult::InstanceEnum(void){ ++ ++ return this->enum_type; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::SpawnTriaElementResult{{{1*/ ++ElementResult* PentaP1ElementResult::SpawnTriaElementResult(int* indices){ ++ ++ /*output*/ ++ TriaP1ElementResult* outresult=NULL; ++ double newvalues[3]; ++ ++ /*Loop over the new indices*/ ++ for(int i=0;i<3;i++){ ++ ++ /*Check index value*/ ++ _assert_(indices[i]>=0 && indices[i]<6); ++ ++ /*Assign value to new result*/ ++ newvalues[i]=this->values[indices[i]]; ++ } ++ ++ /*Create new Tria result*/ ++ outresult=new TriaP1ElementResult(this->enum_type,&newvalues[0],this->step,this->time); ++ ++ /*Assign output*/ ++ return outresult; ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::ProcessUnits{{{1*/ ++void PentaP1ElementResult::ProcessUnits(Parameters* parameters){ ++ ++ UnitConversion(this->values,6,IuToExtEnum,this->enum_type); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::NumberOfNodalValues{{{1*/ ++int PentaP1ElementResult::NumberOfNodalValues(void){ ++ return 6; ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::PatchFill{{{1*/ ++void PentaP1ElementResult::PatchFill(int row, Patch* patch){ ++ ++ /*Here, we fill the result information into the patch object. First, let's remember what is in a row ++ * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values ++ * Here, we will supply the enum_type, step, time, interpolation and nodal_values: */ ++ patch->fillresultinfo(row,this->enum_type,this->step,this->time,P1Enum,this->values,6); ++ ++} ++/*}}}*/ ++/*FUNCTION PentaP1ElementResult::GetVectorFromResults{{{1*/ ++void PentaP1ElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){ ++ ++ double data[6]; ++ ++ if(numdofs!=6)_error_("Result %s is a PentaP1ElementResult and cannot write vector of %i dofs",numdofs); ++ for(int i=0;i<6;i++) data[i]=this->values[i]/(double)connectivitylist[i]; ++ VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES); ++ ++} /*}}}*/ ++/*FUNCTION PentaP1ElementResult::GetElementVectorFromResults{{{1*/ ++void PentaP1ElementResult::GetElementVectorFromResults(Vec vector,int dof){ ++ ++ _error_("Result %s is a PentaP1ElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); ++} /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (revision 11292) +@@ -0,0 +1,59 @@ ++/*! \file PentaP1ElementResult.h ++ * \brief: header file for PentaP1ElementResult object ++ * this object is just a PentaP1Input with additional time and step info. ++ */ ++ ++ ++#ifndef _PENTAP1ELEMENTRESULT_H_ ++#define _PENTAP1ELEMENTRESULT_H_ ++ ++/*Headers:*/ ++/*{{{1*/ ++#include "../Inputs/Input.h" ++#include "../../include/include.h" ++/*}}}*/ ++ ++class PentaP1ElementResult: public ElementResult{ ++ ++ private: ++ int enum_type; ++ double values[6]; ++ int step; ++ double time; ++ ++ public: ++ ++ /*PentaP1ElementResult constructors, destructors: {{{1*/ ++ PentaP1ElementResult(); ++ PentaP1ElementResult(int enum_type,double* values,int step, double time); ++ ~PentaP1ElementResult(); ++ /*}}}*/ ++ /*Object virtual functions definitions:{{{1 */ ++ void Echo(); ++ void DeepEcho(); ++ int Id(); ++ int MyRank(); ++ #ifdef _SERIAL_ ++ void Marshall(char** pmarshalled_dataset); ++ int MarshallSize(); ++ void Demarshall(char** pmarshalled_dataset); ++ #endif ++ int ObjectEnum(); ++ Object* copy(); ++ /*}}}*/ ++ /*ElementResult virtual functions definitions: {{{1*/ ++ ElementResult* SpawnTriaElementResult(int* indices); ++ double GetTime(void){return time;}; ++ int GetStep(void){return step;}; ++ void ProcessUnits(Parameters* parameters); ++ int NumberOfNodalValues(void); ++ void PatchFill(int row, Patch* patch); ++ /*}}}*/ ++ /*PentaP1ElementResult management: {{{1*/ ++ int InstanceEnum(); ++ void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs); ++ void GetElementVectorFromResults(Vec vector,int dof); ++ /*}}}*/ ++ ++}; ++#endif /* _PENTAP1ELEMENTRESULT_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 11292) +@@ -0,0 +1,199 @@ ++/*!\file TriaP1ElementResult.c ++ * \brief: implementation of the TriaP1ElementResult object ++ */ ++ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++ ++#include ++#include ++#include "./ElementResultLocal.h" ++#include "../objects.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++#include "../../shared/shared.h" ++#include "../../Container/Container.h" ++#include "../../include/include.h" ++ ++/*TriaP1ElementResult constructors and destructor*/ ++/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{1*/ ++TriaP1ElementResult::TriaP1ElementResult(){ ++ return; ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ ++TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ ++ ++ enum_type=in_enum_type; ++ values[0]=in_values[0]; ++ values[1]=in_values[1]; ++ values[2]=in_values[2]; ++ step=in_step; ++ time=in_time; ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{1*/ ++TriaP1ElementResult::~TriaP1ElementResult(){ ++ return; ++} ++/*}}}*/ ++ ++/*Object virtual functions definitions:*/ ++/*FUNCTION TriaP1ElementResult::Echo {{{1*/ ++void TriaP1ElementResult::Echo(void){ ++ this->DeepEcho(); ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::DeepEcho{{{1*/ ++void TriaP1ElementResult::DeepEcho(void){ ++ ++ printf("TriaP1ElementResult:\n"); ++ printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); ++ printf(" values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]); ++ printf(" step: %i\n",this->step); ++ printf(" time: %g\n",this->time); ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::Id{{{1*/ ++int TriaP1ElementResult::Id(void){ return -1; } ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::MyRank{{{1*/ ++int TriaP1ElementResult::MyRank(void){ ++ extern int my_rank; ++ return my_rank; ++} ++/*}}}*/ ++#ifdef _SERIAL_ ++/*FUNCTION TriaP1ElementResult::Marshall{{{1*/ ++void TriaP1ElementResult::Marshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int enum_value=0; ++ ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*get enum value of TriaP1ElementResult: */ ++ enum_value=TriaP1ElementResultEnum; ++ ++ /*marshall enum: */ ++ memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); ++ ++ /*marshall TriaP1ElementResult data: */ ++ memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values); ++ memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); ++ memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); ++ ++ *pmarshalled_dataset=marshalled_dataset; ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::MarshallSize{{{1*/ ++int TriaP1ElementResult::MarshallSize(){ ++ ++ return sizeof(values) ++ +sizeof(enum_type) ++ +sizeof(time) ++ +sizeof(step) ++ +sizeof(int); //sizeof(int) for enum value ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::Demarshall{{{1*/ ++void TriaP1ElementResult::Demarshall(char** pmarshalled_dataset){ ++ ++ char* marshalled_dataset=NULL; ++ int i; ++ ++ /*recover marshalled_dataset: */ ++ marshalled_dataset=*pmarshalled_dataset; ++ ++ /*this time, no need to get enum type, the pointer directly points to the beginning of the ++ *object data (thanks to DataSet::Demarshall):*/ ++ memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); ++ memcpy(&values,marshalled_dataset,sizeof(values));marshalled_dataset+=sizeof(values); ++ memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); ++ memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); ++ ++ /*return: */ ++ *pmarshalled_dataset=marshalled_dataset; ++ return; ++} ++/*}}}*/ ++#endif ++/*FUNCTION TriaP1ElementResult::ObjectEnum{{{1*/ ++int TriaP1ElementResult::ObjectEnum(void){ ++ ++ return TriaP1ElementResultEnum; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::copy{{{1*/ ++Object* TriaP1ElementResult::copy() { ++ ++ return new TriaP1ElementResult(this->enum_type,this->values,this->step,this->time); ++ ++} ++/*}}}*/ ++ ++/*ElementResult management*/ ++/*FUNCTION TriaP1ElementResult::InstanceEnum{{{1*/ ++int TriaP1ElementResult::InstanceEnum(void){ ++ ++ return this->enum_type; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{1*/ ++ElementResult* TriaP1ElementResult::SpawnTriaElementResult(int* indices){ ++ ++ /*output*/ ++ TriaP1ElementResult* outresult=NULL; ++ ++ /*Create new Tria result (copy of current result)*/ ++ outresult=new TriaP1ElementResult(this->enum_type,&this->values[0],this->step,this->time); ++ ++ /*Assign output*/ ++ return outresult; ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::ProcessUnits{{{1*/ ++void TriaP1ElementResult::ProcessUnits(Parameters* parameters){ ++ ++ UnitConversion(this->values,3,IuToExtEnum,this->enum_type); ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{1*/ ++int TriaP1ElementResult::NumberOfNodalValues(void){ ++ return 3; ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::PatchFill{{{1*/ ++void TriaP1ElementResult::PatchFill(int row, Patch* patch){ ++ ++ /*Here, we fill the result information into the patch object. First, let's remember what is in a row ++ * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values ++ * Here, we will supply the enum_type, step, time, interpolation and nodal_values: */ ++ patch->fillresultinfo(row,this->enum_type,this->step,this->time,P1Enum,this->values,3); ++ ++} ++/*}}}*/ ++/*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{1*/ ++void TriaP1ElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){ ++ ++ double data[3]; ++ ++ if(numdofs!=3)_error_("Result %s is a TriaP1ElementResult and cannot write vector of %i dofs",numdofs); ++ for(int i=0;i<3;i++) data[i]=this->values[i]/(double)connectivitylist[i]; ++ VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES); ++ ++} /*}}}*/ ++/*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{1*/ ++void TriaP1ElementResult::GetElementVectorFromResults(Vec vector,int dof){ ++ ++ _error_("Result %s is a TriaP1ElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); ++} /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11292) +@@ -1984,7 +1984,7 @@ + resultsenums[i]=elementresult->InstanceEnum(); + resultstimes[i]=elementresult->GetTime(); + resultssteps[i]=elementresult->GetStep(); +- if(elementresult->ObjectEnum()==TriaVertexElementResultEnum){ ++ if(elementresult->ObjectEnum()==TriaP1ElementResultEnum){ + resultssizes[i]=P1Enum; + } + else{ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11292) +@@ -2156,7 +2156,7 @@ + resultsenums[i]=elementresult->InstanceEnum(); + resultstimes[i]=elementresult->GetTime(); + resultssteps[i]=elementresult->GetStep(); +- if(elementresult->ObjectEnum()==PentaVertexElementResultEnum){ ++ if(elementresult->ObjectEnum()==PentaP1ElementResultEnum){ + resultssizes[i]=P1Enum; + } + else{ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h (revision 11292) +@@ -96,8 +96,8 @@ + /*ElementResults: */ + #include "./ElementResults/ElementResult.h" + #include "./ElementResults/DoubleElementResult.h" +-#include "./ElementResults/TriaVertexElementResult.h" +-#include "./ElementResults/PentaVertexElementResult.h" ++#include "./ElementResults/TriaP1ElementResult.h" ++#include "./ElementResults/PentaP1ElementResult.h" + #include "./ElementResults/BoolElementResult.h" + + /*ExternalResults: */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 11292) +@@ -160,7 +160,7 @@ + /*FUNCTION TriaP1Input::SpawnResult{{{1*/ + ElementResult* TriaP1Input::SpawnResult(int step, double time){ + +- return new TriaVertexElementResult(this->enum_type,this->values,step,time); ++ return new TriaP1ElementResult(this->enum_type,this->values,step,time); + + } + /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 11292) +@@ -171,7 +171,7 @@ + /*FUNCTION PentaP1Input::SpawnResult{{{1*/ + ElementResult* PentaP1Input::SpawnResult(int step, double time){ + +- return new PentaVertexElementResult(this->enum_type,this->values,step,time); ++ return new PentaP1ElementResult(this->enum_type,this->values,step,time); + + } + /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 11291) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 11292) +@@ -1,10 +1,10 @@ + /*! \file PentaP1Input.h +- * \brief: header file for triavertexinput object ++ * \brief: header file for PentaP1Input object + */ + + +-#ifndef _PENTAVERTEXINPUT_H_ +-#define _PENTAVERTEXINPUT_H_ ++#ifndef _PENTAP1INPUT_H_ ++#define _PENTAP1INPUT_H_ + + /*Headers:*/ + /*{{{1*/ +@@ -86,4 +86,4 @@ + /*}}}*/ + + }; +-#endif /* _PENTAVERTEXINPUT_H */ ++#endif /* _PENTAP1INPUT_H */ Index: /issm/oecreview/Archive/11286-11300/ISSM-11292-11293.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11292-11293.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11292-11293.diff (revision 11515) @@ -0,0 +1,22 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11292) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11293) +@@ -63,14 +63,14 @@ + Reduceloadx(pf, Kfs, ys); MatFree(&Kfs); + Solverx(&uf, Kff, pf, old_uf, df, femmodel->parameters); + Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); ++ ++ convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); MatFree(&Kff);VecFree(&pf); VecFree(&df); ++ InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum); + InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); + + ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters); + _printf_(VerboseConvergence()," number of unstable constraints: %i\n",num_unstable_constraints); + +- convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); MatFree(&Kff);VecFree(&pf); VecFree(&df); +- InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum); +- + //rift convergence + if (!constraints_converged) { + if (converged){ Index: /issm/oecreview/Archive/11286-11300/ISSM-11293-11294.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11293-11294.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11293-11294.diff (revision 11515) @@ -0,0 +1,46 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 11293) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 11294) +@@ -73,8 +73,8 @@ + void InputUpdateFromVectorDakota(int* vector, int name, int type){_error_("Not implemented yet!");} + void InputUpdateFromVectorDakota(bool* vector, int name, int type){_error_("Not implemented yet!");} + void InputUpdateFromConstant(double constant, int name); +- void InputUpdateFromConstant(int constant, int name); +- void InputUpdateFromConstant(bool constant, int name){_error_("Not implemented yet!");} ++ void InputUpdateFromConstant(int constant, int name){_error_("Not implemented yet!");} ++ void InputUpdateFromConstant(bool constant, int name); + void InputUpdateFromSolution(double* solution){_error_("Not implemented yet!");} + void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; + /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 11293) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 11294) +@@ -365,14 +365,14 @@ + /*}}}*/ + + /*Update virtual functions definitions:*/ +-/*FUNCTION Riftfront::InputUpdateFromConstant(int constant,int name) {{{1*/ +-void Riftfront::InputUpdateFromConstant(int constant,int name){ ++/*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{1*/ ++void Riftfront::InputUpdateFromConstant(bool constant,int name){ + + /*Check that name is a Riftfront input*/ + if (!IsInput(name)) return; + + /*update input*/ +- this->inputs->AddInput(new IntInput(name,constant)); ++ this->inputs->AddInput(new BoolInput(name,constant)); + + } + /*}}}*/ +@@ -387,7 +387,7 @@ + + } + /*}}}*/ +-/*FUNCTION Riftfront::InputUpdateFromConstant(double constant,int name) {{{1*/ ++/*FUNCTION Riftfront::InputUpdateFromConstant(double* constant,int name) {{{1*/ + void Riftfront::InputUpdateFromVector(double* vector, int name, int type){ + + /*Check that name is a Riftfront input*/ Index: /issm/oecreview/Archive/11286-11300/ISSM-11294-11295.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11294-11295.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11294-11295.diff (revision 11515) @@ -0,0 +1,849 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install.sh (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install.sh (revision 11295) +@@ -4,4 +4,4 @@ + rm -rf install + + #symlink to flaim directory +-ln -s /proj/ice/larour/flaim/trunk/ ./install ++ln -s /home/jschierm/flaim/svn/trunk ./install +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install (revision 11295) +@@ -1 +1 @@ +-link /proj/ice/larour/flaim/trunk/ +\ No newline at end of file ++link /home/jschierm/flaim/svn/trunk +\ No newline at end of file +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h (revision 11295) +@@ -52,7 +52,7 @@ + #include "./InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h" + #include "./InputArtificialNoisex/InputArtificialNoisex.h" + #include "./IoModelToConstraintsx/IoModelToConstraintsx.h" +-#include "./KMLMeshWritex/KMLFileReadx.h" ++#include "./KMLFileReadx/KMLFileReadx.h" + #include "./KMLMeshWritex/KMLMeshWritex.h" + #include "./KMLOverlayx/KMLOverlayx.h" + #include "./Xy2llx/Xy2llx.h" +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 11295) +@@ -0,0 +1,67 @@ ++/*!\file KMLFileReadx.cpp ++ */ ++ ++#include "./KMLFileReadx.h" ++#include "../../shared/shared.h" ++#include "../../include/include.h" ++#include "../../io/io.h" ++#include "../../toolkits/toolkits.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++ ++KML_Object* KMLFileReadx(FILE* fid){ ++ ++ char* kstr; ++ KML_File* kxml=NULL; ++ KML_File* kdtd=NULL; ++ KML_File* kfil=NULL; ++ ++ clock_t clock0,clock1; ++ time_t time0, time1; ++ ++ clock0=clock(); ++ time0 =time(NULL); ++ _printf_(true,"\nKMLFileReadx Module -- %s",ctime(&time0)); ++ ++/* read kml file */ ++ ++ while (kstr=KMLFileToken(fid, ++ NULL,NULL)) { ++ if (!strncmp(kstr,"Read(fid,kstr); ++// kfil->DeepEcho(); ++ } ++ ++// _printf_(true,"%s\n",kstr); ++ xfree((void**)&kstr); ++ } ++ ++ if (kxml) { ++ _printf_(true,"XML declaration:\n"); ++ kxml->DeepEcho(" "); ++ delete kxml; ++ } ++ if (kdtd) { ++ _printf_(true,"DTD declaration (not yet implemented):\n"); ++ kdtd->DeepEcho(" "); ++ delete kdtd; ++ } ++ ++ clock1=clock(); ++ time1 =time(NULL); ++ _printf_(true,"KMLFileReadx Module -- %f CPU seconds; %f elapsed seconds.\n\n", ++ ((double)(clock1-clock0))/CLOCKS_PER_SEC,difftime(time1,time0)); ++ ++ return(kfil); ++} ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.h (revision 11295) +@@ -0,0 +1,15 @@ ++/*!\file: KMLFileReadx.h ++ * \brief header file for kml mesh writer routines. ++ */ ++ ++#ifndef _KMLFILEREADX_H ++#define _KMLFILEREADX_H ++ ++#include /* DBL_MAX */ ++#include "../../Container/Container.h" ++#include "../../objects/objects.h" ++ ++/* local prototypes: */ ++KML_Object* KMLFileReadx(FILE* fid); ++ ++#endif /* _KMLFILEREADX_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp (revision 11295) +@@ -1,67 +0,0 @@ +-/*!\file KMLFileReadx.cpp +- */ +- +-#include "./KMLFileReadx.h" +-#include "../../shared/shared.h" +-#include "../../include/include.h" +-#include "../../io/io.h" +-#include "../../toolkits/toolkits.h" +-#include "../../EnumDefinitions/EnumDefinitions.h" +- +-KML_Object* KMLFileReadx(FILE* fid){ +- +- char* kstr; +- KML_File* kxml=NULL; +- KML_File* kdtd=NULL; +- KML_File* kfil=NULL; +- +- clock_t clock0,clock1; +- time_t time0, time1; +- +- clock0=clock(); +- time0 =time(NULL); +- _printf_(true,"\nKMLFileReadx Module -- %s",ctime(&time0)); +- +-/* read kml file */ +- +- while (kstr=KMLFileToken(fid, +- NULL,NULL)) { +- if (!strncmp(kstr,"Read(fid,kstr); +-// kfil->DeepEcho(); +- } +- +-// _printf_(true,"%s\n",kstr); +- xfree((void**)&kstr); +- } +- +- if (kxml) { +- _printf_(true,"XML declaration:\n"); +- kxml->DeepEcho(" "); +- delete kxml; +- } +- if (kdtd) { +- _printf_(true,"DTD declaration (not yet implemented):\n"); +- kdtd->DeepEcho(" "); +- delete kdtd; +- } +- +- clock1=clock(); +- time1 =time(NULL); +- _printf_(true,"KMLFileReadx Module -- %f CPU seconds; %f elapsed seconds.\n\n", +- ((double)(clock1-clock0))/CLOCKS_PER_SEC,difftime(time1,time0)); +- +- return(kfil); +-} +- +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.h (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.h (revision 11295) +@@ -1,15 +0,0 @@ +-/*!\file: KMLFileReadx.h +- * \brief header file for kml mesh writer routines. +- */ +- +-#ifndef _KMLFILEREADX_H +-#define _KMLFILEREADX_H +- +-#include /* DBL_MAX */ +-#include "../../Container/Container.h" +-#include "../../objects/objects.h" +- +-/* local prototypes: */ +-KML_Object* KMLFileReadx(FILE* fid); +- +-#endif /* _KMLFILEREADX_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11295) +@@ -642,10 +642,10 @@ + ./modules/Kml2Expx/Kml2Expx.cpp\ + ./modules/Shp2Kmlx/Shp2Kmlx.h\ + ./modules/Shp2Kmlx/Shp2Kmlx.cpp\ ++ ./modules/KMLFileReadx/KMLFileReadx.h\ ++ ./modules/KMLFileReadx/KMLFileReadx.cpp\ + ./modules/KMLMeshWritex/KMLMeshWritex.h\ + ./modules/KMLMeshWritex/KMLMeshWritex.cpp\ +- ./modules/KMLMeshWritex/KMLFileReadx.h\ +- ./modules/KMLMeshWritex/KMLFileReadx.cpp\ + ./modules/KMLOverlayx/KMLOverlayx.h\ + ./modules/KMLOverlayx/KMLOverlayx.cpp\ + ./objects/KML/KML_Attribute.cpp\ +@@ -698,6 +698,8 @@ + ./objects/KML/KML_StyleSelector.h\ + ./objects/KML/KML_SubStyle.cpp\ + ./objects/KML/KML_SubStyle.h\ ++ ./objects/KML/KML_Unknown.cpp\ ++ ./objects/KML/KML_Unknown.h\ + ./objects/KML/KMLFileReadUtils.cpp\ + ./objects/KML/KMLFileReadUtils.h + #}}} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 11295) +@@ -0,0 +1,141 @@ ++/*!\file KML_Unknown.cpp ++ * \brief: implementation of the kml_unknown object ++ */ ++ ++/*Headers:*/ ++/*{{{1*/ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++ ++#include ++#include ++#include "../objects.h" ++#include "../../shared/shared.h" ++#include "../../io/io.h" ++#include "../../Container/Container.h" ++#include "../../include/include.h" ++/*}}}*/ ++ ++/*Constructors/destructor/copy*/ ++/*FUNCTION KML_Unknown::KML_Unknown(){{{1*/ ++KML_Unknown::KML_Unknown(){ ++ ++ name =NULL; ++ value =NULL; ++ ++} ++/*}}}*/ ++/*FUNCTION KML_Unknown::~KML_Unknown(){{{1*/ ++KML_Unknown::~KML_Unknown(){ ++ ++ if (name ) xfree((void**)&name); ++ if (value ) xfree((void**)&value); ++ ++} ++/*}}}*/ ++ ++/*Other*/ ++/*FUNCTION KML_Unknown::Echo {{{1*/ ++void KML_Unknown::Echo(){ ++ ++ bool flag=true; ++ ++ _printf_(flag,"KML_Unknown_%s:\n",name); ++ KML_Object::Echo(); ++ ++ if (value ) ++ _printf_(flag," value: \"%s\"\n" ,value); ++ ++ return; ++} ++/*}}}*/ ++/*FUNCTION KML_Unknown::DeepEcho {{{1*/ ++void KML_Unknown::DeepEcho(){ ++ ++ char indent[81]=""; ++ ++ KML_Unknown::DeepEcho(indent); ++ ++ return; ++} ++/*}}}*/ ++/*FUNCTION KML_Unknown::DeepEcho {{{1*/ ++void KML_Unknown::DeepEcho(const char* indent){ ++ ++ bool flag=true; ++ ++ _printf_(flag,"%sKML_Unknown_%s:\n",indent,name); ++ KML_Object::DeepEcho(indent); ++ ++ if (value ) ++ _printf_(flag,"%s value: \"%s\"\n" ,indent,value); ++ ++ return; ++} ++/*}}}*/ ++/*FUNCTION KML_Unknown::Write {{{1*/ ++void KML_Unknown::Write(FILE* filout,const char* indent){ ++ ++ fprintf(filout,"%s<%s",indent,name); ++ WriteAttrib(filout," "); ++ fprintf(filout,">\n"); ++ WriteCommnt(filout,indent); ++ ++ KML_Object::Write(filout,indent); ++ ++ if (value ) ++ fprintf(filout,"%s %s\n",indent,value); ++ ++ fprintf(filout,"%s\n",indent,name); ++ ++ return; ++} ++/*}}}*/ ++/*FUNCTION KML_Unknown::Read {{{1*/ ++void KML_Unknown::Read(FILE* fid,char* kstr){ ++ ++ char* kstri; ++ int ncom=0; ++ char** pcom=NULL; ++ ++/* get object attributes and check for solo tag */ ++ ++ if (KMLFileTagAttrib(this, ++ kstr)) ++ return; ++ ++/* loop over and process fields within opening and closing tags */ ++ ++ while (kstri=KMLFileToken(fid, ++ &ncom,&pcom)) { ++ if (!strncmp(&kstri[0],"AddCommnt(ncom,pcom); ++ ++ for (ncom; ncom>0; ncom--) ++ xfree((void**)&(pcom[ncom-1])); ++ xfree((void**)&pcom); ++ ++ return; ++} ++/*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.h (revision 11295) +@@ -0,0 +1,45 @@ ++/*! \file KML_Unknown.h ++ * \brief: header file for kml_unknown object ++ */ ++ ++#ifndef _KML_UNKNOWN_H_ ++#define _KML_UNKNOWN_H_ ++ ++/*Headers:*/ ++/*{{{1*/ ++#include "../../include/include.h" ++#include "../../shared/Exceptions/exceptions.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++ ++#include "./KML_Object.h" ++/*}}}*/ ++ ++class KML_Unknown: public KML_Object { ++ ++ public: ++ ++ char* name; ++ char* value; ++ ++ /*KML_Unknown constructors, destructors {{{1*/ ++ KML_Unknown(); ++ ~KML_Unknown(); ++ /*}}}*/ ++ /*Object virtual functions definitions:{{{1*/ ++ void Echo(); ++ void DeepEcho(); ++ void DeepEcho(const char* indent); ++ void Write(FILE* fid,const char* indent); ++ void Read(FILE* fid,char* kstr); ++ int Id(){_error_("Not implemented yet.");}; ++ int MyRank(){_error_("Not implemented yet.");}; ++ void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; ++ int MarshallSize(){_error_("Not implemented yet.");}; ++ void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; ++ int ObjectEnum(){_error_("Not implemented yet.");}; ++ Object* copy(){_error_("Not implemented yet.");}; ++ /*}}}*/ ++ ++}; ++#endif /* _KML_UNKNOWN_H */ ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/objects.h (revision 11295) +@@ -71,6 +71,7 @@ + #include "./KML/KML_Style.h" + #include "./KML/KML_StyleSelector.h" + #include "./KML/KML_SubStyle.h" ++#include "./KML/KML_Unknown.h" + #include "./KML/KMLFileReadUtils.h" + + /*Option parsing objects: */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp (revision 11295) +@@ -0,0 +1,151 @@ ++/*\file KMLFileRead.c ++ *\brief: KML file reader module. ++ */ ++#include "./KMLFileRead.h" ++ ++void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ ++ ++ int i,j,nnodes=0,verbose=1; ++ KML_Object* kobj; ++ ++ /*input: */ ++ char* name=NULL; ++ ++ char* notes=NULL; ++ const mxArray* notesi; ++ mwIndex nindex; ++ ++ int* elem=NULL; ++ int melem=0,nelem=0; ++ ++ int* nodecon=NULL; ++ int mncon=0,nncon=0; ++ ++ double* lat=NULL; ++ int mlat=0,nlat=0,llat=0; ++ ++ double* lng=NULL; ++ int mlng=0,nlng=0,llng=0; ++ ++ int nparts=0; ++ ++ int* part=NULL; ++ int mprt=0,nprt=0,lprt=0; ++ ++ double* data=NULL; ++ int mdata=0,ndata=0; ++ ++ double* cmap=NULL; ++ int mcmap=0,ncmap=0; ++ ++ char* filnam=NULL; ++ ++ FILE* fidi=NULL; ++ FILE* fido=NULL; ++ ++ Options* options=NULL; ++ char* echo =NULL; ++ char* deepecho=NULL; ++ char* write =NULL; ++ ++ /* output: */ ++ int ierror=0; ++ ++ /*Boot module: */ ++ MODULEBOOT(); ++ ++ /*checks on arguments on the matlab side: */ ++ if (nlhs > NLHS) { ++ KMLFileReadUsage(); ++ _error_("KMLFileRead usage error"); ++ } ++ if (nrhs < NRHS) { ++ KMLFileReadUsage(); ++ _error_("KMLFileRead usage error"); ++ } ++ ++ /*Input datasets: */ ++ if (verbose) printf("Fetching inputs:\n"); ++ FetchMatlabData(&filnam,FILENAME); ++ if (verbose) printf(" filnam =\"%s\"\n",filnam); ++ ++ if (verbose) printf("Parsing options:\n"); ++ options=new Options(NRHS,nrhs,prhs); ++ if (options->Size()) for(i=0;iSize();i++) ((Option*)options->GetObjectByOffset(i))->DeepEcho(); ++ options->Get(&echo ,"echo" ,"off"); ++ options->Get(&deepecho,"deepecho","off"); ++ options->Get(&write ,"write" ,"off"); ++ ++ /*some checks*/ ++ if (verbose) printf("Checking inputs:\n"); ++ ++ if (!strlen(filnam)) ++ strcpy(filnam,"stdout"); ++ ++ if (verbose) printf("Opening file \"%s\".\n",filnam); ++ fidi=fopen(filnam,"r"); ++ ++ /* Run core computations: */ ++ if (verbose) printf("Calling core:\n"); ++ kobj=KMLFileReadx(fidi); ++ ++ if (verbose) printf("Closing file \"%s\".\n",filnam); ++ fclose(fidi); ++ ++ if (kobj) { ++ if (!strncmp(echo ,"on",2) || !strncmp(echo ,"y",1)) ++ kobj->Echo(); ++ if (!strncmp(deepecho,"on",2) || !strncmp(deepecho,"y",1)) ++ kobj->DeepEcho(); ++ if (strncmp(write,"off",3) && strncmp(write,"no",2)) { ++ if (!strncmp(write,"on",2) || !strncmp(write,"yes",3) || !strncmp(write,"stdout",6)) { ++ kobj->Write(stdout,""); ++ } ++ else { ++ if (verbose) printf("Opening file \"%s\".\n",write); ++ fido=fopen(write,"w"); ++ kobj->Write(fido,""); ++ if (verbose) printf("Closing file \"%s\".\n",write); ++ ierror=fclose(fido); ++ } ++ } ++ ++ delete kobj; ++ } ++ ++ /*Write data: */ ++ WriteMatlabData(ERRORFLAG,ierror); ++ ++ /*Clean-up*/ ++ xfree((void**)&write); ++ xfree((void**)&deepecho); ++ xfree((void**)&echo); ++ delete options; ++ ++ /*end module: */ ++ MODULEEND(); ++} ++ ++void KMLFileReadUsage(void) ++{ ++ _printf_(true,"KMLFileRead - KML file reader module:\n"); ++ _printf_(true,"\n"); ++ _printf_(true," This module reads a KML file.\n"); ++ _printf_(true,"\n"); ++ _printf_(true," Usage:\n"); ++ _printf_(true," [ierror]=KMLFileRead(kmlfile,'param name',param,...);\n"); ++ _printf_(true,"\n"); ++ _printf_(true," kmlfile file name of kml file to be read (char)\n"); ++ _printf_(true,"\n"); ++ _printf_(true," echo echo command (char, optional, 'off'/'on')\n"); ++ _printf_(true," deepecho deep echo command (char, optional, 'off'/'on')\n"); ++ _printf_(true," write write command (char, optional, 'off'/'stdout'/kmlfile)\n"); ++ _printf_(true,"\n"); ++ _printf_(true," ierror return code (non-zero for error)\n"); ++ _printf_(true,"\n"); ++ _printf_(true," Examples:\n"); ++ _printf_(true," [ierror]=KMLFileRead('file.kml','deepecho','on');\n"); ++ _printf_(true," [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');\n"); ++ _printf_(true,"\n"); ++} ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h (revision 11295) +@@ -0,0 +1,31 @@ ++/*!\file KMLFileRead.h ++ * \brief: prototype for KML file reader mex module. ++ */ ++ ++#ifndef _KMLFILEREAD_H ++#define _KMLFILEREAD_H ++ ++/* local prototypes: */ ++void KMLFileReadUsage(void); ++ ++#include "../../c/modules/modules.h" ++#include "../../c/Container/Container.h" ++#include "../../c/shared/shared.h" ++ ++#undef __FUNCT__ ++#define __FUNCT__ "KMLFileRead" ++ ++ ++/* serial input macros: */ ++#define FILENAME prhs[0] ++ ++/* serial output macros: */ ++#define ERRORFLAG (mxArray**)&plhs[0] ++ ++/* serial arg counts: */ ++#undef NRHS ++#define NRHS 1 ++#undef NLHS ++#define NLHS 1 ++ ++#endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11295) +@@ -233,8 +233,8 @@ + InterpFromMesh2d_SOURCES = InterpFromMesh2d/InterpFromMesh2d.cpp\ + InterpFromMesh2d/InterpFromMesh2d.h + +-KMLFileRead_SOURCES = KMLMeshWrite/KMLFileRead.cpp\ +- KMLMeshWrite/KMLFileRead.h ++KMLFileRead_SOURCES = KMLFileRead/KMLFileRead.cpp\ ++ KMLFileRead/KMLFileRead.h + + KMLMeshWrite_SOURCES = KMLMeshWrite/KMLMeshWrite.cpp\ + KMLMeshWrite/KMLMeshWrite.h +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.cpp (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.cpp (revision 11295) +@@ -1,151 +0,0 @@ +-/*\file KMLFileRead.c +- *\brief: KML file reader module. +- */ +-#include "./KMLFileRead.h" +- +-void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ +- +- int i,j,nnodes=0,verbose=1; +- KML_Object* kobj; +- +- /*input: */ +- char* name=NULL; +- +- char* notes=NULL; +- const mxArray* notesi; +- mwIndex nindex; +- +- int* elem=NULL; +- int melem=0,nelem=0; +- +- int* nodecon=NULL; +- int mncon=0,nncon=0; +- +- double* lat=NULL; +- int mlat=0,nlat=0,llat=0; +- +- double* lng=NULL; +- int mlng=0,nlng=0,llng=0; +- +- int nparts=0; +- +- int* part=NULL; +- int mprt=0,nprt=0,lprt=0; +- +- double* data=NULL; +- int mdata=0,ndata=0; +- +- double* cmap=NULL; +- int mcmap=0,ncmap=0; +- +- char* filnam=NULL; +- +- FILE* fidi=NULL; +- FILE* fido=NULL; +- +- Options* options=NULL; +- char* echo =NULL; +- char* deepecho=NULL; +- char* write =NULL; +- +- /* output: */ +- int ierror=0; +- +- /*Boot module: */ +- MODULEBOOT(); +- +- /*checks on arguments on the matlab side: */ +- if (nlhs > NLHS) { +- KMLFileReadUsage(); +- _error_("KMLFileRead usage error"); +- } +- if (nrhs < NRHS) { +- KMLFileReadUsage(); +- _error_("KMLFileRead usage error"); +- } +- +- /*Input datasets: */ +- if (verbose) printf("Fetching inputs:\n"); +- FetchMatlabData(&filnam,FILENAME); +- if (verbose) printf(" filnam =\"%s\"\n",filnam); +- +- if (verbose) printf("Parsing options:\n"); +- options=new Options(NRHS,nrhs,prhs); +- if (options->Size()) for(i=0;iSize();i++) ((Option*)options->GetObjectByOffset(i))->DeepEcho(); +- options->Get(&echo ,"echo" ,"off"); +- options->Get(&deepecho,"deepecho","off"); +- options->Get(&write ,"write" ,"off"); +- +- /*some checks*/ +- if (verbose) printf("Checking inputs:\n"); +- +- if (!strlen(filnam)) +- strcpy(filnam,"stdout"); +- +- if (verbose) printf("Opening file \"%s\".\n",filnam); +- fidi=fopen(filnam,"r"); +- +- /* Run core computations: */ +- if (verbose) printf("Calling core:\n"); +- kobj=KMLFileReadx(fidi); +- +- if (verbose) printf("Closing file \"%s\".\n",filnam); +- fclose(fidi); +- +- if (kobj) { +- if (!strncmp(echo ,"on",2) || !strncmp(echo ,"y",1)) +- kobj->Echo(); +- if (!strncmp(deepecho,"on",2) || !strncmp(deepecho,"y",1)) +- kobj->DeepEcho(); +- if (strncmp(write,"off",3) && strncmp(write,"no",2)) { +- if (!strncmp(write,"on",2) || !strncmp(write,"yes",3) || !strncmp(write,"stdout",6)) { +- kobj->Write(stdout,""); +- } +- else { +- if (verbose) printf("Opening file \"%s\".\n",write); +- fido=fopen(write,"w"); +- kobj->Write(fido,""); +- if (verbose) printf("Closing file \"%s\".\n",write); +- ierror=fclose(fido); +- } +- } +- +- delete kobj; +- } +- +- /*Write data: */ +- WriteMatlabData(ERRORFLAG,ierror); +- +- /*Clean-up*/ +- xfree((void**)&write); +- xfree((void**)&deepecho); +- xfree((void**)&echo); +- delete options; +- +- /*end module: */ +- MODULEEND(); +-} +- +-void KMLFileReadUsage(void) +-{ +- _printf_(true,"KMLFileRead - KML file reader module:\n"); +- _printf_(true,"\n"); +- _printf_(true," This module reads a KML file.\n"); +- _printf_(true,"\n"); +- _printf_(true," Usage:\n"); +- _printf_(true," [ierror]=KMLFileRead(kmlfile,'param name',param,...);\n"); +- _printf_(true,"\n"); +- _printf_(true," kmlfile file name of kml file to be read (char)\n"); +- _printf_(true,"\n"); +- _printf_(true," echo echo command (char, optional, 'off'/'on')\n"); +- _printf_(true," deepecho deep echo command (char, optional, 'off'/'on')\n"); +- _printf_(true," write write command (char, optional, 'off'/'stdout'/kmlfile)\n"); +- _printf_(true,"\n"); +- _printf_(true," ierror return code (non-zero for error)\n"); +- _printf_(true,"\n"); +- _printf_(true," Examples:\n"); +- _printf_(true," [ierror]=KMLFileRead('file.kml','deepecho','on');\n"); +- _printf_(true," [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');\n"); +- _printf_(true,"\n"); +-} +- +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.h (revision 11294) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.h (revision 11295) +@@ -1,31 +0,0 @@ +-/*!\file KMLFileRead.h +- * \brief: prototype for KML file reader mex module. +- */ +- +-#ifndef _KMLFILEREAD_H +-#define _KMLFILEREAD_H +- +-/* local prototypes: */ +-void KMLFileReadUsage(void); +- +-#include "../../c/modules/modules.h" +-#include "../../c/Container/Container.h" +-#include "../../c/shared/shared.h" +- +-#undef __FUNCT__ +-#define __FUNCT__ "KMLFileRead" +- +- +-/* serial input macros: */ +-#define FILENAME prhs[0] +- +-/* serial output macros: */ +-#define ERRORFLAG (mxArray**)&plhs[0] +- +-/* serial arg counts: */ +-#undef NRHS +-#define NRHS 1 +-#undef NLHS +-#define NLHS 1 +- +-#endif Index: /issm/oecreview/Archive/11286-11300/ISSM-11295-11296.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11295-11296.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11295-11296.diff (revision 11515) @@ -0,0 +1,7 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install (revision 11295) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/flaim/install (revision 11296) +@@ -1 +0,0 @@ +-link /home/jschierm/flaim/svn/trunk +\ No newline at end of file Index: /issm/oecreview/Archive/11286-11300/ISSM-11296-11297.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11296-11297.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11296-11297.diff (revision 11515) @@ -0,0 +1,114 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11296) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11297) +@@ -24,56 +24,51 @@ + void controltao_core(FemModel* femmodel){ + + /*TAO*/ +- int i,n,info; +- TaoSolver tao; +- Vec initial_solution = NULL; ++ int ierr,numberofvertices; + AppCtx user; ++ TaoSolver tao; ++ Vec X = NULL; ++ Vec XL = NULL; ++ Vec XU = NULL; + + /*Initialize TAO*/ +- int argc; char **args; PetscGetArgs(&argc,&args); +- int ierr=TaoInitialize(&argc,&args,(char*)0,""); ++ int argc; char **args=NULL; ++ PetscGetArgs(&argc,&args); ++ ierr = TaoInitialize(&argc,&args,(char*)0,""); + if(ierr) _error_("Could not initialize Tao"); + +- info = PetscOptionsSetValue("-tao_monitor",""); if(info) _error_("STOP"); ++ /*Initialize TAO*/ ++ TaoCreate(PETSC_COMM_WORLD,&tao); ++ PetscOptionsSetValue("-tao_monitor",""); ++ TaoSetFromOptions(tao); ++ TaoSetType(tao,"tao_blmvm"); + +- /*Initialize argument*/ +- user.femmodel=femmodel; ++ /*Prepare all TAO parameters*/ ++ TaoSetMaximumFunctionEvaluations(tao,50); ++ TaoSetMaximumIterations(tao,10); ++ TaoSetTolerances(tao,10e-28,0.0000,0.0000,0.0000,10e-28); + +- /*Set up and solve TAO*/ +- info = TaoCreate(PETSC_COMM_WORLD,&tao); if(info) _error_("STOP"); +- info = TaoSetType(tao,"tao_blmvm"); if(info) _error_("STOP"); +- //info = TaoSetType(tao,"tao_cg"); if(info) _error_("STOP"); +- TaoSetMaximumFunctionEvaluations(tao,10); +- TaoSetMaximumIterations(tao,3); +- +- int size=femmodel->vertices->NumberOfVertices(); +- Vec XL=NULL; +- Vec XU=NULL; +- VecCreate(PETSC_COMM_WORLD,&XL); VecCreate(PETSC_COMM_WORLD,&XU); +- VecSetSizes(XL,PetscDetermineLocalSize(size),PETSC_DECIDE); VecSetSizes(XU,PetscDetermineLocalSize(size),PETSC_DECIDE); +- VecSetFromOptions(XL); VecSetFromOptions(XU); +- VecSet(XL,1); VecSet(XU,200.); ++ numberofvertices = femmodel->vertices->NumberOfVertices(); ++ XL=NewVec(numberofvertices); VecSet(XL,1.); ++ XU=NewVec(numberofvertices); VecSet(XU,200.); + TaoSetVariableBounds(tao,XL,XU); VecFree(&XL); VecFree(&XU); + +- GetVectorFromInputsx(&initial_solution,femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,FrictionCoefficientEnum,VertexEnum); +- info = TaoSetInitialVector(tao,initial_solution); if(info) _error_("STOP"); +- VecFree(&initial_solution); ++ GetVectorFromInputsx(&X,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,FrictionCoefficientEnum,VertexEnum); ++ TaoSetInitialVector(tao,X); + +- info = TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); if(info) _error_("STOP"); +- info = TaoSetFromOptions(tao); if(info) _error_("STOP"); +- /* http://www.mcs.anl.gov/research/projects/tao/docs/manpages/taosolver/TaoSetTolerances.html*/ +- /* fatol ,frtol ,gatol ,grtol ,gttol*/ +- info = TaoSetTolerances(tao,10e-28,0.0000,0.0000,0.0000,10e-28); if(info) _error_("STOP"); +- info = TaoSolve(tao); if(info) _error_("STOP"); ++ user.femmodel=femmodel; ++ TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); + +- /*Get solution status*/ +- info = TaoView(tao,PETSC_VIEWER_STDOUT_WORLD); if(info) _error_("STOP"); +- +- /*Clean up*/ +- info = TaoDestroy(&tao); if(info) _error_("STOP"); ++ /*Solver optimization problem*/ ++ TaoSolve(tao); ++ TaoView(tao,PETSC_VIEWER_STDOUT_WORLD); ++ TaoGetSolutionVector(tao,&X); ++ InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,FrictionCoefficientEnum,VertexEnum); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,FrictionCoefficientEnum); + +- /* Finalize TAO */ ++ /*Clean up and return*/ ++ VecFree(&X); ++ TaoDestroy(&tao); + TaoFinalize(); + } + int FormFunctionGradient(TaoSolver tao, Vec X, double *fcn,Vec G,void *userCtx){ +@@ -85,16 +80,15 @@ + + int costfunction=SurfaceAbsVelMisfitEnum; + femmodel->parameters->SetParam(&costfunction,1,1,StepResponsesEnum); +- //InputUpdateFromVectorx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); ++ //InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); + InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,FrictionCoefficientEnum,VertexEnum); + adjointdiagnostic_core(user->femmodel); +- //Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, MaterialsRheologyBbarEnum); +- Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,FrictionCoefficientEnum); ++ //Gradjx(&gradient,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaterialsRheologyBbarEnum); ++ Gradjx(&gradient,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,FrictionCoefficientEnum); + VecScale(gradient,-1.); + VecCopy(gradient,G); + VecFree(&gradient); +- CostFunctionx(fcn, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); +- _printf_(true,"f(x)=%g\n",*fcn); ++ CostFunctionx(fcn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + return 0; + } + Index: /issm/oecreview/Archive/11286-11300/ISSM-11297-11298.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11297-11298.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11297-11298.diff (revision 11515) @@ -0,0 +1,192 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/Nodes.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/Nodes.cpp (revision 11297) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/Nodes.cpp (revision 11298) +@@ -59,7 +59,6 @@ + extern int my_rank; + + int i; +- + int dofcount=0; + int maxdofspernode=0; + int* alldofcount=NULL; +@@ -68,9 +67,9 @@ + int numnodes=0; + + /*some check: */ +- if ((setenum!=GsetEnum) && (setenum!=FsetEnum) && (setenum!=SsetEnum))_error_("%s%s%s"," dof distribution for set of enum type ",EnumToStringx(setenum)," not supported yet!"); ++ _assert_(setenum==GsetEnum || setenum==FsetEnum || setenum==SsetEnum); + +- /*Go through objects, and distribute dofs locally, from 0 to numberofdofs: */ ++ /*Go through objects, and distribute dofs locally, from 0 to numberofdofsperobject*/ + for (i=0;iSize();i++){ + Node* node=(Node*)this->GetObjectByOffset(i); + +@@ -80,64 +79,52 @@ + } + } + +- /*Ok, now every object has distributed dofs, but locally, and with a dof count starting from +- *0. This means the dofs between all the cpus are not synchronized! We need to synchronize all +- *dof on all cpus, and use those to update the dofs of every object: */ +- ++ /* Now every object has distributed dofs, but locally, and with a dof count starting from ++ * 0. This means the dofs between all the cpus are not unique. We now offset the dofs of eache ++ * cpus by the total last dofs of the previus cpu, starting from 0. ++ * First: bet number of dofs for each cpu*/ + alldofcount=(int*)xmalloc(num_procs*sizeof(int)); + MPI_Gather(&dofcount,1,MPI_INT,alldofcount,1,MPI_INT,0,MPI_COMM_WORLD); + MPI_Bcast(alldofcount,num_procs,MPI_INT,0,MPI_COMM_WORLD); + +- /*Ok, now every cpu should start its own dof count at the end of the dofcount +- * from cpu-1. : */ ++ /* Every cpu should start its own dof count at the end of the dofcount from cpu-1*/ + dofcount=0; +- if(my_rank==0){ +- dofcount=0; +- } +- else{ ++ if(my_rank!=0){ + for(i=0;iSize();i++){ +- + /*Check that this node corresponds to our analysis currently being carried out: */ + Node* node=(Node*)this->GetObjectByOffset(i); + if (node->InAnalysis(analysis_type)){ + node->OffsetDofs(dofcount,setenum); + } +- + } + +- /*Finally, remember that cpus may have skipped some objects, because they were clones. For every ++ /* Finally, remember that cpus may have skipped some objects, because they were clones. For every + * object that is not a clone, tell them to show their dofs, so that later on, they can get picked + * up by their clones: */ + maxdofspernode=this->MaxNumDofs(analysis_type,setenum); + numnodes=this->NumberOfNodes(analysis_type); +- +- if (numnodes*maxdofspernode){ +- truedofs=(int*)xcalloc(numnodes*maxdofspernode,sizeof(int)); //initialize to 0, so that we can pick up the max ++ if(numnodes*maxdofspernode){ ++ truedofs= (int*)xcalloc(numnodes*maxdofspernode,sizeof(int)); //initialize to 0, so that we can pick up the max + alltruedofs=(int*)xcalloc(numnodes*maxdofspernode,sizeof(int)); + } + + for (i=0;iSize();i++){ +- /*Check that this node corresponds to our analysis currently being carried out: */ + Node* node=(Node*)this->GetObjectByOffset(i); + if (node->InAnalysis(analysis_type)){ + node->ShowTrueDofs(truedofs,maxdofspernode,setenum);//give maxdofspernode, column size, so that nodes can index into truedofs + } + } +- + MPI_Allreduce ( (void*)truedofs,(void*)alltruedofs,numnodes*maxdofspernode,MPI_INT,MPI_MAX,MPI_COMM_WORLD); + +- /*Ok, now every cpu knows the true dofs of everyone else that is not a clone. Let the clones recover those true dofs: */ ++ /* Now every cpu knows the true dofs of everyone else that is not a clone*/ + for (i=0;iSize();i++){ +- /*Check that this node corresponds to our analysis currently being carried out: */ + Node* node=(Node*)this->GetObjectByOffset(i); + if (node->InAnalysis(analysis_type)){ +- node->UpdateCloneDofs(alltruedofs,maxdofspernode,setenum); //give maxdofspernode, column size, so that nodes can index into alltruedofs ++ node->UpdateCloneDofs(alltruedofs,maxdofspernode,setenum); + } + } + +@@ -145,8 +132,6 @@ + xfree((void**)&alldofcount); + xfree((void**)&truedofs); + xfree((void**)&alltruedofs); +- +- + } + /*}}}*/ + /*FUNCTION Nodes::FlagClones{{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/Vertices.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/Vertices.cpp (revision 11297) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Container/Vertices.cpp (revision 11298) +@@ -44,59 +44,49 @@ + extern int my_rank; + + int i; +- + int dofcount=0; + int* alldofcount=NULL; + int* truedofs=NULL; + int* alltruedofs=NULL; + +- /*Go through objects, and distribute dofs locally, from 0 to numberofdofsperobject: */ ++ /*Go through objects, and distribute dofs locally, from 0 to numberofdofsperobject*/ + for (i=0;iSize();i++){ + Vertex* vertex=(Vertex*)this->GetObjectByOffset(i); + vertex->DistributeDofs(&dofcount); + } + +- /*Ok, now every object has distributed dofs, but locally, and with a dof count starting from +- *0. This means the dofs between all the cpus are not synchronized! We need to synchronize all +- *dof on all cpus, and use those to update the dofs of every object: */ +- ++ /* Now every object has distributed dofs, but locally, and with a dof count starting from ++ * 0. This means the dofs between all the cpus are not unique. We now offset the dofs of eache ++ * cpus by the total last dofs of the previus cpu, starting from 0. ++ * First: bet number of dofs for each cpu*/ + alldofcount=(int*)xmalloc(num_procs*sizeof(int)); + MPI_Gather(&dofcount,1,MPI_INT,alldofcount,1,MPI_INT,0,MPI_COMM_WORLD); + MPI_Bcast(alldofcount,num_procs,MPI_INT,0,MPI_COMM_WORLD); + +- /*Ok, now every cpu should start its own dof count at the end of the dofcount +- * from cpu-1. : */ ++ /* Every cpu should start its own dof count at the end of the dofcount from cpu-1*/ + dofcount=0; +- if(my_rank==0){ +- dofcount=0; +- } +- else{ ++ if(my_rank!=0){ + for(i=0;iSize();i++){ + Vertex* vertex=(Vertex*)this->GetObjectByOffset(i); + vertex->OffsetDofs(dofcount); + } + +- /*Finally, remember that cpus may have skipped some objects, because they were clones. For every ++ /* Finally, remember that cpus may have skipped some objects, because they were clones. For every + * object that is not a clone, tell them to show their dofs, so that later on, they can get picked + * up by their clones: */ +- truedofs=(int*)xcalloc(numberofobjects*numberofdofsperobject,sizeof(int)); ++ truedofs =(int*)xcalloc(numberofobjects*numberofdofsperobject,sizeof(int)); + alltruedofs=(int*)xcalloc(numberofobjects*numberofdofsperobject,sizeof(int)); +- + for (i=0;iSize();i++){ + Vertex* vertex=(Vertex*)this->GetObjectByOffset(i); + vertex->ShowTrueDofs(truedofs); + } +- +- MPI_Allreduce ( (void*)truedofs,(void*)alltruedofs,numberofobjects*numberofdofsperobject,MPI_INT,MPI_MAX,MPI_COMM_WORLD); ++ MPI_Allreduce((void*)truedofs,(void*)alltruedofs,numberofobjects*numberofdofsperobject,MPI_INT,MPI_MAX,MPI_COMM_WORLD); + +- /*Ok, now every cpu knows the true dofs of everyone else that is not a clone. Let the clones recover those true dofs: */ ++ /* Now every cpu knows the true dofs of everyone else that is not a clone*/ + for (i=0;iSize();i++){ + Vertex* vertex=(Vertex*)this->GetObjectByOffset(i); + vertex->UpdateCloneDofs(alltruedofs); +@@ -106,7 +96,6 @@ + xfree((void**)&alldofcount); + xfree((void**)&truedofs); + xfree((void**)&alltruedofs); +- + } + /*}}}*/ + /*FUNCTION Vertices::FlagClones{{{1*/ Index: /issm/oecreview/Archive/11286-11300/ISSM-11298-11299.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11298-11299.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11298-11299.diff (revision 11515) @@ -0,0 +1,175 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp (revision 11298) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core_step.cpp (revision 11299) +@@ -20,7 +20,7 @@ + femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum); + solver_nonlinear(femmodel,modify_loads); + +- /*transfer water column thickness to old water column thickness: */ +- //InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,EnthalpyOldEnum); ++ /*transfer enthalpy to enthalpy picard for the next step: */ ++ InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,EnthalpyPicardEnum); + + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core.cpp (revision 11298) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/enthalpy_core.cpp (revision 11299) +@@ -45,8 +45,7 @@ + time=(i+1)*dt; + + /*call enthalpy_core_step: */ +- femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum); +- solver_linear(femmodel); ++ enthalpy_core_step(femmodel,i,time); + + if(solution_type==EnthalpySolutionEnum && !control_analysis){ + _printf_(VerboseSolution()," saving results\n"); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11298) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11299) +@@ -419,6 +419,7 @@ + return thermalconductivity/(rho_ice*heatcapacity); + } + else{ ++ printf("-------------- file: Matpar.cpp line: %i\n",__LINE__); + return 0.1*thermalconductivity/(rho_ice*heatcapacity); + } + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11298) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11299) +@@ -2049,6 +2049,8 @@ + name==InversionVyObsEnum || + name==InversionVzObsEnum || + name==TemperatureEnum || ++ name==EnthalpyEnum || ++ name==EnthalpyPicardEnum || + name==WaterfractionEnum|| + name==FrictionCoefficientEnum || + name==GradientEnum || +@@ -3240,7 +3242,7 @@ + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); + this->parameters->FindParam(&stabilization,ThermalStabilizationEnum); + Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); +- Input* enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); ++ Input* enthalpy_input=inputs->GetInput(EnthalpyPicardEnum);_assert_(enthalpy_input); //for this iteration of the step + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); +@@ -4238,7 +4240,7 @@ + + const int numdof=NDOF1*NUMVERTICES; + +- bool converged; ++ bool converged=false; + int i,rheology_law; + double xyz_list[NUMVERTICES][3]; + double values[numdof]; +@@ -4265,9 +4267,8 @@ + GetInputListOnVertices(&pressure[0],PressureEnum); + Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); + +- +-// this->inputs->GetInputValue(&converged,ConvergedEnum); +-// if(converged){ ++ this->inputs->GetInputValue(&converged,ConvergedEnum); ++ if(converged){ + /*Convert enthalpy into temperature and water fraction*/ + for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); + +@@ -4299,10 +4300,10 @@ + _error_("Rheology law %s not supported yet",EnumToStringx(rheology_law)); + + } +-// } +-// else{ +-// this->inputs->AddInput(new PentaP1Input(EnthalpyPicardEnum,values)); +-// } ++ } ++ else{ ++ this->inputs->AddInput(new PentaP1Input(EnthalpyPicardEnum,values)); ++ } + + /*Free ressources:*/ + xfree((void**)&doflist); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core_step.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core_step.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core_step.m (revision 11299) +@@ -0,0 +1,14 @@ ++function femmodel=enthalpy_core_step(femmodel,step,time) ++%ENTHALPY_CORE_STEP - core of the enthalpy solution for one step ++% ++% Usage: ++% femmodel=enthalpy_core_step(femmodel,step,time) ++ ++ %some parameters ++ modify_loads=true; ++ ++ issmprintf(VerboseSolution,'\n%s',[' computing enthalpy']); ++ femmodel=SetCurrentConfiguration(femmodel,EnthalpyAnalysisEnum); ++ femmodel=solver_nonlinear(femmodel,modify_loads); ++ ++end %end function +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core.m (revision 11298) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/enthalpy_core.m (revision 11299) +@@ -4,7 +4,6 @@ + % Usage: + % femmodel=enthalpy_core(femmodel) + +- + %recover parameters common to all solutions + ndt=femmodel.parameters.TimesteppingFinalTime; + dt=femmodel.parameters.TimesteppingTimeStep; +@@ -24,9 +23,7 @@ + issmprintf(VerboseSolution,'\n%s%i/%i\n','time step: ',i,nsteps); + time=(i+1)*dt; + +- issmprintf(VerboseSolution,'\n%s',[' computing enthalpy']); +- femmodel=SetCurrentConfiguration(femmodel,EnthalpyAnalysisEnum); +- femmodel=solver_linear(femmodel); ++ femmodel=enthalpy_core_step(femmodel,i,time); + + if (solution_type==EnthalpySolutionEnum & ~control_analysis), + issmprintf(VerboseSolution,'\n%s',[' saving results']); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_nonlinear.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_nonlinear.m (revision 11298) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_nonlinear.m (revision 11299) +@@ -21,6 +21,7 @@ + uf=Reducevectorgtof( ug, femmodel.nodes,femmodel.parameters); + + %Update the solution to make sure that vx and vxold are similar ++ [femmodel.elements loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,double(converged),ConvergedEnum); + [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug); + + while(~converged), +@@ -37,17 +38,17 @@ + uf=Solver(K_ff,p_f,old_uf,df,femmodel.parameters); + ug= Mergesolutionfromftog( uf, ys, femmodel.nodes,femmodel.parameters); + +- [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug); +- [loads,constraints_converged,num_unstable_constraints] =ConstraintsState( femmodel.elements,femmodel.nodes,femmodel.vertices,loads, femmodel.materials,femmodel.parameters); +- +- issmprintf(VerboseConvergence(),'%s%i',' number of unstable constraints: ',num_unstable_constraints); +- + %Figure out if convergence have been reached + converged=convergence(K_ff,p_f,uf,old_uf,femmodel.parameters); + + %add convergence status into status + [femmodel.elements loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,double(converged),ConvergedEnum); + ++ [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug); ++ [loads,constraints_converged,num_unstable_constraints] =ConstraintsState( femmodel.elements,femmodel.nodes,femmodel.vertices,loads, femmodel.materials,femmodel.parameters); ++ ++ issmprintf(VerboseConvergence(),'%s%i',' number of unstable constraints: ',num_unstable_constraints); ++ + %rift convergence + if ~constraints_converged, + if converged, Index: /issm/oecreview/Archive/11286-11300/ISSM-11299-11300.diff =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-11299-11300.diff (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-11299-11300.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11299) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11300) +@@ -2,7 +2,7 @@ + SHELL=/bin/bash + + #mail output to Mathieu +-MAILTO=eric.larour@jpl.nasa.gov,mathieu.morlighem@jpl.nasa.gov,helene.seroussi@jpl.nasa.gov ++MAILTO=eric.larour@jpl.nasa.gov,mathieu.morlighem@jpl.nasa.gov,helene.seroussi@jpl.nasa.gov,Christopher.P.Borstad@jpl.nasa.gov,Nicole-Jeanne.Schlegel@jpl.nasa.gov,Feras.A.Habbal@jpl.nasa.gov + + #cronjob + 00 09 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily Index: /issm/oecreview/Archive/11286-11300/ISSM-DocReview-11286-11300.tex =================================================================== --- /issm/oecreview/Archive/11286-11300/ISSM-DocReview-11286-11300.tex (revision 11515) +++ /issm/oecreview/Archive/11286-11300/ISSM-DocReview-11286-11300.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11286-11300/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11286-11300/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11286-11300/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11286-11300 Index: /issm/oecreview/Archive/11286-11300/Makefile =================================================================== --- /issm/oecreview/Archive/11286-11300/Makefile (revision 11515) +++ /issm/oecreview/Archive/11286-11300/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11286-11300 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11286-11300/log.tex =================================================================== --- /issm/oecreview/Archive/11286-11300/log.tex (revision 11515) +++ /issm/oecreview/Archive/11286-11300/log.tex (revision 11515) @@ -0,0 +1,28 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11286-11287.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/solutions.h \\ Export determination: 6. \\Rationale: header file missing +M /issm/trunk-jpl/src/c/Makefile.am and make file missing \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11287-11288.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Makefile.am \\ Export determination: 6. \\Rationale: and make file missing +A /issm/trunk-jpl/src/c/solutions/enthalpy\_core\_step.cpp enthalpy core step solution added \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11288-11289.diff: \\ Function name: \\A /issm/trunk-jpl/src/c/solutions/enthalpy\_core\_step.cpp \\ Export determination: 6. \\Rationale: enthalpy core step solution added +M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp Better way to set TAO parameters \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11289-11290.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: Better way to set TAO parameters +M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp different enthalpy diffusion parameter depending on enthalpy value \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11290-11291.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp \\ Export determination: 6. \\Rationale: different enthalpy diffusion parameter depending on enthalpy value +M /issm/trunk-jpl/src/c/Container/DataSet.cpp M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/Makefile.am M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp M /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp A /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (from /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.cpp:11288) A /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (from /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.h:11288) D /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.cpp D /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.h A /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (from /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.cpp:11288) A /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (from /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.h:11288) D /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.cpp D /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.h M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp M /issm/trunk-jpl/src/c/objects/objects.h moved TriaVertexInput to TriaP1Input and same for Penta \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11291-11292.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Container/DataSet.cpp M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/Makefile.am M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp M /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp A /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (from /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.cpp:11288) A /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (from /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.h:11288) D /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.cpp D /issm/trunk-jpl/src/c/objects/Inputs/PentaVertexInput.h A /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (from /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.cpp:11288) A /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (from /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.h:11288) D /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.cpp D /issm/trunk-jpl/src/c/objects/Inputs/TriaVertexInput.h M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp M /issm/trunk-jpl/src/c/objects/objects.h \\ Export determination: 6. \\Rationale: moved TriaVertexInput to TriaP1Input and same for Penta +M /issm/trunk-jpl/src/c/Container/DataSet.cpp M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/Makefile.am M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp A /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (from /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp:11288) A /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (from /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h:11291) D /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp D /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h A /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (from /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp:11288) A /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (from /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h:11288) D /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp D /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp M /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h M /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp M /issm/trunk-jpl/src/c/objects/objects.h moved TriaVertexElementResult to TriaP1ElementResult and same for Penta \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11292-11293.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Container/DataSet.cpp M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/Makefile.am M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp A /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (from /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp:11288) A /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (from /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h:11291) D /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.cpp D /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h A /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (from /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp:11288) A /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (from /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h:11288) D /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.cpp D /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp M /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h M /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp M /issm/trunk-jpl/src/c/objects/objects.h \\ Export determination: 6. \\Rationale: moved TriaVertexElementResult to TriaP1ElementResult and same for Penta +M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp in solver\_nonlinear, should compute convergence before updating the solution \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11293-11294.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp \\ Export determination: 6. \\Rationale: in solver\_nonlinear, should compute convergence before updating the solution +M /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp M /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h minor \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11294-11295.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp M /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/externalpackages/flaim/install M /issm/trunk-jpl/externalpackages/flaim/install.sh M /issm/trunk-jpl/src/c/Makefile.am A /issm/trunk-jpl/src/c/modules/KMLFileReadx A /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (from /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp:11159) A /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.h (from /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.h:11159) D /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp D /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.h M /issm/trunk-jpl/src/c/modules/modules.h A /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.cpp A /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.h M /issm/trunk-jpl/src/c/objects/objects.h A /issm/trunk-jpl/src/mex/KMLFileRead A /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp (from /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.cpp:11159) A /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h (from /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.h:11159) D /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.cpp D /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.h M /issm/trunk-jpl/src/mex/Makefile.am Moved KMLFileRead to its own directory and added KML\_Unknown class. \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11295-11296.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/flaim/install M /issm/trunk-jpl/externalpackages/flaim/install.sh M /issm/trunk-jpl/src/c/Makefile.am A /issm/trunk-jpl/src/c/modules/KMLFileReadx A /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (from /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp:11159) A /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.h (from /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.h:11159) D /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp D /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLFileReadx.h M /issm/trunk-jpl/src/c/modules/modules.h A /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.cpp A /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.h M /issm/trunk-jpl/src/c/objects/objects.h A /issm/trunk-jpl/src/mex/KMLFileRead A /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.cpp (from /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.cpp:11159) A /issm/trunk-jpl/src/mex/KMLFileRead/KMLFileRead.h (from /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.h:11159) D /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.cpp D /issm/trunk-jpl/src/mex/KMLMeshWrite/KMLFileRead.h M /issm/trunk-jpl/src/mex/Makefile.am \\ Export determination: 6. \\Rationale: Moved KMLFileRead to its own directory and added KML\_Unknown class. +D /issm/trunk-jpl/externalpackages/flaim/install flaim install directory SHOULD NOT be under svn \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11296-11297.diff: \\ Function name: \\D /issm/trunk-jpl/externalpackages/flaim/install \\ Export determination: 6. \\Rationale: flaim install directory SHOULD NOT be under svn +M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp Some clean-up \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11297-11298.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: Some clean-up +M /issm/trunk-jpl/src/c/Container/Nodes.cpp M /issm/trunk-jpl/src/c/Container/Vertices.cpp minor \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11298-11299.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Container/Nodes.cpp M /issm/trunk-jpl/src/c/Container/Vertices.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp M /issm/trunk-jpl/src/c/solutions/enthalpy\_core.cpp M /issm/trunk-jpl/src/c/solutions/enthalpy\_core\_step.cpp M /issm/trunk-jpl/src/m/solutions/enthalpy\_core.m A /issm/trunk-jpl/src/m/solutions/enthalpy\_core\_step.m M /issm/trunk-jpl/src/m/solvers/solver\_nonlinear.m added non linearity in enthalpy solution \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11299-11300.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp M /issm/trunk-jpl/src/c/solutions/enthalpy\_core.cpp M /issm/trunk-jpl/src/c/solutions/enthalpy\_core\_step.cpp M /issm/trunk-jpl/src/m/solutions/enthalpy\_core.m A /issm/trunk-jpl/src/m/solutions/enthalpy\_core\_step.m M /issm/trunk-jpl/src/m/solvers/solver\_nonlinear.m \\ Export determination: 6. \\Rationale: added non linearity in enthalpy solution +M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile added Nicole, Feras and Chris on the list to receive the cron file \\\\ Index: /issm/oecreview/Archive/11286-11300/r1.tex =================================================================== --- /issm/oecreview/Archive/11286-11300/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11286-11300/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11286 Index: /issm/oecreview/Archive/11286-11300/r2.tex =================================================================== --- /issm/oecreview/Archive/11286-11300/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11286-11300/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11300 Index: /issm/oecreview/Archive/11300-11318/Date.tex =================================================================== --- /issm/oecreview/Archive/11300-11318/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11300-11318/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11300-11318/ISSM-11300-11301.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11300-11301.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11300-11301.diff (revision 11515) @@ -0,0 +1,12 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11300) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11301) +@@ -419,7 +419,6 @@ + return thermalconductivity/(rho_ice*heatcapacity); + } + else{ +- printf("-------------- file: Matpar.cpp line: %i\n",__LINE__); + return 0.1*thermalconductivity/(rho_ice*heatcapacity); + } + } Index: /issm/oecreview/Archive/11300-11318/ISSM-11301-11302.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11301-11302.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11301-11302.diff (revision 11515) @@ -0,0 +1,92 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11301) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11302) +@@ -39,16 +39,13 @@ + _printf_(VerboseControl()," compute gradient of J with respect to %s\n",EnumToStringx(control_type[i])); + Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type[i]); + +- if(control_steady)diagnostic_core(femmodel); +- + if (step>0 && search_scalar==0){ + _printf_(VerboseControl()," orthogonalization\n"); + ControlInputGetGradientx(&old_gradient,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,control_type[i]); + Orthx(&new_gradient,gradient,old_gradient); VecFree(&old_gradient); VecFree(&gradient); + } + else{ +- _printf_(VerboseControl()," normalizing directions\n"); +- Orthx(&new_gradient,gradient,NULL); VecFree(&gradient); ++ new_gradient=gradient; + } + + /*Get scaling factor of current control:*/ +@@ -65,6 +62,9 @@ + /*Scale Gradients*/ + for (int i=0;i elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials, femmodel->parameters,control_type[i],optscal); + ++ /*For Nightly run compatibility, do a last diagnostic FIXME: to be removed*/ ++ if(control_steady)diagnostic_core(femmodel); ++ + /*Clean up and return*/ + xfree((void**)&control_type); + xfree((void**)&optscal_list); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp (revision 11301) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp (revision 11302) +@@ -105,12 +105,6 @@ + InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,true); + + if(controlconvergence(J[n],tol_cm)) break; +- +- /*Temporary saving every 5 control steps: */ +- /*if (((n+1)%5)==0){ +- _printf_(VerboseControl(),"%s\n"," saving temporary results"); +- controlrestart(femmodel,J); +- }*/ + } + + _printf_(VerboseControl(),"%s\n"," preparing final solution"); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m (revision 11301) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m (revision 11302) +@@ -82,6 +82,5 @@ + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type(i)); + end + femmodel.results=AddExternalResult(femmodel.results,JEnum,J); +- %femmodel.results=AddExternalResult(femmodel.results,InversionControlParametersEnum,control_type); + + end %end function +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11301) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11302) +@@ -30,17 +30,12 @@ + issmprintf(VerboseControl,[' compute gradient of J with respect to %s'],EnumToString(control_type(i))); + grad=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type(i)); + +- if control_steady, +- femmodel=diagnostic_core(femmodel); +- end +- + if (step>1 && search_scalar==0), + issmprintf(VerboseControl,'%s',[' orthogonalization']); + old_gradient=ControlInputGetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,control_type(i)); + new_gradient=Orth(grad,old_gradient); + else +- issmprintf(VerboseControl,'%s',[' normalizing direction']); +- new_gradient=Orth(grad,[]); ++ new_gradient=grad; + end + + %Get scaling factor of current control: +@@ -57,3 +52,8 @@ + for i=1:num_controls, + [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),gradient_scaling); + end ++ ++ if control_steady, ++ femmodel=diagnostic_core(femmodel); ++ end ++ Index: /issm/oecreview/Archive/11300-11318/ISSM-11302-11303.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11302-11303.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11302-11303.diff (revision 11515) @@ -0,0 +1,27 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11302) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11303) +@@ -62,9 +62,6 @@ + /*Scale Gradients*/ + for (int i=0;i elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials, femmodel->parameters,control_type[i],optscal); + +- /*For Nightly run compatibility, do a last diagnostic FIXME: to be removed*/ +- if(control_steady)diagnostic_core(femmodel); +- + /*Clean up and return*/ + xfree((void**)&control_type); + xfree((void**)&optscal_list); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11302) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11303) +@@ -52,8 +52,3 @@ + for i=1:num_controls, + [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),gradient_scaling); + end +- +- if control_steady, +- femmodel=diagnostic_core(femmodel); +- end +- Index: /issm/oecreview/Archive/11300-11318/ISSM-11303-11304.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11303-11304.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11303-11304.diff (revision 11515) @@ -0,0 +1,16 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive431.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive432.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive429.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive430.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11300-11318/ISSM-11304-11305.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11304-11305.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11304-11305.diff (revision 11515) @@ -0,0 +1,32 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test525.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test525.m (revision 11304) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test525.m (revision 11305) +@@ -18,6 +18,7 @@ + md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + md.timestepping.time_step=0; + ++md.thermal.penalty_lock=5; + md.cluster=none; + md=solve(md,SteadystateSolutionEnum); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test526.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test526.m (revision 11304) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test526.m (revision 11305) +@@ -18,6 +18,7 @@ + md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + md.timestepping.time_step=0; + ++md.thermal.penalty_lock=5; + md.cluster=generic('name',oshostname(),'np',3); + md=solve(md,SteadystateSolutionEnum); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive525.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive526.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11300-11318/ISSM-11305-11306.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11305-11306.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11305-11306.diff (revision 11515) @@ -0,0 +1,155 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11305) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/solutions.h (revision 11306) +@@ -14,7 +14,7 @@ + /*cores: */ + void adjointdiagnostic_core(FemModel* femmodel); + void adjointbalancethickness_core(FemModel* femmodel); +-void gradient_core(FemModel* femmodel,int step=0, double search_scalar=0); ++void gradient_core(FemModel* femmodel,int n=0,bool orthogonalize=false); + void diagnostic_core(FemModel* femmodel); + void hydrology_core(FemModel* femmodel); + void hydrology_core_step(FemModel* femmodel,int step, double time); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11305) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11306) +@@ -12,8 +12,7 @@ + #include "../include/include.h" + #include "../solvers/solvers.h" + +- +-void gradient_core(FemModel* femmodel,int step, double search_scalar){ //step defaults to 0, search_scalar defaults to 0 ++void gradient_core(FemModel* femmodel,int step,bool orthogonalize){ + + /*parameters: */ + bool control_steady; +@@ -39,7 +38,7 @@ + _printf_(VerboseControl()," compute gradient of J with respect to %s\n",EnumToStringx(control_type[i])); + Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type[i]); + +- if (step>0 && search_scalar==0){ ++ if (orthogonalize){ + _printf_(VerboseControl()," orthogonalization\n"); + ControlInputGetGradientx(&old_gradient,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,control_type[i]); + Orthx(&new_gradient,gradient,old_gradient); VecFree(&old_gradient); VecFree(&gradient); +@@ -52,7 +51,7 @@ + VecNorm(new_gradient,NORM_INFINITY,&norm_grad); + if(norm_grad<=0) _error_("||∂J/∂α||∞ = 0 gradient norm of J with respect to %s is zero",EnumToStringx(control_type[i])); + if(isnan(norm_grad))_error_("||∂J/∂α||∞ = NaN gradient norm of J with respect to %s is NaN" ,EnumToStringx(control_type[i])); +- if(i==0 || (optscal_list[num_controls*step+i]/norm_grad) elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials, femmodel->parameters,control_type[i],new_gradient); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp (revision 11305) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp (revision 11306) +@@ -33,7 +33,7 @@ + double* cm_jump=NULL; + + /*intermediary: */ +- double search_scalar=0; ++ double search_scalar=1; + OptArgs optargs; + OptPars optpars; + +@@ -83,12 +83,12 @@ + for(i=0;iparameters->SetParam(step_responses,1,num_responses,StepResponsesEnum); + +- /*In case we are running a steady state control method, compute new temperature field using new parameter distribution: */ ++ /*In steady state inversion, compute new temperature field now*/ + if(solution_type==SteadystateSolutionEnum) solutioncore(femmodel); + + _printf_(VerboseControl(),"%s\n"," compute adjoint state:"); + adjointcore(femmodel); +- gradient_core(femmodel,n,search_scalar); ++ gradient_core(femmodel,n,search_scalar==0); + + /*Return gradient if asked: */ + if (cm_gradient){ +@@ -99,7 +99,6 @@ + _printf_(VerboseControl(),"%s\n"," optimizing along gradient direction"); + optpars.maxiter=(int)maxiter[n]; optpars.cm_jump=cm_jump[n]; + BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs); +- //OptimalSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs); + + _printf_(VerboseControl(),"%s\n"," 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); +@@ -115,7 +114,6 @@ + if(!dakota_analysis){ //do not save this if we are running the control core from a qmu run! + for(i=0;ielements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i]); + femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0)); +- //femmodel->results->AddObject(new StringExternalResult(femmodel->results->Size()+1,InversionControlParametersEnum,EnumToStringx(control_type),1,0)); + } + + cleanup_and_return: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m (revision 11305) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m (revision 11306) +@@ -24,7 +24,7 @@ + + %Initialize misfits with a vector of zeros + J=zeros(nsteps,1); +- search_scalar=0; ++ search_scalar=1; + + %Get core from solution type + solutioncore=CorePointerFromSolutionEnum(femmodel.parameters,solution_type); +@@ -41,7 +41,7 @@ + issmprintf(VerboseControl(),['control method step ' num2str(n) '/' num2str(femmodel.parameters.InversionNsteps)]); + femmodel.parameters.StepResponses=responses(n,:); + +- %In case we are running a steady state control method, compute new temperature field using new parameter distribution: ++ %In steady state inversion, compute new temperature field now + if (solution_type==SteadystateSolutionEnum) + femmodel=steadystate_core(femmodel); + end +@@ -49,7 +49,7 @@ + issmprintf(VerboseControl,' compute adjoint state'); + eval(['femmodel=' adjointcore '(femmodel);']); + +- femmodel=gradient_core(femmodel,n,search_scalar); ++ femmodel=gradient_core(femmodel,n,search_scalar==0); + + %Return gradient if asked + if gradient_only, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11305) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11306) +@@ -10,10 +10,10 @@ + + if nargin==3, + step=varargin{1}; +- search_scalar=varargin{2}; ++ orthogonalize=varargin{2}; + elseif nargin==1 + step=0; +- search_scalar=0;; ++ orthogonalize=false; + else + help gradient_core + error('bad usage'); +@@ -30,7 +30,7 @@ + issmprintf(VerboseControl,[' compute gradient of J with respect to %s'],EnumToString(control_type(i))); + grad=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type(i)); + +- if (step>1 && search_scalar==0), ++ if orthogonalize, + issmprintf(VerboseControl,'%s',[' orthogonalization']); + old_gradient=ControlInputGetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,control_type(i)); + new_gradient=Orth(grad,old_gradient); +@@ -42,7 +42,7 @@ + norm_grad=norm(new_gradient,inf); + if(norm_grad<=0), error(['||∂J/∂α||∞ = 0 gradient norm of J with respect to ' EnumToString(control_type(i)) ' is zero']); end + if(isnan(norm_grad)), error(['||∂J/∂α||∞ = NaN gradient norm of J with respect to ' EnumToString(control_type(i)) ' is NaN' ]); end +- if(i==1 | (gradient_scaling_list(step,i)/norm_grad)skip to section 3 ++# - "none" leave ISSM as is in its directory ++# ->skip to section 3 ++ISSM_INSTALLATION="checkout" ++ ++#SVN repository ++REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" ++#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" ++ ++#execution path used for parallel runs ++EXECUTION_PATH="/u/astrid-r1b/schlegel/ExecutionNightlyRun" ++ ++#-----------------------------------# ++# 3: External packages installation # ++#-----------------------------------# ++ ++#ISSM_EXTERNALPACKAGES can have 3 values: ++# - "install" install all external packages listed below ++# - "copy" copy existing directories (EXTERNALPACKAGESDIR) ++# - "none" leave external packages as is ++# ->skip to section 4 ++ISSM_EXTERNALPACKAGES="install" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/schlegel/issmuci/trunk-jpl/externalpackages" ++ ++#List of external pakages to be installed ++EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco yams" ++ ++#---------------------# ++# 4: ISSM Compilation # ++#---------------------# ++ ++#ISSM_COMPILATION can have 2 values: ++# - "yes" compile ISSM ++# - "no" do not compile ISSM ++ISSM_COMPILATION="yes" ++ ++#----------------------# ++# 5: Mail notification # ++#----------------------# ++ ++#Mail delivery. If SKIPMAIL="no", the html nightly run report will be ++#sent to the adresses present in $ISSM_TIER/cron/mailinglist. ++SKIPMAIL="no" ++ ++#Sender email address ++EMAIL_ADRESS="schlegel@jpl.nasa.gov" ++ ++#------------------------# ++# 6: Nightly run options # ++#------------------------# ++ ++#number of cpus used in ISSM installation and compilation (one is usually ++#safer as some packages are very sensitive to parallel compilation) ++NUMCPUS_INSTALL=1 ++ ++#number of cpus used in the nightly runs. ++NUMCPUS_RUN=7 ++ ++#Nightly run options. The matlab routine nightlyrun.m will be called ++#as follows: nightlyrun($NROPTIONS). The options must be understandable ++#by Matlab and nightlyrun.m ++#ex: "'id',[101 102 103]" ++ ++NROPTIONS="'benchmark','all'" + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_validation +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_daily +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_daily (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_daily (revision 11307) +@@ -0,0 +1,93 @@ ++# ++########### Configuration file for Mathieu Morlighem's nightly run on Linux ############ ++ ++#-------------------------------# ++# 1: ISSM general configuration # ++#-------------------------------# ++ ++#ISSM main directory (full paths) ++ISSM_DIR="/u/astrid-r1b/schlegel/issmuci" ++ISSM_TIER="/u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/trunk-jpl" ++#ISSM_TIER="/u/astrid-r1b/seroussi/svn/issm/trunk/cron/issm2.2" ++ ++#ISSM Architecture ++ISSM_ARCH="linux-gnu-amd64" ++ ++#Machine configuration ++MACHINE="astrid" ++ ++#MATLAB path ++MATLAB_PATH="/usr/local/pkgs/matlab-7.6/" ++ ++#----------------------# ++# 2: ISSM Installation # ++#----------------------# ++ ++#ISSM_INSTALLATION can have 3 values: ++# - "checkout" the existing version of the code will be erased and ++# the latest version will be checked out ++# - "update" the directory won't be erased but ISSM will be updated ++# ->skip to section 3 ++# - "none" leave ISSM as is in its directory ++# ->skip to section 3 ++ISSM_INSTALLATION="update" ++ ++#SVN repository ++REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" ++#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" ++ ++#execution path used for parallel runs ++EXECUTION_PATH="/u/astrid-r1b/schlegel/ExecutionNightlyRun" ++ ++#-----------------------------------# ++# 3: External packages installation # ++#-----------------------------------# ++ ++#ISSM_EXTERNALPACKAGES can have 3 values: ++# - "install" install all external packages listed below ++# - "copy" copy existing directories (EXTERNALPACKAGESDIR) ++# - "none" leave external packages as is ++# ->skip to section 4 ++ISSM_EXTERNALPACKAGES="none" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/schlegel/issmuci/trunk-jpl/externalpackages" ++ ++#List of external pakages to be installed ++EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" ++ ++#---------------------# ++# 4: ISSM Compilation # ++#---------------------# ++ ++#ISSM_COMPILATION can have 2 values: ++# - "yes" compile ISSM ++# - "no" do not compile ISSM ++ISSM_COMPILATION="yes" ++ ++#----------------------# ++# 5: Mail notification # ++#----------------------# ++ ++#Mail delivery. If SKIPMAIL="no", the html nightly run report will be ++#sent to the adresses present in $ISSM_TIER/cron/mailinglist. ++SKIPMAIL="no" ++ ++#Sender email address ++EMAIL_ADRESS="schlegel@jpl.nasa.gov" ++ ++#------------------------# ++# 6: Nightly run options # ++#------------------------# ++ ++#number of cpus used in ISSM installation and compilation (one is usually ++#safer as some packages are very sensitive to parallel compilation) ++NUMCPUS_INSTALL=8 ++ ++#number of cpus used in the nightly runs. ++NUMCPUS_RUN=7 ++ ++#Nightly run options. The matlab routine nightlyrun.m will be called ++#as follows: nightlyrun($NROPTIONS). The options must be understandable ++#by Matlab and nightlyrun.m ++#ex: "'id',[101 102 103]" ++ ++NROPTIONS="" + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_daily +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_ucitrunk +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_ucitrunk (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_ucitrunk (revision 11307) +@@ -0,0 +1,93 @@ ++# ++########### Configuration file for Mathieu Morlighem's nightly run on Linux ############ ++ ++#-------------------------------# ++# 1: ISSM general configuration # ++#-------------------------------# ++ ++#ISSM main directory (full path) ++ISSM_DIR="/u/astrid-r1b/schlegel/issmuci" ++ISSM_TIER="/u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/trunk" ++#ISSM_TIER="/u/astrid-r1b/seroussi/svn/issm/trunk/cron/issm2.2" ++ ++#ISSM Architecture ++ISSM_ARCH="linux-gnu-amd64" ++ ++#Machine configuration ++MACHINE="astrid" ++ ++#MATLAB path ++MATLAB_PATH="/usr/local/pkgs/matlab-7.6/" ++ ++#----------------------# ++# 2: ISSM Installation # ++#----------------------# ++ ++#ISSM_INSTALLATION can have 3 values: ++# - "checkout" the existing version of the code will be erased and ++# the latest version will be checked out ++# - "update" the directory won't be erased but ISSM will be updated ++# ->skip to section 3 ++# - "none" leave ISSM as is in its directory ++# ->skip to section 3 ++ISSM_INSTALLATION="checkout" ++ ++#SVN repository ++REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk" ++#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" ++ ++#execution path used for parallel runs ++EXECUTION_PATH="/u/astrid-r1b/schlegel/ExecutionNightlyRun" ++ ++#-----------------------------------# ++# 3: External packages installation # ++#-----------------------------------# ++ ++#ISSM_EXTERNALPACKAGES can have 3 values: ++# - "install" install all external packages listed below ++# - "copy" copy existing directories (EXTERNALPACKAGESDIR) ++# - "none" leave external packages as is ++# ->skip to section 4 ++ISSM_EXTERNALPACKAGES="install" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/schlegel/issmuci/trunk-jpl/externalpackages" ++ ++#List of external pakages to be installed ++EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" ++ ++#---------------------# ++# 4: ISSM Compilation # ++#---------------------# ++ ++#ISSM_COMPILATION can have 2 values: ++# - "yes" compile ISSM ++# - "no" do not compile ISSM ++ISSM_COMPILATION="yes" ++ ++#----------------------# ++# 5: Mail notification # ++#----------------------# ++ ++#Mail delivery. If SKIPMAIL="no", the html nightly run report will be ++#sent to the adresses present in $ISSM_TIER/cron/mailinglist. ++SKIPMAIL="no" ++ ++#Sender email address ++EMAIL_ADRESS="schlegel@jpl.nasa.gov" ++ ++#------------------------# ++# 6: Nightly run options # ++#------------------------# ++ ++#number of cpus used in ISSM installation and compilation (one is usually ++#safer as some packages are very sensitive to parallel compilation) ++NUMCPUS_INSTALL=1 ++ ++#number of cpus used in the nightly runs. ++NUMCPUS_RUN=7 ++ ++#Nightly run options. The matlab routine nightlyrun.m will be called ++#as follows: nightlyrun($NROPTIONS). The options must be understandable ++#by Matlab and nightlyrun.m ++#ex: "'id',[101 102 103]" ++ ++NROPTIONS="" + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_ucitrunk +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_nightly +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_nightly (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_nightly (revision 11307) +@@ -0,0 +1,93 @@ ++# ++########### Configuration file for Mathieu Morlighem's nightly run on Linux ############ ++ ++#-------------------------------# ++# 1: ISSM general configuration # ++#-------------------------------# ++ ++#ISSM main directory (full path) ++ISSM_DIR="/u/astrid-r1b/schlegel/issmuci" ++ISSM_TIER="/u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/trunk-jpl" ++#ISSM_TIER="/u/astrid-r1b/seroussi/svn/issm/trunk/cron/issm2.2" ++ ++#ISSM Architecture ++ISSM_ARCH="linux-gnu-amd64" ++ ++#Machine configuration ++MACHINE="astrid" ++ ++#MATLAB path ++MATLAB_PATH="/usr/local/pkgs/matlab-7.6/" ++ ++#----------------------# ++# 2: ISSM Installation # ++#----------------------# ++ ++#ISSM_INSTALLATION can have 3 values: ++# - "checkout" the existing version of the code will be erased and ++# the latest version will be checked out ++# - "update" the directory won't be erased but ISSM will be updated ++# ->skip to section 3 ++# - "none" leave ISSM as is in its directory ++# ->skip to section 3 ++ISSM_INSTALLATION="checkout" ++ ++#SVN repository ++REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl" ++#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" ++ ++#execution path used for parallel runs ++EXECUTION_PATH="/u/astrid-r1b/schlegel/ExecutionNightlyRun" ++ ++#-----------------------------------# ++# 3: External packages installation # ++#-----------------------------------# ++ ++#ISSM_EXTERNALPACKAGES can have 3 values: ++# - "install" install all external packages listed below ++# - "copy" copy existing directories (EXTERNALPACKAGESDIR) ++# - "none" leave external packages as is ++# ->skip to section 4 ++ISSM_EXTERNALPACKAGES="install" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/schlegel/issmuci/trunk-jpl/externalpackages" ++ ++#List of external pakages to be installed ++EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" ++ ++#---------------------# ++# 4: ISSM Compilation # ++#---------------------# ++ ++#ISSM_COMPILATION can have 2 values: ++# - "yes" compile ISSM ++# - "no" do not compile ISSM ++ISSM_COMPILATION="yes" ++ ++#----------------------# ++# 5: Mail notification # ++#----------------------# ++ ++#Mail delivery. If SKIPMAIL="no", the html nightly run report will be ++#sent to the adresses present in $ISSM_TIER/cron/mailinglist. ++SKIPMAIL="no" ++ ++#Sender email address ++EMAIL_ADRESS="schlegel@jpl.nasa.gov" ++ ++#------------------------# ++# 6: Nightly run options # ++#------------------------# ++ ++#number of cpus used in ISSM installation and compilation (one is usually ++#safer as some packages are very sensitive to parallel compilation) ++NUMCPUS_INSTALL=1 ++ ++#number of cpus used in the nightly runs. ++NUMCPUS_RUN=7 ++ ++#Nightly run options. The matlab routine nightlyrun.m will be called ++#as follows: nightlyrun($NROPTIONS). The options must be understandable ++#by Matlab and nightlyrun.m ++#ex: "'id',[101 102 103]" ++ ++NROPTIONS="" + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/configs/linux64_schlegel_nightly +___________________________________________________________________ +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11300-11318/ISSM-11307-11308.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11307-11308.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11307-11308.diff (revision 11515) @@ -0,0 +1,22 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11307) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11308) +@@ -5,10 +5,10 @@ + MAILTO=eric.larour@jpl.nasa.gov,mathieu.morlighem@jpl.nasa.gov,helene.seroussi@jpl.nasa.gov,Christopher.P.Borstad@jpl.nasa.gov,Nicole-Jeanne.Schlegel@jpl.nasa.gov,Feras.A.Habbal@jpl.nasa.gov + + #cronjob +-00 09 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily +-30 12 * * 1-5 cd /u/astrid-r1b/schelgel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily +-00 15 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily +-00 18 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily +-00 23 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_nightly +-00 23 * * 6 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_validation +-00 23 * * 7 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_ucitrunk ++00 09 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++30 12 * * 1-5 cd /u/astrid-r1b/schelgel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 15 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 18 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 23 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_nightly ++00 23 * * 6 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_validation ++00 23 * * 7 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_ucitrunk Index: /issm/oecreview/Archive/11300-11318/ISSM-11308-11309.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11308-11309.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11308-11309.diff (revision 11515) @@ -0,0 +1,22 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11308) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11309) +@@ -5,10 +5,10 @@ + MAILTO=eric.larour@jpl.nasa.gov,mathieu.morlighem@jpl.nasa.gov,helene.seroussi@jpl.nasa.gov,Christopher.P.Borstad@jpl.nasa.gov,Nicole-Jeanne.Schlegel@jpl.nasa.gov,Feras.A.Habbal@jpl.nasa.gov + + #cronjob +-00 09 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-30 12 * * 1-5 cd /u/astrid-r1b/schelgel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 15 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 18 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 23 * * 1-5 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_nightly +-00 23 * * 6 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_validation +-00 23 * * 7 cd /u/astrid-r1b/schlegel/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_ucitrunk ++00 09 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++30 12 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 15 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 18 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 23 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_nightly ++00 23 * * 6 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_validation ++00 23 * * 7 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_ucitrunk Index: /issm/oecreview/Archive/11300-11318/ISSM-11309-11310.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11309-11310.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11309-11310.diff (revision 11515) @@ -0,0 +1,242 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11309) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11310) +@@ -19,7 +19,7 @@ + int num_controls; + int *control_type = NULL; + double *optscal_list = NULL; +- double optscal,norm_grad; ++ double optscal=1.e+100,norm_grad; + + /*Intermediaries*/ + Vec new_gradient=NULL; +@@ -36,7 +36,7 @@ + for (int i=0;ielements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type[i]); ++ Gradjx(&gradient,&norm_grad,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,i); + + if (orthogonalize){ + _printf_(VerboseControl()," orthogonalization\n"); +@@ -51,15 +51,15 @@ + VecNorm(new_gradient,NORM_INFINITY,&norm_grad); + if(norm_grad<=0) _error_("||∂J/∂α||∞ = 0 gradient norm of J with respect to %s is zero",EnumToStringx(control_type[i])); + if(isnan(norm_grad))_error_("||∂J/∂α||∞ = NaN gradient norm of J with respect to %s is NaN" ,EnumToStringx(control_type[i])); +- optscal=optscal_list[num_controls*step+i]/norm_grad; ++ optscal=min(optscal,optscal_list[num_controls*step+i]/norm_grad); + + /*plug back into inputs: */ +- ControlInputSetGradientx(femmodel-> elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials, femmodel->parameters,control_type[i],new_gradient); ++ ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i],new_gradient); + VecFree(&new_gradient); + } + + /*Scale Gradients*/ +- for (int i=0;i elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials, femmodel->parameters,control_type[i],optscal); ++ for (int i=0;ielements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i],optscal); + + /*Clean up and return*/ + xfree((void**)&control_type); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11309) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11310) +@@ -84,7 +84,7 @@ + InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,FrictionCoefficientEnum,VertexEnum); + adjointdiagnostic_core(user->femmodel); + //Gradjx(&gradient,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaterialsRheologyBbarEnum); +- Gradjx(&gradient,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,FrictionCoefficientEnum); ++ Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,0); + VecScale(gradient,-1.); + VecCopy(gradient,G); + VecFree(&gradient); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 11309) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 11310) +@@ -9,15 +9,16 @@ + #include "../../toolkits/toolkits.h" + #include "../../EnumDefinitions/EnumDefinitions.h" + +-void Gradjx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int control_type){ ++void Gradjx( Vec* pgradient,double* pnorm_grad, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int control_index){ + +- int i; +- int dim; +- int numberofvertices; +- Vec gradient = NULL; ++ int i; ++ int numberofvertices; ++ double norm_grad; ++ int *control_type = NULL; ++ Vec gradient = NULL; + + /*retrieve some parameters: */ +- parameters->FindParam(&dim,MeshDimensionEnum); ++ parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); + numberofvertices=vertices->NumberOfVertices(); + + /*Allocate gradient: */ +@@ -26,13 +27,18 @@ + /*Compute gradients: */ + for (i=0;iSize();i++){ + Element* element=(Element*)elements->GetObjectByOffset(i); +- element->Gradj(gradient,control_type); ++ element->Gradj(gradient,control_type[control_index]); + } + + /*Assemble vector: */ + VecAssemblyBegin(gradient); + VecAssemblyEnd(gradient); + +- /*Assign output pointers: */ ++ /*Clean up and return*/ ++ xfree((void**)&control_type); ++ if(pnorm_grad){ ++ VecNorm(gradient,NORM_INFINITY,&norm_grad); ++ *pnorm_grad=norm_grad; ++ } + *pgradient=gradient; + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.h (revision 11309) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.h (revision 11310) +@@ -9,7 +9,7 @@ + #include "../../objects/objects.h" + + /* local prototypes: */ +-void Gradjx(Vec* pgrad_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int control_type); ++void Gradjx(Vec* pgrad_g,double* pgrad_norm,Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int control_type); + + #endif /* _GRADJX_H */ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.cpp (revision 11309) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.cpp (revision 11310) +@@ -7,7 +7,8 @@ + void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ + + /*input datasets: */ +- int control_type; ++ int control_index; ++ double grad_norm; + Elements *elements = NULL; + Nodes *nodes = NULL; + Vertices *vertices = NULL; +@@ -31,7 +32,7 @@ + FetchMatlabData((DataSet**)&loads,LOADS); + FetchMatlabData((DataSet**)&materials,MATERIALS); + FetchMatlabData(¶meters,PARAMETERS); +- FetchMatlabData(&control_type,CONTROLTYPE); ++ FetchMatlabData(&control_index,CONTROLINDEX); + + /*configure: */ + elements-> Configure(elements,loads, nodes,vertices, materials,parameters); +@@ -39,9 +40,10 @@ + loads-> Configure(elements, loads, nodes,vertices, materials,parameters); + + /*!Call core code: */ +- Gradjx(&gradient, elements,nodes, vertices,loads, materials,parameters, control_type); ++ Gradjx(&gradient,&grad_norm,elements,nodes, vertices,loads, materials,parameters, control_index); + + /*write output : */ ++ WriteMatlabData(GRADNORM,grad_norm); + WriteMatlabData(GRADG,gradient); + + /*Free ressources: */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.h (revision 11309) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.h (revision 11310) +@@ -23,14 +23,15 @@ + #define LOADS (mxArray*)prhs[3] + #define MATERIALS (mxArray*)prhs[4] + #define PARAMETERS (mxArray*)prhs[5] +-#define CONTROLTYPE (mxArray*)prhs[6] ++#define CONTROLINDEX (mxArray*)prhs[6] + + /* serial output macros: */ + #define GRADG (mxArray**)&plhs[0] ++#define GRADNORM (mxArray**)&plhs[1] + + /* serial arg counts: */ + #undef NLHS +-#define NLHS 1 ++#define NLHS 2 + #undef NRHS + #define NRHS 7 + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11309) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11310) +@@ -19,36 +19,38 @@ + error('bad usage'); + end + +- %recover parameters common to all solutions +- num_controls=femmodel.parameters.InversionNumControlParameters; +- control_type=femmodel.parameters.InversionControlParameters; +- control_steady=femmodel.parameters.ControlSteady; +- gradient_scaling_list=femmodel.parameters.InversionGradientScaling; ++%recover parameters common to all solutions ++num_controls=femmodel.parameters.InversionNumControlParameters; ++control_type=femmodel.parameters.InversionControlParameters; ++control_steady=femmodel.parameters.ControlSteady; ++gradient_scaling_list=femmodel.parameters.InversionGradientScaling; ++gradient_scaling=10^100; + +- for i=1:num_controls, ++for i=1:num_controls, + +- issmprintf(VerboseControl,[' compute gradient of J with respect to %s'],EnumToString(control_type(i))); +- grad=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type(i)); ++ issmprintf(VerboseControl,[' compute gradient of J with respect to %s'],EnumToString(control_type(i))); ++ [grad norm_grad]=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,i-1); + +- if orthogonalize, +- issmprintf(VerboseControl,'%s',[' orthogonalization']); +- old_gradient=ControlInputGetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,control_type(i)); +- new_gradient=Orth(grad,old_gradient); +- else +- new_gradient=grad; +- end ++ if orthogonalize, ++ issmprintf(VerboseControl,'%s',[' orthogonalization']); ++ old_gradient=ControlInputGetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,control_type(i)); ++ new_gradient=Orth(grad,old_gradient); ++ else ++ new_gradient=grad; ++ end + +- %Get scaling factor of current control: +- norm_grad=norm(new_gradient,inf); +- if(norm_grad<=0), error(['||∂J/∂α||∞ = 0 gradient norm of J with respect to ' EnumToString(control_type(i)) ' is zero']); end +- if(isnan(norm_grad)), error(['||∂J/∂α||∞ = NaN gradient norm of J with respect to ' EnumToString(control_type(i)) ' is NaN' ]); end +- gradient_scaling=gradient_scaling_list(step,i)/norm_grad; ++ %Get scaling factor of current control: ++ norm_grad=norm(new_gradient,inf); ++ if(norm_grad<=0), error(['||∂J/∂α||∞ = 0 gradient norm of J with respect to ' EnumToString(control_type(i)) ' is zero']); end ++ if(isnan(norm_grad)), error(['||∂J/∂α||∞ = NaN gradient norm of J with respect to ' EnumToString(control_type(i)) ' is NaN' ]); end ++ gradient_scaling=min(gradient_scaling,gradient_scaling_list(step,i)/norm_grad); + +- %plug back into inputs: +- [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputSetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),new_gradient); +- end ++ %plug back into inputs: ++ [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputSetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),new_gradient); + +- %Scale all gradients +- for i=1:num_controls, +- [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),gradient_scaling); +- end ++end ++ ++%Scale all gradients ++for i=1:num_controls, ++ [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),gradient_scaling); ++end Index: /issm/oecreview/Archive/11300-11318/ISSM-11310-11311.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11310-11311.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11310-11311.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/solveparallel.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/solveparallel.m (revision 11310) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/solveparallel.m (revision 11311) +@@ -13,7 +13,7 @@ + + %First, build a runtime name that is unique, that we will use to create + %directories, name jobs, etc ... +- c=clock; md.private.runtimename=sprintf('%s-%i-%i-%i-%i-%i-%i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid')); ++ c=clock; md.private.runtimename=sprintf('%s-%02i-%02i-%04i-%02i-%02i-%02i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid')); + + if verLessThan('matlab', '7.6') + BuildQueueScript(cluster,md); Index: /issm/oecreview/Archive/11300-11318/ISSM-11311-11312.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11311-11312.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11311-11312.diff (revision 11515) @@ -0,0 +1,24 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test223.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test223.m (revision 11311) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test223.m (revision 11312) +@@ -17,7 +17,6 @@ + md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; + + md.cluster=none; +-md.verbose=verbose('all'); + md=solve(md,DiagnosticSolutionEnum); + + %Fields and tolerances to track changes +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test626.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test626.m (revision 11311) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test626.m (revision 11312) +@@ -24,6 +24,7 @@ + md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1); + md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); + ++md.verbose.control=1; + md.cluster=generic('name',oshostname(),'np',3); + md=solve(md,BalancethicknessSolutionEnum); + Index: /issm/oecreview/Archive/11300-11318/ISSM-11312-11313.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11312-11313.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11312-11313.diff (revision 11515) @@ -0,0 +1,1265 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 11313) +@@ -13,55 +13,39 @@ + #include "../solvers/solvers.h" + + void gradient_core(FemModel* femmodel,int step,bool orthogonalize){ +- +- /*parameters: */ +- bool control_steady; +- int num_controls; +- int *control_type = NULL; +- double *optscal_list = NULL; +- double optscal=1.e+100,norm_grad; + + /*Intermediaries*/ +- Vec new_gradient=NULL; +- Vec gradient=NULL; +- Vec old_gradient=NULL; ++ double norm_inf; ++ double *norm_list = NULL; ++ Vec new_gradient = NULL; ++ Vec gradient = NULL; ++ Vec old_gradient = NULL; + +- /*retrieve parameters:*/ +- femmodel->parameters->FindParam(&control_steady,ControlSteadyEnum); +- femmodel->parameters->FindParam(&num_controls,InversionNumControlParametersEnum); +- femmodel->parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); +- femmodel->parameters->FindParam(&optscal_list,NULL,NULL,InversionGradientScalingEnum); ++ /*Compute gradient*/ ++ _printf_(VerboseControl()," compute cost function gradient\n"); ++ Gradjx(&gradient,&norm_list,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters); + +- /*Compute and norm gradient of all controls*/ +- for (int i=0;ielements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters); ++ Orthx(&new_gradient,gradient,old_gradient); VecFree(&old_gradient); VecFree(&gradient); ++ } ++ else{ ++ new_gradient=gradient; ++ } + +- _printf_(VerboseControl()," compute gradient of J with respect to %s\n",EnumToStringx(control_type[i])); +- Gradjx(&gradient,&norm_grad,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,i); ++ /*Check that gradient is clean*/ ++ VecNorm(new_gradient,NORM_INFINITY,&norm_inf); ++ if(norm_inf<=0) _error_("||∂J/∂α||∞ = 0 gradient norm is zero"); ++ if(isnan(norm_inf))_error_("||∂J/∂α||∞ = NaN gradient norm is NaN"); + +- if (orthogonalize){ +- _printf_(VerboseControl()," orthogonalization\n"); +- ControlInputGetGradientx(&old_gradient,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,control_type[i]); +- Orthx(&new_gradient,gradient,old_gradient); VecFree(&old_gradient); VecFree(&gradient); +- } +- else{ +- new_gradient=gradient; +- } ++ /*plug back into inputs: */ ++ ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,new_gradient); ++ VecFree(&new_gradient); + +- /*Get scaling factor of current control:*/ +- VecNorm(new_gradient,NORM_INFINITY,&norm_grad); +- if(norm_grad<=0) _error_("||∂J/∂α||∞ = 0 gradient norm of J with respect to %s is zero",EnumToStringx(control_type[i])); +- if(isnan(norm_grad))_error_("||∂J/∂α||∞ = NaN gradient norm of J with respect to %s is NaN" ,EnumToStringx(control_type[i])); +- optscal=min(optscal,optscal_list[num_controls*step+i]/norm_grad); +- +- /*plug back into inputs: */ +- ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i],new_gradient); +- VecFree(&new_gradient); +- } +- + /*Scale Gradients*/ +- for (int i=0;ielements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i],optscal); ++ ControlInputScaleGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,norm_list,step); + + /*Clean up and return*/ +- xfree((void**)&control_type); +- xfree((void**)&optscal_list); ++ xfree((void**)&norm_list); + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11313) +@@ -84,7 +84,7 @@ + InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,FrictionCoefficientEnum,VertexEnum); + adjointdiagnostic_core(user->femmodel); + //Gradjx(&gradient,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaterialsRheologyBbarEnum); +- Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,0); ++ Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + VecScale(gradient,-1.); + VecCopy(gradient,G); + VecFree(&gradient); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (revision 11313) +@@ -8,21 +8,34 @@ + #include "../../toolkits/toolkits.h" + #include "../../EnumDefinitions/EnumDefinitions.h" + +-void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name,double* gradient){ ++void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* gradient){ + +- for(int i=0;iSize();i++){ +- Element* element=(Element*)elements->GetObjectByOffset(i); +- element->ControlInputSetGradient(gradient,name); ++ /*Intermediaries*/ ++ int num_controls; ++ int *control_type = NULL; ++ ++ /*Retrieve some parameters*/ ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); ++ ++ for(int i=0;iSize();j++){ ++ Element* element=(Element*)elements->GetObjectByOffset(j); ++ element->ControlInputSetGradient(gradient,control_type[i],i); ++ } + } + ++ /*Clean up and return*/ ++ xfree((void**)&control_type); ++ + } +-void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name,Vec gradient){ ++void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec gradient){ + + /*Serialize gradient*/ + double* serial_gradient=NULL; + VecToMPISerial(&serial_gradient,gradient); + +- ControlInputSetGradientx(elements,nodes,vertices, loads, materials, parameters, name,serial_gradient); ++ ControlInputSetGradientx(elements,nodes,vertices, loads, materials, parameters,serial_gradient); + + /*Clean up and return*/ + xfree((void**)&serial_gradient); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h (revision 11313) +@@ -7,7 +7,7 @@ + #include "../../objects/objects.h" + #include "../../Container/Container.h" + +-void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,double* gradient); +-void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,Vec gradient); ++void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,double* gradient); ++void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,Vec gradient); + + #endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 11313) +@@ -9,36 +9,57 @@ + #include "../../toolkits/toolkits.h" + #include "../../EnumDefinitions/EnumDefinitions.h" + +-void Gradjx( Vec* pgradient,double* pnorm_grad, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int control_index){ ++void Gradjx(Vec* pgradient,double** pnorm_list, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){ + +- int i; +- int numberofvertices; +- double norm_grad; +- int *control_type = NULL; +- Vec gradient = NULL; ++ int i,j,numberofvertices; ++ int num_controls; ++ double norm_inf; ++ double *norm_list = NULL; ++ int *control_type = NULL; ++ Vec gradient = NULL; ++ Vec *gradient_list = NULL; + + /*retrieve some parameters: */ ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); _assert_(num_controls); + parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); + numberofvertices=vertices->NumberOfVertices(); + +- /*Allocate gradient: */ +- gradient=NewVec(numberofvertices); ++ /*Allocate gradient_list */ ++ gradient_list = (Vec*)xmalloc(num_controls*sizeof(Vec)); ++ norm_list = (double*)xmalloc(num_controls*sizeof(double)); ++ for(i=0;iSize();i++){ +- Element* element=(Element*)elements->GetObjectByOffset(i); +- element->Gradj(gradient,control_type[control_index]); ++ /*Compute all gradient_list*/ ++ for(i=0;iSize();j++){ ++ Element* element=(Element*)elements->GetObjectByOffset(j); ++ element->Gradj(gradient_list[i],control_type[i],i); ++ } ++ ++ VecAssemblyBegin(gradient_list[i]); ++ VecAssemblyEnd(gradient_list[i]); ++ ++ VecNorm(gradient_list[i],NORM_INFINITY,&norm_list[i]); + } + +- /*Assemble vector: */ +- VecAssemblyBegin(gradient); +- VecAssemblyEnd(gradient); ++ /*Add all gradient_list together*/ ++ for(i=0;iNumberOfVertices()); ++ /*Intermediaries*/ ++ int num_controls; ++ int *control_type = NULL; ++ Vec gradient=NULL; + +- for(int i=0;iSize();i++){ +- Element* element=(Element*)elements->GetObjectByOffset(i); +- element->ControlInputGetGradient(gradient,name); ++ /*Retrieve some parameters*/ ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); ++ ++ /*Allocate and populate gradient*/ ++ gradient=NewVec(num_controls*vertices->NumberOfVertices()); ++ ++ for(int i=0;iSize();j++){ ++ Element* element=(Element*)elements->GetObjectByOffset(j); ++ element->ControlInputGetGradient(gradient,control_type[i],i); ++ } + } + + VecAssemblyBegin(gradient); + VecAssemblyEnd(gradient); + +- /*Assign output pointers:*/ ++ /*Clean up and return*/ ++ xfree((void**)&control_type); + *pgradient=gradient; + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h (revision 11313) +@@ -7,6 +7,6 @@ + #include "../../objects/objects.h" + #include "../../Container/Container.h" + +-void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name); ++void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters); + + #endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (revision 11313) +@@ -8,11 +8,34 @@ + #include "../../toolkits/toolkits.h" + #include "../../EnumDefinitions/EnumDefinitions.h" + +-void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name,double scale){ ++void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* norm_list,int step){ + +- for(int i=0;iSize();i++){ +- Element* element=(Element*)elements->GetObjectByOffset(i); +- element->ControlInputScaleGradient(name,scale); ++ /*Intermediaries*/ ++ int i,j,num_controls; ++ int *control_type = NULL; ++ double *scalar_list = NULL; ++ double scalar; ++ ++ ++ /*Retrieve some parameters*/ ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); ++ parameters->FindParam(&scalar_list,NULL,NULL,InversionGradientScalingEnum); ++ ++ /*Compute scaling factor*/ ++ scalar=scalar_list[0]/norm_list[0]; ++ for(i=0;iSize();j++){ ++ Element* element=(Element*)elements->GetObjectByOffset(j); ++ element->ControlInputScaleGradient(control_type[i],scalar); ++ } ++ } ++ ++ /*Clean up and return*/ ++ xfree((void**)&control_type); ++ xfree((void**)&scalar_list); + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h (revision 11313) +@@ -7,6 +7,6 @@ + #include "../../objects/objects.h" + #include "../../Container/Container.h" + +-void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,int name,double scale); ++void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,double* norm_list,int step); + + #endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11313) +@@ -89,7 +89,7 @@ + #endif + + #ifdef _HAVE_CONTROL_ +- virtual void Gradj(Vec gradient,int control_type)=0; ++ virtual void Gradj(Vec gradient,int control_type,int control_index)=0; + virtual double ThicknessAbsMisfit(bool process_units ,int weight_index)=0; + virtual double SurfaceAbsVelMisfit(bool process_units ,int weight_index)=0; + virtual double SurfaceRelVelMisfit(bool process_units ,int weight_index)=0; +@@ -99,8 +99,8 @@ + virtual double ThicknessAbsGradient(bool process_units,int weight_index)=0; + virtual double RheologyBbarAbsGradient(bool process_units,int weight_index)=0; + virtual double DragCoefficientAbsGradient(bool process_units,int weight_index)=0; +- virtual void ControlInputGetGradient(Vec gradient,int enum_type)=0; +- virtual void ControlInputSetGradient(double* gradient,int enum_type)=0; ++ virtual void ControlInputGetGradient(Vec gradient,int enum_type,int control_index)=0; ++ virtual void ControlInputSetGradient(double* gradient,int enum_type,int control_index)=0; + virtual void ControlInputScaleGradient(int enum_type, double scale)=0; + virtual void InputControlUpdate(double scalar,bool save_parameter)=0; + #endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11313) +@@ -3265,7 +3265,7 @@ + } + /*}}}*/ + /*FUNCTION Tria::ControlInputGetGradient{{{1*/ +-void Tria::ControlInputGetGradient(Vec gradient,int enum_type){ ++void Tria::ControlInputGetGradient(Vec gradient,int enum_type,int control_index){ + + int doflist1[NUMVERTICES]; + Input* input=NULL; +@@ -3279,7 +3279,7 @@ + if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + +- this->GetDofList1(&doflist1[0]); ++ GradientIndexing(&doflist1[0],control_index); + ((ControlInput*)input)->GetGradient(gradient,&doflist1[0]); + + }/*}}}*/ +@@ -3300,7 +3300,7 @@ + ((ControlInput*)input)->ScaleGradient(scale); + }/*}}}*/ + /*FUNCTION Tria::ControlInputSetGradient{{{1*/ +-void Tria::ControlInputSetGradient(double* gradient,int enum_type){ ++void Tria::ControlInputSetGradient(double* gradient,int enum_type,int control_index){ + + int doflist1[NUMVERTICES]; + double grad_list[NUMVERTICES]; +@@ -3316,7 +3316,7 @@ + if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + +- this->GetDofList1(&doflist1[0]); ++ GradientIndexing(&doflist1[0],control_index); + for(int i=0;iinputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); + Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + +@@ -3423,7 +3423,7 @@ + } + /*}}}*/ + /*FUNCTION Tria::GradjBMacAyeal{{{1*/ +-void Tria::GradjBMacAyeal(Vec gradient){ ++void Tria::GradjBMacAyeal(Vec gradient,int control_index){ + + /*Intermediaries*/ + int i,ig; +@@ -3438,14 +3438,14 @@ + + /* Get node coordinates and dof list: */ + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); +- GetDofList1(&doflist[0]); ++ GradientIndexing(&doflist[0],control_index); + + /*Retrieve all inputs*/ +- Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); +- Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); +- Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); +- Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); +- Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); ++ Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); ++ Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); + Input* rheologyb_input=matice->inputs->GetInput(MaterialsRheologyBbarEnum); _assert_(rheologyb_input); + + /* Start looping on the number of gaussian points: */ +@@ -3480,7 +3480,7 @@ + } + /*}}}*/ + /*FUNCTION Tria::GradjDragMacAyeal {{{1*/ +-void Tria::GradjDragMacAyeal(Vec gradient){ ++void Tria::GradjDragMacAyeal(Vec gradient,int control_index){ + + int i,ig; + int analysis_type; +@@ -3501,16 +3501,16 @@ + /*retrive parameters: */ + parameters->FindParam(&analysis_type,AnalysisTypeEnum); + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); +- GetDofList1(&doflist1[0]); ++ GradientIndexing(&doflist1[0],control_index); + + /*Build frictoin element, needed later: */ + friction=new Friction("2d",inputs,matpar,analysis_type); + + /*Retrieve all inputs we will be needing: */ +- Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); +- Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); +- Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); +- Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); ++ Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* dragcoefficient_input=inputs->GetInput(FrictionCoefficientEnum); _assert_(dragcoefficient_input); + + /* Start looping on the number of gaussian points: */ +@@ -3567,7 +3567,7 @@ + } + /*}}}*/ + /*FUNCTION Tria::GradjDragGradient{{{1*/ +-void Tria::GradjDragGradient(Vec gradient, int weight_index){ ++void Tria::GradjDragGradient(Vec gradient, int weight_index,int control_index){ + + int i,ig; + int doflist1[NUMVERTICES]; +@@ -3581,7 +3581,7 @@ + /*Retrieve all inputs we will be needing: */ + if(IsFloating())return; + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); +- GetDofList1(&doflist1[0]); ++ GradientIndexing(&doflist1[0],control_index); + Input* dragcoefficient_input=inputs->GetInput(FrictionCoefficientEnum); _assert_(dragcoefficient_input); + Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); + +@@ -3611,16 +3611,15 @@ + } + /*}}}*/ + /*FUNCTION Tria::GradjDhDtBalancedthickness{{{1*/ +-void Tria::GradjDhDtBalancedthickness(Vec gradient){ ++void Tria::GradjDhDtBalancedthickness(Vec gradient,int control_index){ + + /*Intermediaries*/ + int doflist1[NUMVERTICES]; + double lambda[NUMVERTICES]; + double gradient_g[NUMVERTICES]; + +- GetDofList1(&doflist1[0]); +- + /*Compute Gradient*/ ++ GradientIndexing(&doflist1[0],control_index); + GetInputListOnVertices(&lambda[0],AdjointEnum); + for(int i=0;iGetInput(AdjointEnum); _assert_(adjoint_input); +@@ -3671,7 +3670,7 @@ + } + /*}}}*/ + /*FUNCTION Tria::GradjVyBalancedthickness{{{1*/ +-void Tria::GradjVyBalancedthickness(Vec gradient){ ++void Tria::GradjVyBalancedthickness(Vec gradient,int control_index){ + + /*Intermediaries*/ + int i,ig; +@@ -3685,7 +3684,7 @@ + + /* Get node coordinates and dof list: */ + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); +- GetDofList1(&doflist1[0]); ++ GradientIndexing(&doflist1[0],control_index); + + /*Retrieve all inputs we will be needing: */ + Input* adjoint_input=inputs->GetInput(AdjointEnum); _assert_(adjoint_input); +@@ -3712,6 +3711,20 @@ + delete gauss; + } + /*}}}*/ ++/*FUNCTION Tria::GradientIndexing{{{1*/ ++void Tria::GradientIndexing(int* indexing,int control_index){ ++ ++ /*Get some parameters*/ ++ int num_controls; ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ ++ /*get gradient indices*/ ++ for(int i=0;inodes[i]->GetVertexDof() + control_index; ++ } ++ ++} ++/*}}}*/ + /*FUNCTION Tria::RheologyBbarAbsGradient{{{1*/ + double Tria::RheologyBbarAbsGradient(bool process_units,int weight_index){ + +@@ -4224,6 +4237,7 @@ + + /*Clean up and return*/ + delete gauss; ++ xfree((void**)&responses); + return pe; + } + /*}}}*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11313) +@@ -139,18 +139,19 @@ + + #ifdef _HAVE_CONTROL_ + double DragCoefficientAbsGradient(bool process_units,int weight_index); +- void Gradj(Vec gradient,int control_type); +- void GradjBGradient(Vec gradient,int weight_index); +- void GradjBMacAyeal(Vec gradient); +- void GradjDragMacAyeal(Vec gradient); +- void GradjDragStokes(Vec gradient); +- void GradjDragGradient(Vec gradient,int weight_index); +- void GradjDhDtBalancedthickness(Vec gradient); +- void GradjVxBalancedthickness(Vec gradient); +- void GradjVyBalancedthickness(Vec gradient); +- void ControlInputGetGradient(Vec gradient,int enum_type); ++ void GradientIndexing(int* indexing,int control_index); ++ void Gradj(Vec gradient,int control_type,int control_index); ++ void GradjBGradient(Vec gradient,int weight_index,int control_index); ++ void GradjBMacAyeal(Vec gradient,int control_index); ++ void GradjDragMacAyeal(Vec gradient,int control_index); ++ void GradjDragStokes(Vec gradient,int control_index); ++ void GradjDragGradient(Vec gradient,int weight_index,int control_index); ++ void GradjDhDtBalancedthickness(Vec gradient,int control_index); ++ void GradjVxBalancedthickness(Vec gradient,int control_index); ++ void GradjVyBalancedthickness(Vec gradient,int control_index); ++ void ControlInputGetGradient(Vec gradient,int enum_type,int control_index); + void ControlInputScaleGradient(int enum_type,double scale); +- void ControlInputSetGradient(double* gradient,int enum_type); ++ void ControlInputSetGradient(double* gradient,int enum_type,int control_index); + double RheologyBbarAbsGradient(bool process_units,int weight_index); + double ThicknessAbsMisfit( bool process_units,int weight_index); + double SurfaceAbsVelMisfit( bool process_units,int weight_index); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11313) +@@ -4313,7 +4313,7 @@ + + #ifdef _HAVE_CONTROL_ + /*FUNCTION Penta::ControlInputGetGradient{{{1*/ +-void Penta::ControlInputGetGradient(Vec gradient,int enum_type){ ++void Penta::ControlInputGetGradient(Vec gradient,int enum_type,int control_index){ + + int doflist1[NUMVERTICES]; + Input* input=NULL; +@@ -4328,7 +4328,7 @@ + if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + +- this->GetDofList1(&doflist1[0]); ++ GradientIndexing(&doflist1[0],control_index); + ((ControlInput*)input)->GetGradient(gradient,&doflist1[0]); + + }/*}}}*/ +@@ -4349,7 +4349,7 @@ + ((ControlInput*)input)->ScaleGradient(scale); + }/*}}}*/ + /*FUNCTION Penta::ControlInputSetGradient{{{1*/ +-void Penta::ControlInputSetGradient(double* gradient,int enum_type){ ++void Penta::ControlInputSetGradient(double* gradient,int enum_type,int control_index){ + + int doflist1[NUMVERTICES]; + double grad_list[NUMVERTICES]; +@@ -4365,7 +4365,7 @@ + if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + +- this->GetDofList1(&doflist1[0]); ++ GradientIndexing(&doflist1[0],control_index); + for(int i=0;iSetGradient(grad_input); +@@ -4433,8 +4433,22 @@ + return pe; + } + /*}}}*/ ++/*FUNCTION Penta::GradientIndexing{{{1*/ ++void Penta::GradientIndexing(int* indexing,int control_index){ ++ ++ /*Get some parameters*/ ++ int num_controls; ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ ++ /*get gradient indices*/ ++ for(int i=0;inodes[i]->GetVertexDof() + control_index; ++ } ++ ++} ++/*}}}*/ + /*FUNCTION Penta::Gradj {{{1*/ +-void Penta::Gradj(Vec gradient,int control_type){ ++void Penta::Gradj(Vec gradient,int control_type,int control_index){ + /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/ + + int i,approximation; +@@ -4450,13 +4464,13 @@ + inputs->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case MacAyealApproximationEnum: +- GradjDragMacAyeal(gradient); ++ GradjDragMacAyeal(gradient,control_index); + break; + case PattynApproximationEnum: +- GradjDragPattyn(gradient); ++ GradjDragPattyn(gradient,control_index); + break; + case StokesApproximationEnum: +- GradjDragStokes(gradient); ++ GradjDragStokes(gradient,control_index); + break; + case NoneApproximationEnum: + /*Gradient is 0*/ +@@ -4470,13 +4484,13 @@ + inputs->GetInputValue(&approximation,ApproximationEnum); + switch(approximation){ + case MacAyealApproximationEnum: +- GradjBbarMacAyeal(gradient); ++ GradjBbarMacAyeal(gradient,control_index); + break; + case PattynApproximationEnum: +- GradjBbarPattyn(gradient); ++ GradjBbarPattyn(gradient,control_index); + break; + case StokesApproximationEnum: +- GradjBbarStokes(gradient); ++ GradjBbarStokes(gradient,control_index); + break; + case NoneApproximationEnum: + /*Gradient is 0*/ +@@ -4509,13 +4523,13 @@ + case DragCoefficientAbsGradientEnum: + if (!IsOnBed()) return; + tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. +- tria->GradjDragGradient(gradient,resp); ++ tria->GradjDragGradient(gradient,resp,control_index); + delete tria->matice; delete tria; + break; + case RheologyBbarAbsGradientEnum: + if (!IsOnBed()) return; + tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. +- tria->GradjBGradient(gradient,resp); ++ tria->GradjBGradient(gradient,resp,control_index); + delete tria->matice; delete tria; + break; + default: +@@ -4525,19 +4539,19 @@ + } + /*}}}*/ + /*FUNCTION Penta::GradjDragMacAyeal {{{1*/ +-void Penta::GradjDragMacAyeal(Vec gradient){ ++void Penta::GradjDragMacAyeal(Vec gradient,int control_index){ + + /*Gradient is 0 if on shelf or not on bed*/ + if(IsFloating() || !IsOnBed()) return; + + /*Spawn tria*/ + Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. +- tria->GradjDragMacAyeal(gradient); ++ tria->GradjDragMacAyeal(gradient,control_index); + delete tria->matice; delete tria; + + } /*}}}*/ + /*FUNCTION Penta::GradjDragPattyn {{{1*/ +-void Penta::GradjDragPattyn(Vec gradient){ ++void Penta::GradjDragPattyn(Vec gradient,int control_index){ + + int i,j,ig; + int analysis_type; +@@ -4558,9 +4572,9 @@ + + /*Retrieve all inputs and parameters*/ + parameters->FindParam(&analysis_type,AnalysisTypeEnum); ++ GradientIndexing(&doflist1[0],control_index); + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); + for(i=0;iGetInput(AdjointxEnum); _assert_(adjointx_input); + Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); +@@ -4608,7 +4622,7 @@ + } + /*}}}*/ + /*FUNCTION Penta::GradjDragStokes {{{1*/ +-void Penta::GradjDragStokes(Vec gradient){ ++void Penta::GradjDragStokes(Vec gradient,int control_index){ + + int i,j,ig; + int analysis_type; +@@ -4633,14 +4647,14 @@ + parameters->FindParam(&analysis_type,AnalysisTypeEnum); + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); + for(i=0;iGetInput(FrictionCoefficientEnum); _assert_(drag_input); +- Input* vx_input =inputs->GetInput(VxEnum); _assert_(vx_input); +- Input* vy_input =inputs->GetInput(VyEnum); _assert_(vy_input); +- Input* vz_input =inputs->GetInput(VzEnum); _assert_(vz_input); +- Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); +- Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); +- Input* adjointz_input=inputs->GetInput(AdjointzEnum); _assert_(adjointz_input); ++ Input* vx_input =inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input =inputs->GetInput(VyEnum); _assert_(vy_input); ++ Input* vz_input =inputs->GetInput(VzEnum); _assert_(vz_input); ++ Input* adjointx_input=inputs->GetInput(AdjointxEnum); _assert_(adjointx_input); ++ Input* adjointy_input=inputs->GetInput(AdjointyEnum); _assert_(adjointy_input); ++ Input* adjointz_input=inputs->GetInput(AdjointzEnum); _assert_(adjointz_input); + + /*Build frictoin element, needed later: */ + friction=new Friction("3d",inputs,matpar,analysis_type); +@@ -4700,7 +4714,7 @@ + } + /*}}}*/ + /*FUNCTION Penta::GradjBbarMacAyeal {{{1*/ +-void Penta::GradjBbarMacAyeal(Vec gradient){ ++void Penta::GradjBbarMacAyeal(Vec gradient,int control_index){ + + /*This element should be collapsed into a tria element at its base*/ + if (!IsOnBed()) return; +@@ -4710,7 +4724,7 @@ + + /*Collapse element to the base*/ + Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face). +- tria->GradjBMacAyeal(gradient); ++ tria->GradjBMacAyeal(gradient,control_index); + delete tria->matice; delete tria; + + /*delete Average B*/ +@@ -4718,7 +4732,7 @@ + + } /*}}}*/ + /*FUNCTION Penta::GradjBbarPattyn {{{1*/ +-void Penta::GradjBbarPattyn(Vec gradient){ ++void Penta::GradjBbarPattyn(Vec gradient,int control_index){ + + /*Gradient is computed on bed only (Bbar)*/ + if (!IsOnBed()) return; +@@ -4728,14 +4742,14 @@ + + /*Collapse element to the base*/ + Tria* tria=(Tria*)SpawnTria(0,1,2); +- tria->GradjBMacAyeal(gradient); //We use MacAyeal as an estimate for now ++ tria->GradjBMacAyeal(gradient,control_index); //We use MacAyeal as an estimate for now + delete tria->matice; delete tria; + + /*delete Average B*/ + this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum); + } /*}}}*/ + /*FUNCTION Penta::GradjBbarStokes {{{1*/ +-void Penta::GradjBbarStokes(Vec gradient){ ++void Penta::GradjBbarStokes(Vec gradient,int control_index){ + + /*Gradient is computed on bed only (Bbar)*/ + if (!IsOnBed()) return; +@@ -4745,7 +4759,7 @@ + + /*Collapse element to the base*/ + Tria* tria=(Tria*)SpawnTria(0,1,2); +- tria->GradjBMacAyeal(gradient); //We use MacAyeal as an estimate for now ++ tria->GradjBMacAyeal(gradient,control_index); //We use MacAyeal as an estimate for now + delete tria->matice; delete tria; + + /*delete Average B*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11313) +@@ -140,16 +140,17 @@ + + #ifdef _HAVE_CONTROL_ + double DragCoefficientAbsGradient(bool process_units,int weight_index); +- void Gradj(Vec gradient,int control_type); +- void GradjDragMacAyeal(Vec gradient); +- void GradjDragPattyn(Vec gradient); +- void GradjDragStokes(Vec gradient); +- void GradjBbarMacAyeal(Vec gradient); +- void GradjBbarPattyn(Vec gradient); +- void GradjBbarStokes(Vec gradient); +- void ControlInputGetGradient(Vec gradient,int enum_type); ++ void GradientIndexing(int* indexing,int control_index); ++ void Gradj(Vec gradient,int control_type,int control_index); ++ void GradjDragMacAyeal(Vec gradient,int control_index); ++ void GradjDragPattyn(Vec gradient,int control_index); ++ void GradjDragStokes(Vec gradient,int control_index); ++ void GradjBbarMacAyeal(Vec gradient,int control_index); ++ void GradjBbarPattyn(Vec gradient,int control_index); ++ void GradjBbarStokes(Vec gradient,int control_index); ++ void ControlInputGetGradient(Vec gradient,int enum_type,int control_index); + void ControlInputScaleGradient(int enum_type,double scale); +- void ControlInputSetGradient(double* gradient,int enum_type); ++ void ControlInputSetGradient(double* gradient,int enum_type,int control_index); + double RheologyBbarAbsGradient(bool process_units,int weight_index); + double ThicknessAbsMisfit( bool process_units,int weight_index); + double SurfaceAbsVelMisfit( bool process_units,int weight_index); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp (revision 11313) +@@ -13,7 +13,6 @@ + Loads *loads = NULL; + Materials *materials = NULL; + Parameters *parameters = NULL; +- int control_type; + Vec gradient = NULL; + + /* output datasets: elements and loads*/ +@@ -31,7 +30,6 @@ + FetchMatlabData((DataSet**)&loads,LOADSIN); + FetchMatlabData((DataSet**)&materials,MATERIALS); + FetchMatlabData(¶meters,PARAMETERS); +- FetchMatlabData(&control_type,CONTROLTYPE); + + /*configure: */ + elements-> Configure(elements,loads, nodes,vertices, materials,parameters); +@@ -40,7 +38,7 @@ + materials-> Configure(elements, loads, nodes,vertices, materials,parameters); + + /*!core code:*/ +- ControlInputGetGradientx(&gradient,elements, nodes,vertices,loads, materials,parameters,control_type); ++ ControlInputGetGradientx(&gradient,elements, nodes,vertices,loads, materials,parameters); + + /*write output datasets: */ + WriteMatlabData(GRADIENT,gradient); +@@ -60,6 +58,6 @@ + void ControlInputGetGradientUsage(void) + { + _printf_(true,"\n"); +- _printf_(true," usage: [gradient] = %s(elements,nodes,vertices,loads, materials,parameters,control_type);\n",__FUNCT__); ++ _printf_(true," usage: [gradient] = %s(elements,nodes,vertices,loads, materials,parameters);\n",__FUNCT__); + _printf_(true,"\n"); + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h (revision 11313) +@@ -22,7 +22,6 @@ + #define LOADSIN (mxArray*)prhs[3] + #define MATERIALS (mxArray*)prhs[4] + #define PARAMETERS (mxArray*)prhs[5] +-#define CONTROLTYPE (mxArray*)prhs[6] + + /* serial output macros: */ + #define GRADIENT (mxArray**)&plhs[0] +@@ -31,6 +30,6 @@ + #undef NLHS + #define NLHS 1 + #undef NRHS +-#define NRHS 7 ++#define NRHS 6 + + #endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp (revision 11313) +@@ -7,14 +7,14 @@ + void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ + + /*input datasets: */ ++int step; + Elements *elements = NULL; + Nodes *nodes = NULL; + Vertices *vertices = NULL; + Loads *loads = NULL; + Materials *materials = NULL; + Parameters *parameters = NULL; +-int control_type; +-double scaling_factor; ++double *norm_list = NULL; + + /*Boot module: */ + MODULEBOOT(); +@@ -29,8 +29,8 @@ + FetchMatlabData((DataSet**)&loads,LOADSIN); + FetchMatlabData((DataSet**)&materials,MATERIALSIN); + FetchMatlabData(¶meters,PARAMETERSIN); +-FetchMatlabData(&control_type,CONTROLTYPE); +-FetchMatlabData(&scaling_factor,SCALE); ++FetchMatlabData(&norm_list,NULL,NULL,NORMLIST); ++FetchMatlabData(&step,STEP); + + /*configure: */ + elements-> Configure(elements,loads, nodes,vertices, materials,parameters); +@@ -38,7 +38,7 @@ + loads-> Configure(elements, loads, nodes,vertices, materials,parameters); + + /*call "x" code layer*/ +-ControlInputScaleGradientx(elements,nodes,vertices,loads, materials,parameters,control_type,scaling_factor); ++ControlInputScaleGradientx(elements,nodes,vertices,loads, materials,parameters,norm_list,step); + + /*write output datasets: */ + WriteMatlabData(ELEMENTS,elements); +@@ -63,6 +63,6 @@ + void ControlInputScaleGradientUsage(void) + { + _printf_(true,"\n"); +- _printf_(true," usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,control_type,scaling_factor);\n",__FUNCT__); ++ _printf_(true," usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,norm_list,step);\n",__FUNCT__); + _printf_(true,"\n"); + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h (revision 11313) +@@ -23,8 +23,8 @@ + #define LOADSIN (mxArray*)prhs[3] + #define MATERIALSIN (mxArray*)prhs[4] + #define PARAMETERSIN (mxArray*)prhs[5] +-#define CONTROLTYPE (mxArray*)prhs[6] +-#define SCALE (mxArray*)prhs[7] ++#define NORMLIST (mxArray*)prhs[6] ++#define STEP (mxArray*)prhs[7] + + /* serial output macros: */ + #define ELEMENTS (mxArray**)&plhs[0] +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h (revision 11313) +@@ -23,8 +23,7 @@ + #define LOADSIN (mxArray*)prhs[3] + #define MATERIALSIN (mxArray*)prhs[4] + #define PARAMETERSIN (mxArray*)prhs[5] +-#define CONTROLTYPE (mxArray*)prhs[6] +-#define GRADIENT (mxArray*)prhs[7] ++#define GRADIENT (mxArray*)prhs[6] + + /* serial output macros: */ + #define ELEMENTS (mxArray**)&plhs[0] +@@ -38,6 +37,6 @@ + #undef NLHS + #define NLHS 6 + #undef NRHS +-#define NRHS 8 ++#define NRHS 7 + + #endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp (revision 11313) +@@ -13,7 +13,6 @@ + Loads *loads = NULL; + Materials *materials = NULL; + Parameters *parameters = NULL; +-int control_type; + double *gradient = NULL; + + /*Boot module: */ +@@ -29,7 +28,6 @@ + FetchMatlabData((DataSet**)&loads,LOADSIN); + FetchMatlabData((DataSet**)&materials,MATERIALSIN); + FetchMatlabData(¶meters,PARAMETERSIN); +-FetchMatlabData(&control_type,CONTROLTYPE); + FetchMatlabData(&gradient,NULL,GRADIENT); + + /*configure: */ +@@ -38,7 +36,7 @@ + loads-> Configure(elements, loads, nodes,vertices, materials,parameters); + + /*call "x" code layer*/ +-ControlInputSetGradientx(elements,nodes,vertices,loads, materials,parameters,control_type,gradient); ++ControlInputSetGradientx(elements,nodes,vertices,loads, materials,parameters,gradient); + + /*write output datasets: */ + WriteMatlabData(ELEMENTS,elements); +@@ -63,6 +61,6 @@ + void ControlInputSetGradientUsage(void) + { + _printf_(true,"\n"); +- _printf_(true," usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,control_type,gradient);\n",__FUNCT__); ++ _printf_(true," usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,gradient);\n",__FUNCT__); + _printf_(true,"\n"); + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.cpp (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.cpp (revision 11313) +@@ -7,8 +7,8 @@ + void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ + + /*input datasets: */ +- int control_index; +- double grad_norm; ++ int control_index,num_controls; ++ double *norm_list = NULL; + Elements *elements = NULL; + Nodes *nodes = NULL; + Vertices *vertices = NULL; +@@ -32,7 +32,7 @@ + FetchMatlabData((DataSet**)&loads,LOADS); + FetchMatlabData((DataSet**)&materials,MATERIALS); + FetchMatlabData(¶meters,PARAMETERS); +- FetchMatlabData(&control_index,CONTROLINDEX); ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); + + /*configure: */ + elements-> Configure(elements,loads, nodes,vertices, materials,parameters); +@@ -40,10 +40,10 @@ + loads-> Configure(elements, loads, nodes,vertices, materials,parameters); + + /*!Call core code: */ +- Gradjx(&gradient,&grad_norm,elements,nodes, vertices,loads, materials,parameters, control_index); ++ Gradjx(&gradient,&norm_list,elements,nodes, vertices,loads, materials,parameters); + + /*write output : */ +- WriteMatlabData(GRADNORM,grad_norm); ++ WriteMatlabData(NORMLIST,norm_list,num_controls,1); + WriteMatlabData(GRADG,gradient); + + /*Free ressources: */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.h (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Gradj/Gradj.h (revision 11313) +@@ -23,16 +23,15 @@ + #define LOADS (mxArray*)prhs[3] + #define MATERIALS (mxArray*)prhs[4] + #define PARAMETERS (mxArray*)prhs[5] +-#define CONTROLINDEX (mxArray*)prhs[6] + + /* serial output macros: */ + #define GRADG (mxArray**)&plhs[0] +-#define GRADNORM (mxArray**)&plhs[1] ++#define NORMLIST (mxArray**)&plhs[1] + + /* serial arg counts: */ + #undef NLHS + #define NLHS 2 + #undef NRHS +-#define NRHS 7 ++#define NRHS 6 + + #endif /* _GRADJ_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/control_core.m (revision 11313) +@@ -49,7 +49,7 @@ + issmprintf(VerboseControl,' compute adjoint state'); + eval(['femmodel=' adjointcore '(femmodel);']); + +- femmodel=gradient_core(femmodel,n,search_scalar==0); ++ femmodel=gradient_core(femmodel,n-1,search_scalar==0); + + %Return gradient if asked + if gradient_only, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11312) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/gradient_core.m (revision 11313) +@@ -19,38 +19,24 @@ + error('bad usage'); + end + +-%recover parameters common to all solutions +-num_controls=femmodel.parameters.InversionNumControlParameters; +-control_type=femmodel.parameters.InversionControlParameters; +-control_steady=femmodel.parameters.ControlSteady; +-gradient_scaling_list=femmodel.parameters.InversionGradientScaling; +-gradient_scaling=10^100; ++issmprintf(VerboseControl,[' compute cost function gradient']); ++[grad norm_list]=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters); + +-for i=1:num_controls, ++if orthogonalize, ++ issmprintf(VerboseControl,'%s',[' orthogonalization']); ++ old_gradient=ControlInputGetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters); ++ new_gradient=Orth(grad,old_gradient); ++else ++ new_gradient=grad; ++end + +- issmprintf(VerboseControl,[' compute gradient of J with respect to %s'],EnumToString(control_type(i))); +- [grad norm_grad]=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,i-1); ++%Check that gradient is clean ++norm_grad=norm(new_gradient,inf); ++if(norm_grad<=0), error(['||∂J/∂α||∞ = 0 gradient norm is zero']); end ++if(isnan(norm_grad)), error(['||∂J/∂α||∞ = NaN gradient norm is NaN' ]); end + +- if orthogonalize, +- issmprintf(VerboseControl,'%s',[' orthogonalization']); +- old_gradient=ControlInputGetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters,control_type(i)); +- new_gradient=Orth(grad,old_gradient); +- else +- new_gradient=grad; +- end ++%plug back into inputs: ++[femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputSetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,new_gradient); + +- %Get scaling factor of current control: +- norm_grad=norm(new_gradient,inf); +- if(norm_grad<=0), error(['||∂J/∂α||∞ = 0 gradient norm of J with respect to ' EnumToString(control_type(i)) ' is zero']); end +- if(isnan(norm_grad)), error(['||∂J/∂α||∞ = NaN gradient norm of J with respect to ' EnumToString(control_type(i)) ' is NaN' ]); end +- gradient_scaling=min(gradient_scaling,gradient_scaling_list(step,i)/norm_grad); +- +- %plug back into inputs: +- [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputSetGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),new_gradient); +- +-end +- + %Scale all gradients +-for i=1:num_controls, +- [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,control_type(i),gradient_scaling); +-end ++[femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials, femmodel.parameters,norm_list,step); Index: /issm/oecreview/Archive/11300-11318/ISSM-11313-11314.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11313-11314.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11313-11314.diff (revision 11515) @@ -0,0 +1,17 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11313) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11314) +@@ -4270,7 +4270,11 @@ + this->inputs->GetInputValue(&converged,ConvergedEnum); + if(converged){ + /*Convert enthalpy into temperature and water fraction*/ +- for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); ++ for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); ++ if(waterfraction[i]<0) _error_("Negative water fraction found in solution vector"); ++ if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); ++ } + + this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,values)); + this->inputs->AddInput(new PentaP1Input(WaterfractionEnum,waterfraction)); Index: /issm/oecreview/Archive/11300-11318/ISSM-11314-11315.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11314-11315.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11314-11315.diff (revision 11515) @@ -0,0 +1,37 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/partition/partitioner.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/partition/partitioner.m (revision 11314) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/partition/partitioner.m (revision 11315) +@@ -98,6 +98,8 @@ + + %extrude if we are in 3D: + if md.mesh.dimension==3, ++ md3d.qmu.vertex_weight=md.qmu.vertex_weight; ++ md3d.qmu.adjacency=md.qmu.adjacency; + md=md3d; + part=project3d(md,'vector',part','type','node'); + end +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/extrude.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/extrude.m (revision 11314) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/extrude.m (revision 11315) +@@ -193,7 +193,7 @@ + md.mesh.elementconnectivity(find(md.mesh.elementconnectivity==0))=NaN; + for i=2:numlayers-1, + md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)... +- =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d; ++ =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d; + end + md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0; + +@@ -215,8 +215,9 @@ + md.mask.elementonwater=project3d(md,'vector',md.mask.elementonwater,'type','element'); + md.mask.vertexonwater=project3d(md,'vector',md.mask.vertexonwater,'type','node'); + if ~isnan(md.inversion.cost_functions_coefficients),md.inversion.cost_functions_coefficients=project3d(md,'vector',md.inversion.cost_functions_coefficients,'type','node');end; ++if ~isnan(md.qmu.partition),md.qmu.partition=project3d(md,'vector',md.qmu.partition','type','node');end + +-%Put lithostatic pressure is there is an existing pressure ++%Put lithostatic pressure if there is an existing pressure + if ~isnan(md.initialization.pressure), + md.initialization.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.z); + end Index: /issm/oecreview/Archive/11300-11318/ISSM-11315-11316.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11315-11316.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11315-11316.diff (revision 11515) @@ -0,0 +1,16 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive226.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive224.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive344.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive228.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11300-11318/ISSM-11316-11317.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11316-11317.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11316-11317.diff (revision 11515) @@ -0,0 +1,586 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/control_core.cpp (revision 11317) +@@ -69,7 +69,7 @@ + + /*Initialize responses: */ + J=(double*)xmalloc(nsteps*sizeof(double)); +- step_responses=(int*)xmalloc(num_responses*sizeof(double)); ++ step_responses=(int*)xmalloc(num_responses*sizeof(int)); + + /*Initialize some of the BrentSearch arguments: */ + optargs.femmodel=femmodel; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11317) +@@ -24,12 +24,14 @@ + void controltao_core(FemModel* femmodel){ + + /*TAO*/ +- int ierr,numberofvertices; +- AppCtx user; +- TaoSolver tao; +- Vec X = NULL; +- Vec XL = NULL; +- Vec XU = NULL; ++ int ierr,numberofvertices; ++ int num_controls; ++ AppCtx user; ++ TaoSolver tao; ++ int *control_list = NULL; ++ Vec X = NULL; ++ Vec XL = NULL; ++ Vec XU = NULL; + + /*Initialize TAO*/ + int argc; char **args=NULL; +@@ -37,6 +39,10 @@ + ierr = TaoInitialize(&argc,&args,(char*)0,""); + if(ierr) _error_("Could not initialize Tao"); + ++ /*Recover some parameters*/ ++ femmodel->parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ femmodel->parameters->FindParam(&control_list,NULL,InversionControlParametersEnum); ++ + /*Initialize TAO*/ + TaoCreate(PETSC_COMM_WORLD,&tao); + PetscOptionsSetValue("-tao_monitor",""); +@@ -51,9 +57,9 @@ + numberofvertices = femmodel->vertices->NumberOfVertices(); + XL=NewVec(numberofvertices); VecSet(XL,1.); + XU=NewVec(numberofvertices); VecSet(XU,200.); +- TaoSetVariableBounds(tao,XL,XU); VecFree(&XL); VecFree(&XU); ++ //TaoSetVariableBounds(tao,XL,XU); VecFree(&XL); VecFree(&XU); + +- GetVectorFromInputsx(&X,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,FrictionCoefficientEnum,VertexEnum); ++ GetVectorFromControlInputsx(&X,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + TaoSetInitialVector(tao,X); + + user.femmodel=femmodel; +@@ -63,10 +69,13 @@ + TaoSolve(tao); + TaoView(tao,PETSC_VIEWER_STDOUT_WORLD); + TaoGetSolutionVector(tao,&X); +- InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,FrictionCoefficientEnum,VertexEnum); +- InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,FrictionCoefficientEnum); ++ SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X); ++ for(int i=0;ielements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_list[i]); ++ } + + /*Clean up and return*/ ++ xfree((void**)&control_list); + VecFree(&X); + TaoDestroy(&tao); + TaoFinalize(); +@@ -74,21 +83,45 @@ + int FormFunctionGradient(TaoSolver tao, Vec X, double *fcn,Vec G,void *userCtx){ + + /*Retreive arguments*/ +- AppCtx *user = (AppCtx*)userCtx; +- FemModel *femmodel = user->femmodel; +- Vec gradient = NULL; ++ int solution_type,num_cost_functions; ++ AppCtx *user = (AppCtx *)userCtx; ++ FemModel *femmodel = user->femmodel; ++ int *cost_functions = NULL; ++ double *cost_functionsd= NULL; ++ Vec gradient = NULL; + +- int costfunction=SurfaceAbsVelMisfitEnum; +- femmodel->parameters->SetParam(&costfunction,1,1,StepResponsesEnum); +- //InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,MaterialsRheologyBbarEnum,VertexEnum); +- InputUpdateFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X,FrictionCoefficientEnum,VertexEnum); +- adjointdiagnostic_core(user->femmodel); +- //Gradjx(&gradient,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaterialsRheologyBbarEnum); ++ /*Set new variable*/ ++ SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X); ++ ++ /*Recover some parameters*/ ++ femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); ++ femmodel->parameters->FindParam(&num_cost_functions,InversionNumCostFunctionsEnum); ++ femmodel->parameters->FindParam(&cost_functionsd,NULL,NULL,InversionCostFunctionsEnum); ++ ++ /*Prepare objective function*/ ++ cost_functions=(int*)xmalloc(num_cost_functions*sizeof(int)); ++ for(int i=0;iparameters->SetParam(cost_functions,1,num_cost_functions,StepResponsesEnum); ++ ++ /*Compute solution and adjoint*/ ++ void (*solutioncore)(FemModel*)=NULL; ++ void (*adjointcore)(FemModel*)=NULL; ++ CorePointerFromSolutionEnum(&solutioncore,femmodel->parameters,solution_type); ++ AdjointCorePointerFromSolutionEnum(&adjointcore,solution_type); ++ solutioncore(femmodel); ++ adjointcore(femmodel); ++ ++ /*Compute objective function*/ ++ CostFunctionx(fcn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ ++ /*Compute gradient*/ + Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); +- VecScale(gradient,-1.); +- VecCopy(gradient,G); +- VecFree(&gradient); +- CostFunctionx(fcn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ VecCopy(gradient,G); VecFree(&gradient); ++ VecScale(G,-1.); ++ ++ /*Clean-up and return*/ ++ xfree((void**)&cost_functions); ++ xfree((void**)&cost_functionsd); + return 0; + } + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 11317) +@@ -0,0 +1,55 @@ ++/*!\file GetVectorFromControlInputsx ++ * \brief retrieve vector from inputs in elements ++ */ ++ ++#include "./GetVectorFromControlInputsx.h" ++#include "../../shared/shared.h" ++#include "../../include/include.h" ++#include "../../toolkits/toolkits.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++ ++void GetVectorFromControlInputsx(Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){ ++ ++ int num_controls; ++ int *control_type = NULL; ++ Vec vector=NULL; ++ ++ /*Retrieve some parameters*/ ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); ++ ++ /*Allocate and populate gradient*/ ++ vector=NewVec(num_controls*vertices->NumberOfVertices()); ++ ++ for(int i=0;iSize();j++){ ++ Element* element=(Element*)elements->GetObjectByOffset(j); ++ element->GetVectorFromControlInputs(vector,control_type[i],i); ++ } ++ } ++ ++ VecAssemblyBegin(vector); ++ VecAssemblyEnd(vector); ++ ++ /*Assign output pointers:*/ ++ xfree((void**)&control_type); ++ *pvector=vector; ++} ++ ++void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){ ++ ++ /*output: */ ++ double* vector=NULL; ++ ++ /*intermediary: */ ++ Vec vec_vector=NULL; ++ ++ GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters); ++ VecToMPISerial(&vector,vec_vector); ++ ++ /*Free ressources:*/ ++ VecFree(&vec_vector); ++ ++ /*Assign output pointers:*/ ++ *pvector=vector; ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (revision 11317) +@@ -0,0 +1,15 @@ ++/*!\file: GetVectorFromControlInputsx.h ++ */ ++ ++#ifndef _GETVECTORFROMCONTROLINPUTSXX_H ++#define _GETVECTORFROMCONTROLINPUTSXX_H ++ ++#include "../../objects/objects.h" ++#include "../../Container/Container.h" ++ ++/* local prototypes: */ ++void GetVectorFromControlInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters); ++void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters); ++ ++#endif /* _GETVECTORFROMCONTROLINPUTSXX_H */ ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h (revision 11317) +@@ -30,6 +30,8 @@ + #include "./StringToEnumx/StringToEnumx.h" + #include "./GetSolutionFromInputsx/GetSolutionFromInputsx.h" + #include "./GetVectorFromInputsx/GetVectorFromInputsx.h" ++#include "./GetVectorFromControlInputsx/GetVectorFromControlInputsx.h" ++#include "./SetControlInputsFromVectorx/SetControlInputsFromVectorx.h" + #include "./Gradjx/Gradjx.h" + #include "./GroundinglineMigrationx/GroundinglineMigrationx.h" + #include "./HoleFillerx/HoleFillerx.h" +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 11317) +@@ -10,7 +10,6 @@ + + void GetVectorFromInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name, int type){ + +- + int i; + Vec vector=NULL; + +@@ -40,7 +39,6 @@ + + /*Assign output pointers:*/ + *pvector=vector; +- + } + + void GetVectorFromInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name, int type){ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (revision 11317) +@@ -0,0 +1,40 @@ ++/*!\file SetControlInputsFromVectorx ++ * \brief retrieve vector from inputs in elements ++ */ ++ ++#include "./SetControlInputsFromVectorx.h" ++#include "../../shared/shared.h" ++#include "../../include/include.h" ++#include "../../toolkits/toolkits.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++ ++void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector){ ++ ++ int num_controls; ++ int *control_type = NULL; ++ ++ /*Retrieve some parameters*/ ++ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); ++ parameters->FindParam(&control_type,NULL,InversionControlParametersEnum); ++ ++ for(int i=0;iSize();j++){ ++ Element* element=(Element*)elements->GetObjectByOffset(j); ++ element->SetControlInputsFromVector(vector,control_type[i],i); ++ } ++ } ++ ++ xfree((void**)&control_type); ++} ++ ++void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vec vector){ ++ ++ double* serial_vector=NULL; ++ ++ VecToMPISerial(&serial_vector,vector); ++ ++ SetControlInputsFromVectorx(elements,nodes, vertices, loads, materials, parameters,serial_vector); ++ ++ /*Free ressources:*/ ++ xfree((void**)&serial_vector); ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h (revision 11317) +@@ -0,0 +1,14 @@ ++/*!\file: SetControlInputsFromVectorx.h ++ */ ++ ++#ifndef _SETCONTROLINPUTSXFROMVECTOR_H ++#define _SETCONTROLINPUTSXFROMVECTOR_H ++ ++#include "../../objects/objects.h" ++#include "../../Container/Container.h" ++ ++/* local prototypes: */ ++void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,Vec vector); ++void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,double* vector); ++ ++#endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 11317) +@@ -26,7 +26,7 @@ + + /*Allocate gradient_list */ + gradient_list = (Vec*)xmalloc(num_controls*sizeof(Vec)); +- norm_list = (double*)xmalloc(num_controls*sizeof(double)); ++ norm_list = (double*)xmalloc(num_controls*sizeof(double)); + for(i=0;iresults->AddObject((Object*)input->SpawnResult(step,time)); + + #ifdef _HAVE_CONTROL_ +- if(input->ObjectEnum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); ++ if(input->ObjectEnum()==ControlInputEnum){ ++ if(((ControlInput*)input)->gradient!=NULL) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); ++ } + #endif + } + /*}}}*/ +@@ -4727,6 +4729,60 @@ + xfree((void**)&doflist); + } + /*}}}*/ ++/*FUNCTION Tria::GetVectorFromControlInputs{{{1*/ ++void Tria::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index){ ++ ++ int doflist1[NUMVERTICES]; ++ ++ /*Get out if this is not an element input*/ ++ if(!IsInput(control_enum)) return; ++ ++ /*Prepare index list*/ ++ GradientIndexing(&doflist1[0],control_index); ++ ++ /*Get input (either in element or material)*/ ++ Input* input=inputs->GetInput(control_enum); ++ if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum)); ++ ++ /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ ++ input->GetVectorFromInputs(vector,&doflist1[0]); ++} ++/*}}}*/ ++/*FUNCTION Tria::SetControlInputsFromVector{{{1*/ ++void Tria::SetControlInputsFromVector(double* vector,int control_enum,int control_index){ ++ ++ double values[NUMVERTICES]; ++ int doflist1[NUMVERTICES]; ++ Input *input = NULL; ++ Input *new_input = NULL; ++ ++ /*Get out if this is not an element input*/ ++ if(!IsInput(control_enum)) return; ++ ++ /*Prepare index list*/ ++ GradientIndexing(&doflist1[0],control_index); ++ ++ /*Get values on vertices*/ ++ for (int i=0;iinputs->GetInput(control_enum); _assert_(input); ++ } ++ else{ ++ input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); ++ } ++ ++ if (input->ObjectEnum()!=ControlInputEnum){ ++ _error_("input %s is not a ControlInput",EnumToStringx(control_enum)); ++ } ++ ++ ((ControlInput*)input)->SetInput(new_input); ++} ++/*}}}*/ + #endif + + #ifdef _HAVE_HYDROLOGY_ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11317) +@@ -149,6 +149,8 @@ + void GradjDhDtBalancedthickness(Vec gradient,int control_index); + void GradjVxBalancedthickness(Vec gradient,int control_index); + void GradjVyBalancedthickness(Vec gradient,int control_index); ++ void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index); ++ void SetControlInputsFromVector(double* vector,int control_enum,int control_index); + void ControlInputGetGradient(Vec gradient,int enum_type,int control_index); + void ControlInputScaleGradient(int enum_type,double scale); + void ControlInputSetGradient(double* gradient,int enum_type,int control_index); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11317) +@@ -1606,7 +1606,9 @@ + * object out of the input, with the additional step and time information: */ + this->results->AddObject((Object*)input->SpawnResult(step,time)); + #ifdef _HAVE_CONTROL_ +- if(input->ObjectEnum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); ++ if(input->ObjectEnum()==ControlInputEnum){ ++ if(((ControlInput*)input)->gradient!=NULL) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); ++ } + #endif + + } +@@ -5128,6 +5130,60 @@ + return J; + } + /*}}}*/ ++/*FUNCTION Penta::GetVectorFromControlInputs{{{1*/ ++void Penta::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index){ ++ ++ int doflist1[NUMVERTICES]; ++ ++ /*Get out if this is not an element input*/ ++ if(!IsInput(control_enum)) return; ++ ++ /*Prepare index list*/ ++ GradientIndexing(&doflist1[0],control_index); ++ ++ /*Get input (either in element or material)*/ ++ Input* input=inputs->GetInput(control_enum); ++ if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum)); ++ ++ /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ ++ input->GetVectorFromInputs(vector,&doflist1[0]); ++} ++/*}}}*/ ++/*FUNCTION Penta::SetControlInputsFromVector{{{1*/ ++void Penta::SetControlInputsFromVector(double* vector,int control_enum,int control_index){ ++ ++ double values[NUMVERTICES]; ++ int doflist1[NUMVERTICES]; ++ Input *input = NULL; ++ Input *new_input = NULL; ++ ++ /*Get out if this is not an element input*/ ++ if(!IsInput(control_enum)) return; ++ ++ /*Prepare index list*/ ++ GradientIndexing(&doflist1[0],control_index); ++ ++ /*Get values on vertices*/ ++ for (int i=0;iinputs->GetInput(control_enum); _assert_(input); ++ } ++ else{ ++ input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); ++ } ++ ++ if (input->ObjectEnum()!=ControlInputEnum){ ++ _error_("input %s is not a ControlInput",EnumToStringx(control_enum)); ++ } ++ ++ ((ControlInput*)input)->SetInput(new_input); ++} ++/*}}}*/ + #endif + + #ifdef _HAVE_DAKOTA_ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11317) +@@ -148,6 +148,8 @@ + void GradjBbarMacAyeal(Vec gradient,int control_index); + void GradjBbarPattyn(Vec gradient,int control_index); + void GradjBbarStokes(Vec gradient,int control_index); ++ void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index); ++ void SetControlInputsFromVector(double* vector,int control_enum,int control_index); + void ControlInputGetGradient(Vec gradient,int enum_type,int control_index); + void ControlInputScaleGradient(int enum_type,double scale); + void ControlInputSetGradient(double* gradient,int enum_type,int control_index); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 11317) +@@ -385,6 +385,13 @@ + gradient=gradient_in; + + }/*}}}*/ ++/*FUNCTION ControlInput::SetInput{{{1*/ ++void ControlInput::SetInput(Input* in_input){ ++ ++ delete values; this->values=in_input; ++ this->SaveValue(); //because this is what SpawnResult saves FIXME ++ ++}/*}}}*/ + /*FUNCTION ControlInput::SpawnResult{{{1*/ + ElementResult* ControlInput::SpawnResult(int step, double time){ + return savedvalues->SpawnResult(step,time); +@@ -395,6 +402,7 @@ + }/*}}}*/ + /*FUNCTION ControlInput::SpawnGradient{{{1*/ + ElementResult* ControlInput::SpawnGradient(int step, double time){ ++ _assert_(gradient); + return gradient->SpawnResult(step,time); + }/*}}}*/ + /*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 11316) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 11317) +@@ -53,6 +53,7 @@ + void Configure(Parameters* parameters); + /*}}}*/ + /*numerics: {{{1*/ ++ void SetInput(Input* in_input); + void GetInputValue(bool* pvalue); + void GetInputValue(int* pvalue); + void GetInputValue(double* pvalue); Index: /issm/oecreview/Archive/11300-11318/ISSM-11317-11318.diff =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-11317-11318.diff (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-11317-11318.diff (revision 11515) @@ -0,0 +1,221 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11318) +@@ -57,10 +57,14 @@ + numberofvertices = femmodel->vertices->NumberOfVertices(); + XL=NewVec(numberofvertices); VecSet(XL,1.); + XU=NewVec(numberofvertices); VecSet(XU,200.); +- //TaoSetVariableBounds(tao,XL,XU); VecFree(&XL); VecFree(&XU); + +- GetVectorFromControlInputsx(&X,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ GetVectorFromControlInputsx(&X, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value"); ++ GetVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound"); ++ GetVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound"); + TaoSetInitialVector(tao,X); ++ TaoSetVariableBounds(tao,XL,XU); ++ VecFree(&XL); ++ VecFree(&XU); + + user.femmodel=femmodel; + TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 11318) +@@ -8,7 +8,7 @@ + #include "../../toolkits/toolkits.h" + #include "../../EnumDefinitions/EnumDefinitions.h" + +-void GetVectorFromControlInputsx(Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){ ++void GetVectorFromControlInputsx(Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){ + + int num_controls; + int *control_type = NULL; +@@ -24,7 +24,7 @@ + for(int i=0;iSize();j++){ + Element* element=(Element*)elements->GetObjectByOffset(j); +- element->GetVectorFromControlInputs(vector,control_type[i],i); ++ element->GetVectorFromControlInputs(vector,control_type[i],i,data); + } + } + +@@ -36,7 +36,7 @@ + *pvector=vector; + } + +-void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){ ++void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data){ + + /*output: */ + double* vector=NULL; +@@ -44,7 +44,7 @@ + /*intermediary: */ + Vec vec_vector=NULL; + +- GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters); ++ GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters,data); + VecToMPISerial(&vector,vec_vector); + + /*Free ressources:*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (revision 11318) +@@ -8,8 +8,8 @@ + #include "../../Container/Container.h" + + /* local prototypes: */ +-void GetVectorFromControlInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters); +-void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters); ++void GetVectorFromControlInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,const char* data="value"); ++void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters,const char* data="value"); + + #endif /* _GETVECTORFROMCONTROLINPUTSXX_H */ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11318) +@@ -102,7 +102,7 @@ + virtual void ControlInputGetGradient(Vec gradient,int enum_type,int control_index)=0; + virtual void ControlInputSetGradient(double* gradient,int enum_type,int control_index)=0; + virtual void ControlInputScaleGradient(int enum_type, double scale)=0; +- virtual void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index)=0; ++ virtual void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index,const char* data)=0; + virtual void SetControlInputsFromVector(double* vector,int control_enum,int control_index)=0; + virtual void InputControlUpdate(double scalar,bool save_parameter)=0; + #endif +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11318) +@@ -4730,7 +4730,7 @@ + } + /*}}}*/ + /*FUNCTION Tria::GetVectorFromControlInputs{{{1*/ +-void Tria::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index){ ++void Tria::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index,const char* data){ + + int doflist1[NUMVERTICES]; + +@@ -4744,8 +4744,12 @@ + Input* input=inputs->GetInput(control_enum); + if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum)); + +- /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ +- input->GetVectorFromInputs(vector,&doflist1[0]); ++ /*Check that it is a ControlInput*/ ++ if (input->ObjectEnum()!=ControlInputEnum){ ++ _error_("input %s is not a ControlInput",EnumToStringx(control_enum)); ++ } ++ ++ ((ControlInput*)input)->GetVectorFromInputs(vector,&doflist1[0],data); + } + /*}}}*/ + /*FUNCTION Tria::SetControlInputsFromVector{{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11318) +@@ -149,7 +149,7 @@ + void GradjDhDtBalancedthickness(Vec gradient,int control_index); + void GradjVxBalancedthickness(Vec gradient,int control_index); + void GradjVyBalancedthickness(Vec gradient,int control_index); +- void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index); ++ void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index,const char* data); + void SetControlInputsFromVector(double* vector,int control_enum,int control_index); + void ControlInputGetGradient(Vec gradient,int enum_type,int control_index); + void ControlInputScaleGradient(int enum_type,double scale); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11318) +@@ -5131,7 +5131,7 @@ + } + /*}}}*/ + /*FUNCTION Penta::GetVectorFromControlInputs{{{1*/ +-void Penta::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index){ ++void Penta::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index,const char* data){ + + int doflist1[NUMVERTICES]; + +@@ -5145,8 +5145,12 @@ + Input* input=inputs->GetInput(control_enum); + if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum)); + +- /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ +- input->GetVectorFromInputs(vector,&doflist1[0]); ++ /*Check that it is a ControlInput*/ ++ if (input->ObjectEnum()!=ControlInputEnum){ ++ _error_("input %s is not a ControlInput",EnumToStringx(control_enum)); ++ } ++ ++ ((ControlInput*)input)->GetVectorFromInputs(vector,&doflist1[0],data); + } + /*}}}*/ + /*FUNCTION Penta::SetControlInputsFromVector{{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11318) +@@ -148,7 +148,7 @@ + void GradjBbarMacAyeal(Vec gradient,int control_index); + void GradjBbarPattyn(Vec gradient,int control_index); + void GradjBbarStokes(Vec gradient,int control_index); +- void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index); ++ void GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index,const char* data); + void SetControlInputsFromVector(double* vector,int control_enum,int control_index); + void ControlInputGetGradient(Vec gradient,int enum_type,int control_index); + void ControlInputScaleGradient(int enum_type,double scale); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 11318) +@@ -405,10 +405,32 @@ + _assert_(gradient); + return gradient->SpawnResult(step,time); + }/*}}}*/ +-/*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{1*/ ++/*FUNCTION ControlInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ + void ControlInput::GetVectorFromInputs(Vec vector,int* doflist){ + values->GetVectorFromInputs(vector,doflist); + }/*}}}*/ ++/*FUNCTION ControlInput::GetVectorFromInputs(Vec vector,int* doflist,const char* data){{{1*/ ++void ControlInput::GetVectorFromInputs(Vec vector,int* doflist,const char* data){ ++ if(strcmp(data,"value")==0){ ++ _assert_(values); ++ values->GetVectorFromInputs(vector,doflist); ++ } ++ else if (strcmp(data,"lowerbound")==0){ ++ _assert_(minvalues); ++ minvalues->GetVectorFromInputs(vector,doflist); ++ } ++ else if (strcmp(data,"upperbound")==0){ ++ _assert_(maxvalues); ++ maxvalues->GetVectorFromInputs(vector,doflist); ++ } ++ else if (strcmp(data,"gradient")==0){ ++ _assert_(gradient); ++ gradient->GetVectorFromInputs(vector,doflist); ++ } ++ else{ ++ _error_("Data %s not supported yet",data); ++ } ++}/*}}}*/ + /*FUNCTION ControlInput::GetInputAverage(double* pvalue){{{1*/ + void ControlInput::GetInputAverage(double* pvalue){ + values->GetInputAverage(pvalue); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 11317) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 11318) +@@ -86,6 +86,7 @@ + double MinAbs(void){_error_("not implemented yet");}; + void Extrude(void); + void VerticallyIntegrate(Input* thickness_input); ++ void GetVectorFromInputs(Vec vector,int* doflist,const char* data); + void GetVectorFromInputs(Vec vector,int* doflist); + void GetValuesPtr(double** pvalues,int* pnum_values){_error_("not implemented yet");}; + ElementResult* SpawnGradient(int step, double time); Index: /issm/oecreview/Archive/11300-11318/ISSM-DocReview-11300-11318.tex =================================================================== --- /issm/oecreview/Archive/11300-11318/ISSM-DocReview-11300-11318.tex (revision 11515) +++ /issm/oecreview/Archive/11300-11318/ISSM-DocReview-11300-11318.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11300-11318/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11300-11318/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11300-11318/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11300-11318 Index: /issm/oecreview/Archive/11300-11318/Makefile =================================================================== --- /issm/oecreview/Archive/11300-11318/Makefile (revision 11515) +++ /issm/oecreview/Archive/11300-11318/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11300-11318 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11300-11318/log.tex =================================================================== --- /issm/oecreview/Archive/11300-11318/log.tex (revision 11515) +++ /issm/oecreview/Archive/11300-11318/log.tex (revision 11515) @@ -0,0 +1,36 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11300-11301.diff: \\ Function name: \\M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile \\ Export determination: 6. \\Rationale: added Nicole, Feras and Chris on the list to receive the cron file +M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp minor \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11301-11302.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/src/c/solutions/control\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/control\_core.m M /issm/trunk-jpl/src/m/solutions/gradient\_core.m minor \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11302-11303.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/control\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/control\_core.m M /issm/trunk-jpl/src/m/solutions/gradient\_core.m \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/gradient\_core.m removed old diagnostic run in the middle of gradient module \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11303-11304.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/gradient\_core.m \\ Export determination: 6. \\Rationale: removed old diagnostic run in the middle of gradient module +M /issm/trunk-jpl/test/Archives/Archive429.mat M /issm/trunk-jpl/test/Archives/Archive430.mat M /issm/trunk-jpl/test/Archives/Archive431.mat M /issm/trunk-jpl/test/Archives/Archive432.mat updated CM steady archive \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11304-11305.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive429.mat M /issm/trunk-jpl/test/Archives/Archive430.mat M /issm/trunk-jpl/test/Archives/Archive431.mat M /issm/trunk-jpl/test/Archives/Archive432.mat \\ Export determination: 6. \\Rationale: updated CM steady archive +M /issm/trunk-jpl/test/Archives/Archive525.mat M /issm/trunk-jpl/test/Archives/Archive526.mat M /issm/trunk-jpl/test/NightlyRun/test525.m M /issm/trunk-jpl/test/NightlyRun/test526.m updated CM steady archives \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11305-11306.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive525.mat M /issm/trunk-jpl/test/Archives/Archive526.mat M /issm/trunk-jpl/test/NightlyRun/test525.m M /issm/trunk-jpl/test/NightlyRun/test526.m \\ Export determination: 6. \\Rationale: updated CM steady archives +M /issm/trunk-jpl/src/c/solutions/control\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/c/solutions/solutions.h M /issm/trunk-jpl/src/m/solutions/control\_core.m M /issm/trunk-jpl/src/m/solutions/gradient\_core.m improving CM algorithm \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11306-11307.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/control\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/c/solutions/solutions.h M /issm/trunk-jpl/src/m/solutions/control\_core.m M /issm/trunk-jpl/src/m/solutions/gradient\_core.m \\ Export determination: 6. \\Rationale: improving CM algorithm +A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_daily A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_nightly A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_ucitrunk A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_validation M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile Add schlegel configs \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11307-11308.diff: \\ Function name: \\A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_daily A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_nightly A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_ucitrunk A /issm/trunk-jpl/cron/configs/linux64\_schlegel\_validation M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile \\ Export determination: 6. \\Rationale: Add schlegel configs +M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile revert to seroussi \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11308-11309.diff: \\ Function name: \\M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile \\ Export determination: 6. \\Rationale: revert to seroussi +M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile revert to seroussi \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11309-11310.diff: \\ Function name: \\M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile \\ Export determination: 6. \\Rationale: revert to seroussi +M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.h M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/gradient\_core.m M /issm/trunk-jpl/src/mex/Gradj/Gradj.cpp M /issm/trunk-jpl/src/mex/Gradj/Gradj.h Simplifying gradient call in CM \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11310-11311.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.h M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/gradient\_core.m M /issm/trunk-jpl/src/mex/Gradj/Gradj.cpp M /issm/trunk-jpl/src/mex/Gradj/Gradj.h \\ Export determination: 6. \\Rationale: Simplifying gradient call in CM +M /issm/trunk-jpl/src/m/model/solveparallel.m Better runtimename \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11311-11312.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/solveparallel.m \\ Export determination: 6. \\Rationale: Better runtimename +M /issm/trunk-jpl/test/NightlyRun/test223.m M /issm/trunk-jpl/test/NightlyRun/test626.m stop verbosing \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11312-11313.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test223.m M /issm/trunk-jpl/test/NightlyRun/test626.m \\ Export determination: 6. \\Rationale: stop verbosing +M /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp M /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h M /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp M /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h M /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp M /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.h M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/control\_core.m M /issm/trunk-jpl/src/m/solutions/gradient\_core.m M /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp M /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h M /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp M /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h M /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp M /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h M /issm/trunk-jpl/src/mex/Gradj/Gradj.cpp M /issm/trunk-jpl/src/mex/Gradj/Gradj.h Objective function gradient is now ONE unique vector \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11313-11314.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp M /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h M /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp M /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h M /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp M /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.h M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/gradient\_core.cpp M /issm/trunk-jpl/src/m/solutions/control\_core.m M /issm/trunk-jpl/src/m/solutions/gradient\_core.m M /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.cpp M /issm/trunk-jpl/src/mex/ControlInputGetGradient/ControlInputGetGradient.h M /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.cpp M /issm/trunk-jpl/src/mex/ControlInputScaleGradient/ControlInputScaleGradient.h M /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp M /issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.h M /issm/trunk-jpl/src/mex/Gradj/Gradj.cpp M /issm/trunk-jpl/src/mex/Gradj/Gradj.h \\ Export determination: 6. \\Rationale: Objective function gradient is now ONE unique vector +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp added error message if unphysical water friction value \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11314-11315.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: added error message if unphysical water friction value +M /issm/trunk-jpl/src/m/model/extrude.m M /issm/trunk-jpl/src/m/model/partition/partitioner.m Additions for 3d dakota \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11315-11316.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/extrude.m M /issm/trunk-jpl/src/m/model/partition/partitioner.m \\ Export determination: 6. \\Rationale: Additions for 3d dakota +M /issm/trunk-jpl/test/Archives/Archive224.mat M /issm/trunk-jpl/test/Archives/Archive226.mat M /issm/trunk-jpl/test/Archives/Archive228.mat M /issm/trunk-jpl/test/Archives/Archive344.mat New archive when orthogonalization required during Control runs \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11316-11317.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive224.mat M /issm/trunk-jpl/test/Archives/Archive226.mat M /issm/trunk-jpl/test/Archives/Archive228.mat M /issm/trunk-jpl/test/Archives/Archive344.mat \\ Export determination: 6. \\Rationale: New archive when orthogonalization required during Control runs +M /issm/trunk-jpl/src/c/Makefile.am A /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx A /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp A /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h M /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp A /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx A /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp A /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h M /issm/trunk-jpl/src/c/modules/modules.h M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h M /issm/trunk-jpl/src/c/solutions/control\_core.cpp M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp Added 2 modules to make TAO work \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11317-11318.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Makefile.am A /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx A /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp A /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h M /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp M /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp A /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx A /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp A /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h M /issm/trunk-jpl/src/c/modules/modules.h M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h M /issm/trunk-jpl/src/c/solutions/control\_core.cpp M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: Added 2 modules to make TAO work +M /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp M /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp M /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp Added support for bounds on control parameters for TAO \\\\ Index: /issm/oecreview/Archive/11300-11318/r1.tex =================================================================== --- /issm/oecreview/Archive/11300-11318/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11300-11318/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11300 Index: /issm/oecreview/Archive/11300-11318/r2.tex =================================================================== --- /issm/oecreview/Archive/11300-11318/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11300-11318/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11318 Index: /issm/oecreview/Archive/11319-11340/Date.tex =================================================================== --- /issm/oecreview/Archive/11319-11340/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11319-11340/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11319-11340/ISSM-11319-11320.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11319-11320.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11319-11320.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test218.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test218.m (revision 11319) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test218.m (revision 11320) +@@ -13,7 +13,7 @@ + field_tolerances={... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... +- 1e-13,1e-13,1e-09,1e-13,1e-13,1e-11,1e-11,1e-11,1e-13,1e-8}; ++ 1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8}; + field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... Index: /issm/oecreview/Archive/11319-11340/ISSM-11320-11321.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11320-11321.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11320-11321.diff (revision 11515) @@ -0,0 +1,18 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp (revision 11320) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp (revision 11321) +@@ -53,11 +53,11 @@ + /*Fetch inputs: */ + //index + FetchMatlabData(&double_index,&nel,&dummy,INDEX); +- if(dummy!=3)_error_(" element triangulation should be of 3 column width!"); ++ if(dummy!=3 && dummy!=6)_error_(" element triangulation should be of 3 or 6 column width!"); + index=(int*)xmalloc(nel*3*sizeof(int)); + for(i=0;iparameters->FindParam(&dim,MeshDimensionEnum); + femmodel->parameters->FindParam(&ishutter,FlowequationIshutterEnum); + femmodel->parameters->FindParam(&ismacayealpattyn,FlowequationIsmacayealpattynEnum); + femmodel->parameters->FindParam(&isstokes,FlowequationIsstokesEnum); ++ femmodel->parameters->FindParam(&isnewton,DiagnosticIsnewtonEnum); + femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); + femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum); + femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); +@@ -71,7 +73,10 @@ + + _printf_(VerboseSolution(),"%s\n"," computing velocities"); + femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); +- solver_nonlinear(femmodel,modify_loads); ++ if(isnewton) ++ solver_newton(femmodel); ++ else ++ solver_nonlinear(femmodel,conserve_loads); + } + + if (ismacayealpattyn && isstokes){ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11322) +@@ -24,7 +24,7 @@ + void controltao_core(FemModel* femmodel){ + + /*TAO*/ +- int ierr,numberofvertices; ++ int ierr; + int num_controls; + AppCtx user; + TaoSolver tao; +@@ -44,20 +44,19 @@ + femmodel->parameters->FindParam(&control_list,NULL,InversionControlParametersEnum); + + /*Initialize TAO*/ ++ _printf_(VerboseControl(),"%s\n"," Initializing the Toolkit for Advanced Optimization (TAO)"); + TaoCreate(PETSC_COMM_WORLD,&tao); + PetscOptionsSetValue("-tao_monitor",""); + TaoSetFromOptions(tao); + TaoSetType(tao,"tao_blmvm"); ++ //TaoSetType(tao,"tao_cg"); ++ //TaoSetType(tao,"tao_lmvm"); + + /*Prepare all TAO parameters*/ + TaoSetMaximumFunctionEvaluations(tao,50); + TaoSetMaximumIterations(tao,10); +- TaoSetTolerances(tao,10e-28,0.0000,0.0000,0.0000,10e-28); ++ TaoSetTolerances(tao,0.,0.,0.,0.,0.); + +- numberofvertices = femmodel->vertices->NumberOfVertices(); +- XL=NewVec(numberofvertices); VecSet(XL,1.); +- XU=NewVec(numberofvertices); VecSet(XU,200.); +- + GetVectorFromControlInputsx(&X, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value"); + GetVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound"); + GetVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound"); +@@ -70,6 +69,7 @@ + TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); + + /*Solver optimization problem*/ ++ _printf_(VerboseControl(),"%s\n"," Starting optimization"); + TaoSolve(tao); + TaoView(tao,PETSC_VIEWER_STDOUT_WORLD); + TaoGetSolutionVector(tao,&X); +@@ -95,6 +95,7 @@ + Vec gradient = NULL; + + /*Set new variable*/ ++ //VecView(X,PETSC_VIEWER_STDOUT_WORLD); + SetControlInputsFromVectorx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,X); + + /*Recover some parameters*/ +@@ -117,11 +118,13 @@ + + /*Compute objective function*/ + CostFunctionx(fcn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ _printf_(true,"f(x)=%g\n",*fcn); + + /*Compute gradient*/ + Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + VecCopy(gradient,G); VecFree(&gradient); + VecScale(G,-1.); ++ //VecView(G,PETSC_VIEWER_STDOUT_WORLD); + + /*Clean-up and return*/ + xfree((void**)&cost_functions); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11322) +@@ -27,6 +27,7 @@ + ConstantsYtsEnum, + DiagnosticAbstolEnum, + DiagnosticIcefrontEnum, ++ DiagnosticIsnewtonEnum, + DiagnosticMaxiterEnum, + DiagnosticNumRequestedOutputsEnum, + DiagnosticPenaltyFactorEnum, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11322) +@@ -29,6 +29,7 @@ + else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum; + else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum; + else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum; ++ else if (strcmp(name,"DiagnosticIsnewton")==0) return DiagnosticIsnewtonEnum; + else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum; + else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum; + else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11322) +@@ -31,6 +31,7 @@ + case ConstantsYtsEnum : return "ConstantsYts"; + case DiagnosticAbstolEnum : return "DiagnosticAbstol"; + case DiagnosticIcefrontEnum : return "DiagnosticIcefront"; ++ case DiagnosticIsnewtonEnum : return "DiagnosticIsnewton"; + case DiagnosticMaxiterEnum : return "DiagnosticMaxiter"; + case DiagnosticNumRequestedOutputsEnum : return "DiagnosticNumRequestedOutputs"; + case DiagnosticPenaltyFactorEnum : return "DiagnosticPenaltyFactor"; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/modules.h (revision 11322) +@@ -107,6 +107,7 @@ + #include "./SpcNodesx/SpcNodesx.h" + #include "./SurfaceAreax/SurfaceAreax.h" + #include "./SystemMatricesx/SystemMatricesx.h" ++#include "./CreateJacobianMatrixx/CreateJacobianMatrixx.h" + #include "./TimeAdaptx/TimeAdaptx.h" + #include "./TriaSearchx/TriaSearchx.h" + #include "./ThicknessAbsMisfitx/ThicknessAbsMisfitx.h" +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 11322) +@@ -39,6 +39,7 @@ + parameters->AddObject(iomodel->CopyConstantObject(DiagnosticRestolEnum)); + parameters->AddObject(iomodel->CopyConstantObject(DiagnosticReltolEnum)); + parameters->AddObject(iomodel->CopyConstantObject(DiagnosticAbstolEnum)); ++ parameters->AddObject(iomodel->CopyConstantObject(DiagnosticIsnewtonEnum)); + parameters->AddObject(iomodel->CopyConstantObject(DiagnosticMaxiterEnum)); + parameters->AddObject(iomodel->CopyConstantObject(SteadystateReltolEnum)); + parameters->AddObject(iomodel->CopyConstantObject(SteadystateMaxiterEnum)); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 11322) +@@ -0,0 +1,42 @@ ++/*!\file CreateJacobianMatrixx ++ * \brief: create system matrices (stiffness matrix, loads vector) ++ */ ++ ++#include "./CreateJacobianMatrixx.h" ++#include "../../shared/shared.h" ++#include "../../include/include.h" ++#include "../../io/io.h" ++#include "../../toolkits/toolkits.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++ ++void CreateJacobianMatrixx(Mat* pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ ++ ++ int connectivity; ++ int numberofdofspernode; ++ int fsize,configuration_type; ++ Element *element = NULL; ++ Mat Jff = NULL; ++ ++ /*Checks*/ ++ _assert_(nodes && elements); ++ ++ /*Recover some parameters*/ ++ parameters->FindParam(&configuration_type,ConfigurationTypeEnum); ++ parameters->FindParam(&connectivity,MeshAverageVertexConnectivityEnum); ++ fsize=nodes->NumberOfDofs(configuration_type,FsetEnum); ++ numberofdofspernode=nodes->MaxNumDofs(configuration_type,GsetEnum); ++ ++ /*Initialize Jacobian Matrix*/ ++ Jff=NewMat(fsize,fsize,connectivity,numberofdofspernode); ++ ++ /*Create and assemble matrix*/ ++ for(int i=0;iSize();i++){ ++ element=(Element*)elements->GetObjectByOffset(i); ++ element->CreateJacobianMatrix(Jff); ++ } ++ MatAssemblyBegin(Jff,MAT_FINAL_ASSEMBLY); ++ MatAssemblyEnd(Jff,MAT_FINAL_ASSEMBLY); ++ ++ /*Assign output pointer*/ ++ *pJff=Jff; ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h (revision 11322) +@@ -0,0 +1,14 @@ ++/*!\file: CreateJacobianMatrixx.h ++ * \brief header file for degree of freedoms distribution routines. ++ */ ++ ++#ifndef _CREATEJACOBIANMATRIXX_H ++#define _CREATEJACOBIANMATRIXX_H ++ ++#include "../../Container/Container.h" ++#include "../../objects/objects.h" ++ ++/* local prototypes: */ ++void CreateJacobianMatrixx(Mat* pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters); ++ ++#endif /* _CREATEJACOBIANMATRIXX_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11322) +@@ -322,6 +322,8 @@ + ./modules/StringToEnumx/StringToEnumx.h\ + ./modules/SystemMatricesx/SystemMatricesx.cpp\ + ./modules/SystemMatricesx/SystemMatricesx.h\ ++ ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp\ ++ ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h\ + ./modules/ConstraintsStatex/ConstraintsStatex.cpp\ + ./modules/ConstraintsStatex/ConstraintsStatex.h\ + ./modules/ConstraintsStatex/ConstraintsStateLocal.h\ +@@ -351,7 +353,8 @@ + ./solutions/AnalysisConfiguration.cpp\ + ./solutions/CorePointerFromSolutionEnum.cpp\ + ./solvers/solver_linear.cpp\ +- ./solvers/solver_nonlinear.cpp ++ ./solvers/solver_nonlinear.cpp\ ++ ./solvers/solver_newton.cpp + #}}} + #DAKOTA sources {{{1 + dakota_sources = ./objects/DakotaPlugin.h\ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11322) +@@ -522,6 +522,40 @@ + *pviscosity_complement=viscosity_complement; + } + /*}}}*/ ++/*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{1*/ ++void Matice::GetViscosityDerivativeEpsSquare(double* pmu_prime, double* epsilon){ ++ ++ /*output: */ ++ double mu_prime; ++ double mu,n,eff2; ++ ++ /*input strain rate: */ ++ double exx,eyy,exy,exz,eyz; ++ ++ /*Get visocisty and n*/ ++ GetViscosity3d(&mu,epsilon); ++ n=GetN(); ++ ++ if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && ++ (epsilon[3]==0) && (epsilon[4]==0)){ ++ mu_prime=0.5*pow((double)10,(double)14); ++ } ++ else{ ++ /*Retrive strain rate components: */ ++ exx=epsilon[0]; ++ eyy=epsilon[1]; ++ exy=epsilon[2]; ++ exz=epsilon[3]; ++ eyz=epsilon[4]; ++ eff2 = exx*exx + eyy*eyy + exx*eyy + exy*exy + exz*exz + eyz*eyz; ++ ++ mu_prime=(1-n)/(2*n) * mu/eff2; ++ } ++ ++ /*Assign output pointers:*/ ++ *pmu_prime=mu_prime; ++} ++/*}}}*/ + /*FUNCTION Matice::InputDuplicate{{{1*/ + void Matice::InputDuplicate(int original_enum,int new_enum){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.h (revision 11322) +@@ -67,6 +67,7 @@ + void GetViscosity3d(double* pviscosity3d, double* pepsilon); + void GetViscosity3dStokes(double* pviscosity3d, double* epsilon); + void GetViscosityComplement(double* pviscosity_complement, double* pepsilon); ++ void GetViscosityDerivativeEpsSquare(double* pmu_prime, double* pepsilon); + double GetB(); + double GetBbar(); + double GetN(); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 11322) +@@ -244,7 +244,7 @@ + /*}}}*/ + + /*ElementMatrix specific routines: */ +-/*FUNCTION ElementMatrix::AddToGlobal{{{1*/ ++/*FUNCTION ElementMatrix::AddToGlobal(Mat Kff, Mat Kfs){{{1*/ + void ElementMatrix::AddToGlobal(Mat Kff, Mat Kfs){ + + int i,j; +@@ -293,6 +293,40 @@ + + } + /*}}}*/ ++/*FUNCTION ElementMatrix::AddToGlobal(Mat Jff){{{1*/ ++void ElementMatrix::AddToGlobal(Mat Jff){ ++ ++ int i,j; ++ double* localvalues=NULL; ++ ++ /*In debugging mode, check consistency (no NaN, and values not too big)*/ ++ this->CheckConsistency(); ++ ++ if(this->dofsymmetrical){ ++ /*only use row dofs to add values into global matrices: */ ++ ++ if(this->row_fsize){ ++ /*first, retrieve values that are in the f-set from the g-set values matrix: */ ++ localvalues=(double*)xmalloc(this->row_fsize*this->row_fsize*sizeof(double)); ++ for(i=0;irow_fsize;i++){ ++ for(j=0;jrow_fsize;j++){ ++ *(localvalues+this->row_fsize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]); ++ } ++ } ++ /*add local values into global matrix, using the fglobaldoflist: */ ++ MatSetValues(Jff,this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,(const double*)localvalues,ADD_VALUES); ++ ++ /*Free ressources:*/ ++ xfree((void**)&localvalues); ++ } ++ ++ } ++ else{ ++ _error_(" non dofsymmetrical matrix AddToGlobal routine not support yet!"); ++ } ++ ++} ++/*}}}*/ + /*FUNCTION ElementMatrix::CheckConsistency{{{1*/ + void ElementMatrix::CheckConsistency(void){ + /*Check element matrix values, only in debugging mode*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h (revision 11322) +@@ -58,6 +58,7 @@ + /*}}}*/ + /*ElementMatrix specific routines {{{1*/ + void AddToGlobal(Mat Kff, Mat Kfs); ++ void AddToGlobal(Mat Jff); + void Echo(void); + void CheckConsistency(void); + void Transpose(void); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11322) +@@ -29,6 +29,7 @@ + virtual void SetCurrentConfiguration(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters)=0; + virtual void CreateKMatrix(Mat Kff, Mat Kfs,Vec df)=0; + virtual void CreatePVector(Vec pf)=0; ++ virtual void CreateJacobianMatrix(Mat Jff)=0; + virtual void GetSolutionFromInputs(Vec solution)=0; + virtual int GetNodeIndex(Node* node)=0; + virtual int Sid()=0; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11322) +@@ -1882,6 +1882,7 @@ + name==InversionVxObsEnum || + name==InversionVyObsEnum || + name==FrictionCoefficientEnum || ++ name==MaterialsRheologyBbarEnum || + name==GradientEnum || + name==OldGradientEnum || + name==QmuVxEnum || +@@ -4733,6 +4734,7 @@ + void Tria::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index,const char* data){ + + int doflist1[NUMVERTICES]; ++ Input *input=NULL; + + /*Get out if this is not an element input*/ + if(!IsInput(control_enum)) return; +@@ -4741,8 +4743,12 @@ + GradientIndexing(&doflist1[0],control_index); + + /*Get input (either in element or material)*/ +- Input* input=inputs->GetInput(control_enum); +- if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum)); ++ if(control_enum==MaterialsRheologyBbarEnum){ ++ input=(Input*)matice->inputs->GetInput(control_enum); _assert_(input); ++ } ++ else{ ++ input=(Input*)this->inputs->GetInput(control_enum); _assert_(input); ++ } + + /*Check that it is a ControlInput*/ + if (input->ObjectEnum()!=ControlInputEnum){ +@@ -4772,7 +4778,6 @@ + } + new_input = new TriaP1Input(control_enum,values); + +- + if(control_enum==MaterialsRheologyBbarEnum){ + input=(Input*)matice->inputs->GetInput(control_enum); _assert_(input); + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11322) +@@ -83,6 +83,7 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs,Vec df); + void CreatePVector(Vec pf); ++ void CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");}; + int GetNodeIndex(Node* node); + int Sid(); + bool IsOnBed(); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11322) +@@ -768,6 +768,39 @@ + return pe; + } + /*}}}*/ ++/*FUNCTION Penta::CreateJacobianMatrix{{{1*/ ++void Penta::CreateJacobianMatrix(Mat Jff){ ++ ++ /*retrieve parameters: */ ++ ElementMatrix* Ke=NULL; ++ int analysis_type; ++ parameters->FindParam(&analysis_type,AnalysisTypeEnum); ++ ++ /*Checks in debugging {{{2*/ ++ _assert_(this->nodes && this->matice && this->matpar && this->verticalneighbors && this->parameters && this->inputs); ++ /*}}}*/ ++ ++ /*Skip if water element*/ ++ if(IsOnWater()) return; ++ ++ /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ ++ switch(analysis_type){ ++#ifdef _HAVE_DIAGNOSTIC_ ++ case DiagnosticHorizAnalysisEnum: ++ Ke=CreateJacobianDiagnosticPattyn(); ++ break; ++#endif ++ default: ++ _error_("analysis %i (%s) not supported yet",analysis_type,EnumToStringx(analysis_type)); ++ } ++ ++ /*Add to global matrix*/ ++ if(Ke){ ++ Ke->AddToGlobal(Jff); ++ delete Ke; ++ } ++} ++/*}}}*/ + /*FUNCTION Penta::DeepEcho{{{1*/ + void Penta::DeepEcho(void){ + +@@ -6223,6 +6256,73 @@ + return Ke; + } + /*}}}*/ ++/*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{1*/ ++ElementMatrix* Penta::CreateJacobianDiagnosticPattyn(void){ ++ ++ /*Constants*/ ++ const int numdof=NDOF2*NUMVERTICES; ++ ++ /*Intermediaries */ ++ int i,j,ig; ++ int approximation; ++ double xyz_list[NUMVERTICES][3]; ++ double Jdet; ++ double eps1dotdphii,eps1dotdphij; ++ double eps2dotdphii,eps2dotdphij; ++ double mu_prime; ++ double epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ ++ double eps1[3],eps2[3]; ++ double phi[NUMVERTICES]; ++ double dphi[3][NUMVERTICES]; ++ GaussPenta *gauss=NULL; ++ ++ /*Initialize Jacobian with regular Pattyn (first part of the Gateau derivative)*/ ++ ElementMatrix* Ke=CreateKMatrixDiagnosticPattyn(); ++ ++ /*Retrieve all inputs and parameters*/ ++ inputs->GetInputValue(&approximation,ApproximationEnum); ++ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ ++ /* Start looping on the number of gaussian points: */ ++ gauss=new GaussPenta(5,5); ++ for (ig=gauss->begin();igend();ig++){ ++ ++ gauss->GaussPoint(ig); ++ ++ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); ++ GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); ++ ++ this->GetStrainRate3dPattyn(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); ++ matice->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); ++ eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; ++ eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; ++ eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; ++ ++ for(i=0;i<6;i++){ ++ for(j=0;j<6;j++){ ++ eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; ++ eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; ++ eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; ++ eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; ++ ++ Ke->values[12*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; ++ Ke->values[12*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; ++ } ++ } ++ } ++ ++ /*Transform Coordinate System*/ ++ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); ++ ++ /*Clean up and return*/ ++ delete gauss; ++ return Ke; ++} ++/*}}}*/ + /*FUNCTION Penta::CreateKMatrixDiagnosticPattynFriction{{{1*/ + ElementMatrix* Penta::CreateKMatrixDiagnosticPattynFriction(void){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11322) +@@ -87,6 +87,7 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs,Vec df); + void CreatePVector(Vec pf); ++ void CreateJacobianMatrix(Mat Jff); + void DeleteResults(void); + int GetNodeIndex(Node* node); + void GetSolutionFromInputs(Vec solution); +@@ -233,6 +234,7 @@ + ElementMatrix* CreateKMatrixDiagnosticVert(void); + ElementMatrix* CreateKMatrixDiagnosticVertVolume(void); + ElementMatrix* CreateKMatrixDiagnosticVertSurface(void); ++ ElementMatrix* CreateJacobianDiagnosticPattyn(void); + void InputUpdateFromSolutionDiagnosticHoriz( double* solutiong); + void InputUpdateFromSolutionDiagnosticMacAyeal( double* solutiong); + void InputUpdateFromSolutionDiagnosticMacAyealPattyn( double* solutiong); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11322) +@@ -88,6 +88,8 @@ + } + } + ++ _printf_(VerboseConvergence(),"\n total number of iterations: %i\n",count-1); ++ + /*clean-up*/ + if(conserve_loads) delete loads; + VecFree(&uf); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solvers.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solvers.h (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solvers.h (revision 11322) +@@ -13,6 +13,7 @@ + + void solver_thermal_nonlinear(FemModel* femmodel); + void solver_nonlinear(FemModel* femmodel,bool conserve_loads); ++void solver_newton(FemModel* femmodel); + void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads); + void solver_linear(FemModel* femmodel); + void solver_adjoint_linear(FemModel* femmodel); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11322) +@@ -0,0 +1,91 @@ ++/*!\file: solver_nonlinear.cpp ++ * \brief: core of a non-linear solution, using fixed-point method ++ */ ++ ++#include "../toolkits/toolkits.h" ++#include "../objects/objects.h" ++#include "../io/io.h" ++#include "../EnumDefinitions/EnumDefinitions.h" ++#include "../modules/modules.h" ++#include "../solutions/solutions.h" ++#include "./solvers.h" ++ ++void solver_newton(FemModel* femmodel){ ++ ++ /*intermediary: */ ++ Mat Kff = NULL, Kfs = NULL, Jff = NULL; ++ Vec ug = NULL, old_ug = NULL; ++ Vec uf = NULL, old_uf = NULL, duf = NULL; ++ Vec pf = NULL, pJf = NULL; ++ Vec df = NULL; ++ Vec ys = NULL; ++ ++ bool converged; ++ int num_unstable_constraints; ++ int count; ++ ++ /*parameters:*/ ++ int max_nonlinear_iterations; ++ int configuration_type; ++ ++ /*Recover parameters: */ ++ femmodel->parameters->FindParam(&max_nonlinear_iterations,DiagnosticMaxiterEnum); ++ femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); ++ UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters); ++ ++ count=1; ++ converged=false; ++ ++ /*Start non-linear iteration using input velocity: */ ++ GetSolutionFromInputsx(&ug,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ Reducevectorgtofx(&uf,ug,femmodel->nodes,femmodel->parameters); ++ ++ //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate) ++ InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,converged,ConvergedEnum); ++ InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); ++ ++ for(;;){ ++ ++ //save pointer to old velocity ++ VecFree(&old_ug);old_ug=ug; ++ VecFree(&old_uf);old_uf=uf; ++ ++ SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); ++ Reduceloadx(pf,Kfs,ys);MatFree(&Kfs); ++ Solverx(&uf,Kff,pf,old_uf,df,femmodel->parameters); ++ ++ convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); ++ ++ CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ ++ Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters); ++ InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); ++ SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ VecDuplicate(pf,&pJf); ++ MatMultPatch(Kff,uf,pJf); ++ VecAXPY(pJf,-1.,pf); ++ Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); ++ MatFree(&Kff);VecFree(&pf); VecFree(&df); ++ VecAXPY(uf,-1.,duf); ++ Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); ++ ++ InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); ++ ++ /*Increase count: */ ++ count++; ++ if(converged==true)break; ++ if(count>=max_nonlinear_iterations){ ++ _printf_(true," maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); ++ break; ++ } ++ } ++ ++ _printf_(VerboseConvergence(),"\n total number of iterations: %i\n",count-1); ++ ++ /*clean-up*/ ++ VecFree(&uf); ++ VecFree(&ug); ++ VecFree(&old_ug); ++ VecFree(&old_uf); ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromdisk.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromdisk.m (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromdisk.m (revision 11322) +@@ -9,6 +9,9 @@ + help loadresultsfromdisk; + error('loadresultsfromdisk: error message.'); + end ++if ~exist(filename,'file'), ++ error(['binary file ' filename ' not found.']); ++end + + if ~md.qmu.isdakota, + +@@ -19,6 +22,9 @@ + + %load results onto model + structure=parseresultsfromdisk(filename,~md.settings.io_gather); ++ if isempty(fieldnames(structure)), ++ error(['No result found in binary file ' filename '. Check for solution crash.']); ++ end + md.results.(structure(1).SolutionType)=structure; + + %recover solution_type from results +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaVertexInputEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaVertexInputEnum.m (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaVertexInputEnum.m (revision 11322) +@@ -1,11 +0,0 @@ +-function macro=TriaVertexInputEnum() +-%TRIAVERTEXINPUTENUM - Enum of TriaVertexInput +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=TriaVertexInputEnum() +- +-macro=StringToEnum('TriaVertexInput'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaVertexInputEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaVertexInputEnum.m (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaVertexInputEnum.m (revision 11322) +@@ -1,11 +0,0 @@ +-function macro=PentaVertexInputEnum() +-%PENTAVERTEXINPUTENUM - Enum of PentaVertexInput +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=PentaVertexInputEnum() +- +-macro=StringToEnum('PentaVertexInput'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaVertexElementResultEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaVertexElementResultEnum.m (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaVertexElementResultEnum.m (revision 11322) +@@ -1,11 +0,0 @@ +-function macro=TriaVertexElementResultEnum() +-%TRIAVERTEXELEMENTRESULTENUM - Enum of TriaVertexElementResult +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=TriaVertexElementResultEnum() +- +-macro=StringToEnum('TriaVertexElementResult'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaVertexElementResultEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaVertexElementResultEnum.m (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaVertexElementResultEnum.m (revision 11322) +@@ -1,11 +0,0 @@ +-function macro=PentaVertexElementResultEnum() +-%PENTAVERTEXELEMENTRESULTENUM - Enum of PentaVertexElementResult +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=PentaVertexElementResultEnum() +- +-macro=StringToEnum('PentaVertexElementResult'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaP1InputEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaP1InputEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaP1InputEnum.m (revision 11322) +@@ -0,0 +1,11 @@ ++function macro=TriaP1InputEnum() ++%TRIAP1INPUTENUM - Enum of TriaP1Input ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=TriaP1InputEnum() ++ ++macro=StringToEnum('TriaP1Input'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaP1InputEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaP1InputEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaP1InputEnum.m (revision 11322) +@@ -0,0 +1,11 @@ ++function macro=PentaP1InputEnum() ++%PENTAP1INPUTENUM - Enum of PentaP1Input ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=PentaP1InputEnum() ++ ++macro=StringToEnum('PentaP1Input'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/DiagnosticIsnewtonEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/DiagnosticIsnewtonEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/DiagnosticIsnewtonEnum.m (revision 11322) +@@ -0,0 +1,11 @@ ++function macro=DiagnosticIsnewtonEnum() ++%DIAGNOSTICISNEWTONENUM - Enum of DiagnosticIsnewton ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=DiagnosticIsnewtonEnum() ++ ++macro=StringToEnum('DiagnosticIsnewton'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaP1ElementResultEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaP1ElementResultEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/TriaP1ElementResultEnum.m (revision 11322) +@@ -0,0 +1,11 @@ ++function macro=TriaP1ElementResultEnum() ++%TRIAP1ELEMENTRESULTENUM - Enum of TriaP1ElementResult ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=TriaP1ElementResultEnum() ++ ++macro=StringToEnum('TriaP1ElementResult'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaP1ElementResultEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaP1ElementResultEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/PentaP1ElementResultEnum.m (revision 11322) +@@ -0,0 +1,11 @@ ++function macro=PentaP1ElementResultEnum() ++%PENTAP1ELEMENTRESULTENUM - Enum of PentaP1ElementResult ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=PentaP1ElementResultEnum() ++ ++macro=StringToEnum('PentaP1ElementResult'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/diagnostic.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/diagnostic.m (revision 11321) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/diagnostic.m (revision 11322) +@@ -11,6 +11,7 @@ + restol = 0; + reltol = 0; + abstol = 0; ++ isnewton = 0; + stokesreconditioning = 0; + viscosity_overshoot = 0; + icefront = NaN; +@@ -81,6 +82,7 @@ + checkfield(md,'diagnostic.restol','size',[1 1],'>',0); + checkfield(md,'diagnostic.reltol','size',[1 1]); + checkfield(md,'diagnostic.abstol','size',[1 1]); ++ checkfield(md,'diagnostic.isnewton','numel',1,'values',[0 1]); + checkfield(md,'diagnostic.stokesreconditioning','size',[1 1],'NaN',1); + checkfield(md,'diagnostic.viscosity_overshoot','size',[1 1],'NaN',1); + if md.mesh.dimension==2, +@@ -126,6 +128,7 @@ + fielddisplay(obj,'restol','mechanical equilibrium residual convergence criterion'); + fielddisplay(obj,'reltol','velocity relative convergence criterion, NaN -> not applied'); + fielddisplay(obj,'abstol','velocity absolute convergence criterion, NaN -> not applied'); ++ fielddisplay(obj,'isnewton','Apply Newton''s method instead of a Picard fixed point method'); + fielddisplay(obj,'maxiter','maximum number of nonlinear iterations'); + fielddisplay(obj,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)'); + +@@ -157,6 +160,7 @@ + WriteData(fid,'object',obj,'fieldname','restol','format','Double'); + WriteData(fid,'object',obj,'fieldname','reltol','format','Double'); + WriteData(fid,'object',obj,'fieldname','abstol','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','isnewton','format','Boolean'); + WriteData(fid,'object',obj,'fieldname','stokesreconditioning','format','Double'); + WriteData(fid,'object',obj,'fieldname','viscosity_overshoot','format','Double'); + WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer'); Index: /issm/oecreview/Archive/11319-11340/ISSM-11322-11323.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11322-11323.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11322-11323.diff (revision 11515) @@ -0,0 +1,43 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1104.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1104.m (revision 11322) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1104.m (revision 11323) +@@ -68,7 +68,7 @@ + 1e-08,1e-08,1e-08,... + 1e-08,1e-08,1e-08,... + 1e-08,1e-08,1e-08,... +- 1e-08,1e-07,1e-07,... ++ 1e-07,1e-07,1e-07,... + }; + field_values={}; + for i=1:6, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1106.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1106.m (revision 11322) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1106.m (revision 11323) +@@ -61,11 +61,11 @@ + 'Vx160km','Vy160km','Vz160km' + }; + field_tolerances={... ++ 1e-12,1e-12,1e-11,... + 1e-12,1e-12,1e-12,... + 1e-12,1e-12,1e-12,... + 1e-12,1e-12,1e-12,... + 1e-12,1e-12,1e-12,... +- 1e-12,1e-12,1e-12,... + 1e-12,1e-11,1e-12,... + }; + field_values={}; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1107.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1107.m (revision 11322) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1107.m (revision 11323) +@@ -135,7 +135,7 @@ + 1e-08,1e-08,1e-07,... + 1e-08,1e-08,1e-07,... + 1e-08,1e-08,1e-07,... +- 1e-07,1e-08,1e-07,... ++ 1e-07,1e-08,1e-06,... + }; + field_values={}; + for i=1:6, Index: /issm/oecreview/Archive/11319-11340/ISSM-11323-11324.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11323-11324.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11323-11324.diff (revision 11515) @@ -0,0 +1,81 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 11323) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 11324) +@@ -142,8 +142,12 @@ + + /*Assign output pointers: */ + if(pKff) *pKff=Kff; ++ else MatFree(&Kff); + if(pKfs) *pKfs=Kfs; ++ else MatFree(&Kfs); + if(ppf) *ppf=pf; ++ else VecFree(&pf); + if(pdf) *pdf=df; ++ else VecFree(&df); + if(pkmax) *pkmax=kmax; + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11323) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11324) +@@ -46,39 +46,40 @@ + + for(;;){ + +- //save pointer to old velocity + VecFree(&old_ug);old_ug=ug; + VecFree(&old_uf);old_uf=uf; + ++ /*Solver forward model*/ + SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); + Reduceloadx(pf,Kfs,ys);MatFree(&Kfs); +- Solverx(&uf,Kff,pf,old_uf,df,femmodel->parameters); +- +- convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); +- +- CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); +- +- Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters); +- InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); +- SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); +- VecDuplicate(pf,&pJf); +- MatMultPatch(Kff,uf,pJf); +- VecAXPY(pJf,-1.,pf); +- Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); +- MatFree(&Kff);VecFree(&pf); VecFree(&df); +- VecAXPY(uf,-1.,duf); ++ Solverx(&uf,Kff,pf,old_uf,df,femmodel->parameters);VecFree(&df); + Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); ++ InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);VecFree(&ug); + +- InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); +- +- /*Increase count: */ ++ /*Check convergence*/ ++ convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); ++ MatFree(&Kff);VecFree(&pf); + count++; + if(converged==true)break; + if(count>=max_nonlinear_iterations){ + _printf_(true," maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); + break; + } ++ ++ /*Prepare next iteration using Newton's method*/ ++ CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ SystemMatricesx(&Kff,NULL,&pf,NULL,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); ++ VecDuplicate(pf,&pJf); ++ MatMultPatch(Kff,uf,pJf); MatFree(&Kff); ++ VecScale(pJf,-1.); ++ VecAXPY(pJf,+1.,pf); VecFree(&pf); ++ Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); ++ MatFree(&Jff); VecFree(&pJf); ++ VecAXPY(uf,+1.,duf); VecFree(&duf); ++ Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); ++ InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); + } + + _printf_(VerboseConvergence(),"\n total number of iterations: %i\n",count-1); Index: /issm/oecreview/Archive/11319-11340/ISSM-11324-11325.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11324-11325.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11324-11325.diff (revision 11515) @@ -0,0 +1,32 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1109.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1109.m (revision 11324) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test1109.m (revision 11325) +@@ -87,15 +87,15 @@ + end + %Fields and tolerances to track changes + field_names ={ ... +- 'VxPattynSliding','VyPattynSliding','VzPattynSliding',... ++ 'VyPattynSliding','VzPattynSliding',... + 'VxStokesSliding','VyStokesSliding','VzStokesSliding',... +- 'VxPattynFrozen','VyPattynFrozen','VzPattynFrozen',... ++ 'VyPattynFrozen','VzPattynFrozen',... + 'VxStokesFrozen','VyStokesFrozen','VzStokesFrozen' + }; + field_tolerances={... +- 1e-06,1e-05,1e-05,... ++ 1e-05,1e-05,... + 1e-06,1e-06,1e-06,... +- 1e-06,1e-05,1e-04,... ++ 1e-05,1e-04,... + 1e-06,1e-06,1e-06,... + }; + field_values={}; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive1109.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive101.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11319-11340/ISSM-11325-11326.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11325-11326.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11325-11326.diff (revision 11515) @@ -0,0 +1,89 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 11325) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 11326) +@@ -403,7 +403,7 @@ + " please try to keep the alphabetical ordering " + """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + "ISSM containers: +-syn keyword cType Constraints DataSet Elements Inputs Loads Materials Parameters Results Vertices ++syn keyword cType Constraints DataSet Elements Inputs Loads Materials Nodes Parameters Results Vertices + "Petsc + syn keyword cType Vec Mat + "other ISSM's syntax +@@ -433,6 +433,7 @@ + syn keyword cType Penpair + syn keyword cType Pengrid + syn keyword cType Element ++syn keyword cType Load + syn keyword cType Penta + syn keyword cType PentaHook + syn keyword cType PentaRef +@@ -464,6 +465,7 @@ + syn keyword cType KML_Style + syn keyword cType KML_StyleSelector + syn keyword cType KML_SubStyle ++syn keyword cType KML_Unknown + syn keyword cType KMLFileReadUtils + syn keyword cType Option + syn keyword cType OptionDouble +@@ -476,15 +478,15 @@ + syn keyword cType BoolInput + syn keyword cType DoubleInput + syn keyword cType IntInput +-syn keyword cType PentaVertexInput +-syn keyword cType TriaVertexInput ++syn keyword cType PentaP1Input ++syn keyword cType TriaP1Input + syn keyword cType ControlInput + syn keyword cType DatasetInput + syn keyword cType TransientInput + syn keyword cType ElementResult + syn keyword cType DoubleElementResult +-syn keyword cType TriaVertexElementResult +-syn keyword cType PentaVertexElementResult ++syn keyword cType TriaP1ElementResult ++syn keyword cType PentaP1ElementResult + syn keyword cType BoolElementResult + syn keyword cType ExternalResult + syn keyword cType BoolExternalResult +@@ -561,6 +563,7 @@ + syn keyword cConstant ConstantsYtsEnum + syn keyword cConstant DiagnosticAbstolEnum + syn keyword cConstant DiagnosticIcefrontEnum ++syn keyword cConstant DiagnosticIsnewtonEnum + syn keyword cConstant DiagnosticMaxiterEnum + syn keyword cConstant DiagnosticNumRequestedOutputsEnum + syn keyword cConstant DiagnosticPenaltyFactorEnum +@@ -786,7 +789,7 @@ + syn keyword cConstant PengridEnum + syn keyword cConstant PenpairEnum + syn keyword cConstant PentaEnum +-syn keyword cConstant PentaVertexInputEnum ++syn keyword cConstant PentaP1InputEnum + syn keyword cConstant PetscMatParamEnum + syn keyword cConstant PetscVecParamEnum + syn keyword cConstant RiftfrontEnum +@@ -799,7 +802,7 @@ + syn keyword cConstant StringArrayParamEnum + syn keyword cConstant StringParamEnum + syn keyword cConstant TriaEnum +-syn keyword cConstant TriaVertexInputEnum ++syn keyword cConstant TriaP1InputEnum + syn keyword cConstant VertexEnum + syn keyword cConstant AirEnum + syn keyword cConstant IceEnum +@@ -908,11 +911,11 @@ + syn keyword cConstant PatchEnum + syn keyword cConstant PatchNodesEnum + syn keyword cConstant PatchVerticesEnum +-syn keyword cConstant PentaVertexElementResultEnum ++syn keyword cConstant PentaP1ElementResultEnum + syn keyword cConstant PetscVecExternalResultEnum + syn keyword cConstant StringExternalResultEnum + syn keyword cConstant TimeEnum +-syn keyword cConstant TriaVertexElementResultEnum ++syn keyword cConstant TriaP1ElementResultEnum + syn keyword cConstant WaterColumnOldEnum + syn keyword cConstant MinVelEnum + syn keyword cConstant MaxVelEnum Index: /issm/oecreview/Archive/11319-11340/ISSM-11326-11327.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11326-11327.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11326-11327.diff (revision 11515) @@ -0,0 +1,233 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 11327) +@@ -9,12 +9,13 @@ + #include "../../toolkits/toolkits.h" + #include "../../EnumDefinitions/EnumDefinitions.h" + +-void CreateJacobianMatrixx(Mat* pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ ++void CreateJacobianMatrixx(Mat* pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,double kmax){ + +- int connectivity; ++ int i,connectivity; + int numberofdofspernode; + int fsize,configuration_type; + Element *element = NULL; ++ Load *load = NULL; + Mat Jff = NULL; + + /*Checks*/ +@@ -30,10 +31,15 @@ + Jff=NewMat(fsize,fsize,connectivity,numberofdofspernode); + + /*Create and assemble matrix*/ +- for(int i=0;iSize();i++){ ++ for(i=0;iSize();i++){ + element=(Element*)elements->GetObjectByOffset(i); + element->CreateJacobianMatrix(Jff); + } ++ for (i=0;iSize();i++){ ++ load=(Load*)loads->GetObjectByOffset(i); ++ if(load->InAnalysis(configuration_type)) load->CreateJacobianMatrix(Jff); ++ if(load->InAnalysis(configuration_type)) load->PenaltyCreateJacobianMatrix(Jff,kmax); ++ } + MatAssemblyBegin(Jff,MAT_FINAL_ASSEMBLY); + MatAssemblyEnd(Jff,MAT_FINAL_ASSEMBLY); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h (revision 11327) +@@ -9,6 +9,6 @@ + #include "../../objects/objects.h" + + /* local prototypes: */ +-void CreateJacobianMatrixx(Mat* pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters); ++void CreateJacobianMatrixx(Mat* pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,double kmax); + + #endif /* _CREATEJACOBIANMATRIXX_H */ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 11327) +@@ -250,6 +250,12 @@ + int i,j; + double* localvalues=NULL; + ++ /*If Kfs is not provided, call the other function*/ ++ if(!Kfs){ ++ this->AddToGlobal(Kff); ++ return; ++ } ++ + /*In debugging mode, check consistency (no NaN, and values not too big)*/ + this->CheckConsistency(); + +@@ -299,6 +305,9 @@ + int i,j; + double* localvalues=NULL; + ++ /*Check that Jff is not NULL*/ ++ _assert_(Jff); ++ + /*In debugging mode, check consistency (no NaN, and values not too big)*/ + this->CheckConsistency(); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 11327) +@@ -75,6 +75,8 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs); + void CreatePVector(Vec pf); ++ void CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");}; ++ void PenaltyCreateJacobianMatrix(Mat Jff,double kmax){_error_("Not implemented yet");}; + void PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax); + void PenaltyCreatePVector(Vec pf, double kmax); + bool InAnalysis(int analysis_type); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 11327) +@@ -213,6 +213,14 @@ + + } + /*}}}1*/ ++/*FUNCTION Penpair::CreateJacobianMatrix{{{1*/ ++void Penpair::CreateJacobianMatrix(Mat Jff){ ++ /*If you code this piece, don't forget that a penalty will be inactive if it is dealing with clone nodes*/ ++ /*No loads applied, do nothing: */ ++ return; ++ ++} ++/*}}}1*/ + /*FUNCTION Penpair::PenaltyCreateKMatrix {{{1*/ + void Penpair::PenaltyCreateKMatrix(Mat Kff, Mat Kfs,double kmax){ + +@@ -245,6 +253,11 @@ + return; + } + /*}}}1*/ ++/*FUNCTION Penpair::PenaltyCreateJacobianMatrix{{{1*/ ++void Penpair::PenaltyCreateJacobianMatrix(Mat Jff,double kmax){ ++ this->PenaltyCreateKMatrix(Jff,NULL,kmax); ++} ++/*}}}1*/ + /*FUNCTION Penpair::InAnalysis{{{1*/ + bool Penpair::InAnalysis(int in_analysis_type){ + if (in_analysis_type==this->analysis_type)return true; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 11327) +@@ -83,6 +83,8 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs); + void CreatePVector(Vec pf); ++ void CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");}; ++ void PenaltyCreateJacobianMatrix(Mat Jff,double kmax){_error_("Not implemented yet");}; + void PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax); + void PenaltyCreatePVector(Vec pf, double kmax); + bool InAnalysis(int analysis_type); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Numericalflux.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Numericalflux.h (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Numericalflux.h (revision 11327) +@@ -71,6 +71,8 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs); + void CreatePVector(Vec pf); ++ void CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");}; ++ void PenaltyCreateJacobianMatrix(Mat Jff,double kmax){_error_("Not implemented yet");}; + void PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax); + void PenaltyCreatePVector(Vec pf, double kmax); + bool InAnalysis(int analysis_type); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.h (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.h (revision 11327) +@@ -63,8 +63,10 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs); + void CreatePVector(Vec pf); +- void PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax); ++ void CreateJacobianMatrix(Mat Jff); ++ void PenaltyCreateKMatrix(Mat Kff,Mat Kfs,double kmax); + void PenaltyCreatePVector(Vec pf, double kmax); ++ void PenaltyCreateJacobianMatrix(Mat Jff,double kmax); + bool InAnalysis(int analysis_type); + /*}}}*/ + /*Penpair management: {{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Load.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Load.h (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Load.h (revision 11327) +@@ -28,6 +28,8 @@ + virtual void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; + virtual void CreateKMatrix(Mat Kff, Mat Kfs)=0; + virtual void CreatePVector(Vec pf)=0; ++ virtual void CreateJacobianMatrix(Mat Jff)=0; ++ virtual void PenaltyCreateJacobianMatrix(Mat Jff,double kmax)=0; + virtual void PenaltyCreateKMatrix(Mat Kff, Mat Kfs, double kmax)=0; + virtual void PenaltyCreatePVector(Vec pf, double kmax)=0; + virtual bool InAnalysis(int analysis_type)=0; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Pengrid.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Pengrid.h (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Pengrid.h (revision 11327) +@@ -76,6 +76,8 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs); + void CreatePVector(Vec pf); ++ void CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");}; ++ void PenaltyCreateJacobianMatrix(Mat Jff,double kmax){_error_("Not implemented yet");}; + void PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax); + void PenaltyCreatePVector(Vec pf, double kmax); + bool InAnalysis(int analysis_type); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11326) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11327) +@@ -13,16 +13,16 @@ + void solver_newton(FemModel* femmodel){ + + /*intermediary: */ ++ bool converged; ++ int num_unstable_constraints; ++ int count; ++ double kmax; + Mat Kff = NULL, Kfs = NULL, Jff = NULL; + Vec ug = NULL, old_ug = NULL; + Vec uf = NULL, old_uf = NULL, duf = NULL; + Vec pf = NULL, pJf = NULL; + Vec df = NULL; + Vec ys = NULL; +- +- bool converged; +- int num_unstable_constraints; +- int count; + + /*parameters:*/ + int max_nonlinear_iterations; +@@ -68,8 +68,8 @@ + } + + /*Prepare next iteration using Newton's method*/ +- CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); +- SystemMatricesx(&Kff,NULL,&pf,NULL,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ SystemMatricesx(&Kff,NULL,&pf,NULL,&kmax,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,kmax); + CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); + VecDuplicate(pf,&pJf); + MatMultPatch(Kff,uf,pJf); MatFree(&Kff); +@@ -77,7 +77,7 @@ + VecAXPY(pJf,+1.,pf); VecFree(&pf); + Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); + MatFree(&Jff); VecFree(&pJf); +- VecAXPY(uf,+1.,duf); VecFree(&duf); ++ VecAXPY(uf,1.,duf); VecFree(&duf); + Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); + InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); + } Index: /issm/oecreview/Archive/11319-11340/ISSM-11327-11328.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11327-11328.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11327-11328.diff (revision 11515) @@ -0,0 +1,4 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive1208.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11319-11340/ISSM-11331-11332.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11331-11332.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11331-11332.diff (revision 11515) @@ -0,0 +1,437 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 11332) +@@ -556,6 +556,37 @@ + *pmu_prime=mu_prime; + } + /*}}}*/ ++/*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{1*/ ++void Matice::GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* epsilon){ ++ ++ /*output: */ ++ double mu_prime; ++ double mu,n,eff2; ++ ++ /*input strain rate: */ ++ double exx,eyy,exy,exz; ++ ++ /*Get visocisty and n*/ ++ GetViscosity2d(&mu,epsilon); ++ n=GetN(); ++ ++ if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){ ++ mu_prime=0.5*pow((double)10,(double)14); ++ } ++ else{ ++ /*Retrive strain rate components: */ ++ exx=epsilon[0]; ++ eyy=epsilon[1]; ++ exy=epsilon[2]; ++ eff2 = exx*exx + eyy*eyy + exx*eyy + exy*exy ; ++ ++ mu_prime=(1-n)/(2*n) * mu/eff2; ++ } ++ ++ /*Assign output pointers:*/ ++ *pmu_prime=mu_prime; ++} ++/*}}}*/ + /*FUNCTION Matice::InputDuplicate{{{1*/ + void Matice::InputDuplicate(int original_enum,int new_enum){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.h (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matice.h (revision 11332) +@@ -68,6 +68,7 @@ + void GetViscosity3dStokes(double* pviscosity3d, double* epsilon); + void GetViscosityComplement(double* pviscosity_complement, double* pepsilon); + void GetViscosityDerivativeEpsSquare(double* pmu_prime, double* pepsilon); ++ void GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* pepsilon); + double GetB(); + double GetBbar(); + double GetN(); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 11332) +@@ -75,10 +75,10 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs); + void CreatePVector(Vec pf); +- void CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");}; +- void PenaltyCreateJacobianMatrix(Mat Jff,double kmax){_error_("Not implemented yet");}; ++ void CreateJacobianMatrix(Mat Jff); + void PenaltyCreateKMatrix(Mat Kff, Mat kfs, double kmax); + void PenaltyCreatePVector(Vec pf, double kmax); ++ void PenaltyCreateJacobianMatrix(Mat Jff,double kmax); + bool InAnalysis(int analysis_type); + /*}}}*/ + /*Load management: {{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 11332) +@@ -215,10 +215,7 @@ + /*}}}1*/ + /*FUNCTION Penpair::CreateJacobianMatrix{{{1*/ + void Penpair::CreateJacobianMatrix(Mat Jff){ +- /*If you code this piece, don't forget that a penalty will be inactive if it is dealing with clone nodes*/ +- /*No loads applied, do nothing: */ +- return; +- ++ this->CreateKMatrix(Jff,NULL); + } + /*}}}1*/ + /*FUNCTION Penpair::PenaltyCreateKMatrix {{{1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 11332) +@@ -360,6 +360,11 @@ + } + } + /*}}}*/ ++/*FUNCTION Icefront::CreateJacobianMatrix{{{1*/ ++void Icefront::CreateJacobianMatrix(Mat Jff){ ++ this->CreateKMatrix(Jff,NULL); ++} ++/*}}}1*/ + /*FUNCTION Icefront::PenaltyCreateKMatrix {{{1*/ + void Icefront::PenaltyCreateKMatrix(Mat Kff, Mat Kfs, double kmax){ + /*do nothing: */ +@@ -372,6 +377,11 @@ + return; + } + /*}}}*/ ++/*FUNCTION Icefront::PenaltyCreateJacobianMatrix{{{1*/ ++void Icefront::PenaltyCreateJacobianMatrix(Mat Jff,double kmax){ ++ this->PenaltyCreateKMatrix(Jff,NULL,kmax); ++} ++/*}}}1*/ + /*FUNCTION Icefront::InAnalysis{{{1*/ + bool Icefront::InAnalysis(int in_analysis_type){ + if (in_analysis_type==this->analysis_type)return true; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11332) +@@ -887,6 +887,39 @@ + return pe; + } + /*}}}*/ ++/*FUNCTION Tria::CreateJacobianMatrix{{{1*/ ++void Tria::CreateJacobianMatrix(Mat Jff){ ++ ++ /*retrieve parameters: */ ++ ElementMatrix* Ke=NULL; ++ int analysis_type; ++ parameters->FindParam(&analysis_type,AnalysisTypeEnum); ++ ++ /*Checks in debugging {{{2*/ ++ _assert_(this->nodes && this->matice && this->matpar && this->parameters && this->inputs); ++ /*}}}*/ ++ ++ /*Skip if water element*/ ++ if(IsOnWater()) return; ++ ++ /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ ++ switch(analysis_type){ ++#ifdef _HAVE_DIAGNOSTIC_ ++ case DiagnosticHorizAnalysisEnum: ++ Ke=CreateJacobianDiagnosticMacayeal(); ++ break; ++#endif ++ default: ++ _error_("analysis %i (%s) not supported yet",analysis_type,EnumToStringx(analysis_type)); ++ } ++ ++ /*Add to global matrix*/ ++ if(Ke){ ++ Ke->AddToGlobal(Jff); ++ delete Ke; ++ } ++} ++/*}}}*/ + /*FUNCTION Tria::ComputeBasalStress {{{1*/ + void Tria::ComputeBasalStress(Vec eps){ + _error_("Not Implemented yet"); +@@ -3029,6 +3062,72 @@ + return pe; + } + /*}}}*/ ++/*FUNCTION Tria::CreateJacobianDiagnosticPattyn{{{1*/ ++ElementMatrix* Tria::CreateJacobianDiagnosticMacayeal(void){ ++ ++ /*Constants*/ ++ const int numdof=NDOF2*NUMVERTICES; ++ ++ /*Intermediaries */ ++ int i,j,ig; ++ double xyz_list[NUMVERTICES][3]; ++ double Jdet,thickness; ++ double eps1dotdphii,eps1dotdphij; ++ double eps2dotdphii,eps2dotdphij; ++ double mu_prime; ++ double epsilon[3];/* epsilon=[exx,eyy,exy];*/ ++ double eps1[2],eps2[2]; ++ double phi[NUMVERTICES]; ++ double dphi[2][NUMVERTICES]; ++ GaussTria *gauss=NULL; ++ ++ /*Initialize Jacobian with regular MacAyeal (first part of the Gateau derivative)*/ ++ ElementMatrix* Ke=CreateKMatrixDiagnosticMacAyeal(); ++ ++ /*Retrieve all inputs and parameters*/ ++ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); ++ ++ /* Start looping on the number of gaussian points: */ ++ gauss=new GaussTria(2); ++ for (ig=gauss->begin();igend();ig++){ ++ ++ gauss->GaussPoint(ig); ++ ++ GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss); ++ GetNodalFunctionsDerivatives(&dphi[0][0],&xyz_list[0][0],gauss); ++ ++ thickness_input->GetInputValue(&thickness, gauss); ++ this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); ++ matice->GetViscosity2dDerivativeEpsSquare(&mu_prime,&epsilon[0]); ++ eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; ++ eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; ++ ++ for(i=0;i<3;i++){ ++ for(j=0;j<3;j++){ ++ eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]; ++ eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]; ++ eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]; ++ eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]; ++ ++ Ke->values[6*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps1dotdphii; ++ Ke->values[6*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps1dotdphii; ++ Ke->values[6*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps2dotdphii; ++ Ke->values[6*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps2dotdphii; ++ } ++ } ++ } ++ ++ /*Transform Coordinate System*/ ++ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); ++ ++ /*Clean up and return*/ ++ delete gauss; ++ return Ke; ++} ++/*}}}*/ + /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{1*/ + void Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11332) +@@ -83,7 +83,7 @@ + void SetCurrentConfiguration(Elements* elements,Loads* loads,DataSet* nodes,Materials* materials,Parameters* parameters); + void CreateKMatrix(Mat Kff, Mat Kfs,Vec df); + void CreatePVector(Vec pf); +- void CreateJacobianMatrix(Mat Jff){_error_("Not implemented yet");}; ++ void CreateJacobianMatrix(Mat Jff); + int GetNodeIndex(Node* node); + int Sid(); + bool IsOnBed(); +@@ -207,6 +207,7 @@ + ElementMatrix* CreateKMatrixDiagnosticHutter(void); + ElementVector* CreatePVectorDiagnosticMacAyeal(void); + ElementVector* CreatePVectorDiagnosticHutter(void); ++ ElementMatrix* CreateJacobianDiagnosticMacayeal(void); + void GetSolutionFromInputsDiagnosticHoriz(Vec solution); + void GetSolutionFromInputsDiagnosticHutter(Vec solution); + void InputUpdateFromSolutionDiagnosticHoriz( double* solution); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11332) +@@ -6256,73 +6256,6 @@ + return Ke; + } + /*}}}*/ +-/*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{1*/ +-ElementMatrix* Penta::CreateJacobianDiagnosticPattyn(void){ +- +- /*Constants*/ +- const int numdof=NDOF2*NUMVERTICES; +- +- /*Intermediaries */ +- int i,j,ig; +- int approximation; +- double xyz_list[NUMVERTICES][3]; +- double Jdet; +- double eps1dotdphii,eps1dotdphij; +- double eps2dotdphii,eps2dotdphij; +- double mu_prime; +- double epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ +- double eps1[3],eps2[3]; +- double phi[NUMVERTICES]; +- double dphi[3][NUMVERTICES]; +- GaussPenta *gauss=NULL; +- +- /*Initialize Jacobian with regular Pattyn (first part of the Gateau derivative)*/ +- ElementMatrix* Ke=CreateKMatrixDiagnosticPattyn(); +- +- /*Retrieve all inputs and parameters*/ +- inputs->GetInputValue(&approximation,ApproximationEnum); +- GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); +- Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); +- Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); +- +- /* Start looping on the number of gaussian points: */ +- gauss=new GaussPenta(5,5); +- for (ig=gauss->begin();igend();ig++){ +- +- gauss->GaussPoint(ig); +- +- GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); +- GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); +- +- this->GetStrainRate3dPattyn(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); +- matice->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); +- eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; +- eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; +- eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; +- +- for(i=0;i<6;i++){ +- for(j=0;j<6;j++){ +- eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; +- eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; +- eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; +- eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; +- +- Ke->values[12*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; +- Ke->values[12*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; +- Ke->values[12*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; +- Ke->values[12*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; +- } +- } +- } +- +- /*Transform Coordinate System*/ +- TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); +- +- /*Clean up and return*/ +- delete gauss; +- return Ke; +-} +-/*}}}*/ + /*FUNCTION Penta::CreateKMatrixDiagnosticPattynFriction{{{1*/ + ElementMatrix* Penta::CreateKMatrixDiagnosticPattynFriction(void){ + +@@ -7490,6 +7423,73 @@ + return pe; + } + /*}}}*/ ++/*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{1*/ ++ElementMatrix* Penta::CreateJacobianDiagnosticPattyn(void){ ++ ++ /*Constants*/ ++ const int numdof=NDOF2*NUMVERTICES; ++ ++ /*Intermediaries */ ++ int i,j,ig; ++ int approximation; ++ double xyz_list[NUMVERTICES][3]; ++ double Jdet; ++ double eps1dotdphii,eps1dotdphij; ++ double eps2dotdphii,eps2dotdphij; ++ double mu_prime; ++ double epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ ++ double eps1[3],eps2[3]; ++ double phi[NUMVERTICES]; ++ double dphi[3][NUMVERTICES]; ++ GaussPenta *gauss=NULL; ++ ++ /*Initialize Jacobian with regular Pattyn (first part of the Gateau derivative)*/ ++ ElementMatrix* Ke=CreateKMatrixDiagnosticPattyn(); ++ ++ /*Retrieve all inputs and parameters*/ ++ inputs->GetInputValue(&approximation,ApproximationEnum); ++ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ ++ /* Start looping on the number of gaussian points: */ ++ gauss=new GaussPenta(5,5); ++ for (ig=gauss->begin();igend();ig++){ ++ ++ gauss->GaussPoint(ig); ++ ++ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); ++ GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); ++ ++ this->GetStrainRate3dPattyn(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); ++ matice->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); ++ eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; ++ eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; ++ eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; ++ ++ for(i=0;i<6;i++){ ++ for(j=0;j<6;j++){ ++ eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; ++ eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; ++ eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; ++ eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; ++ ++ Ke->values[12*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; ++ Ke->values[12*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; ++ } ++ } ++ } ++ ++ /*Transform Coordinate System*/ ++ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); ++ ++ /*Clean up and return*/ ++ delete gauss; ++ return Ke; ++} ++/*}}}*/ + /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/ + void Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11331) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11332) +@@ -60,8 +60,7 @@ + /*Check convergence*/ + convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); + MatFree(&Kff);VecFree(&pf); +- count++; +- if(converged==true)break; ++ if(converged==true) break; + if(count>=max_nonlinear_iterations){ + _printf_(true," maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); + break; +@@ -70,7 +69,7 @@ + /*Prepare next iteration using Newton's method*/ + SystemMatricesx(&Kff,NULL,&pf,NULL,&kmax,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,kmax); +- CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); ++ CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);VecScale(ys,0.); + VecDuplicate(pf,&pJf); + MatMultPatch(Kff,uf,pJf); MatFree(&Kff); + VecScale(pJf,-1.); +@@ -80,6 +79,8 @@ + VecAXPY(uf,1.,duf); VecFree(&duf); + Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); + InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); ++ ++ count++; + } + + _printf_(VerboseConvergence(),"\n total number of iterations: %i\n",count-1); Index: /issm/oecreview/Archive/11319-11340/ISSM-11332-11333.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11332-11333.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11332-11333.diff (revision 11515) @@ -0,0 +1,22 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromdisk.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromdisk.m (revision 11332) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromdisk.m (revision 11333) +@@ -9,12 +9,14 @@ + help loadresultsfromdisk; + error('loadresultsfromdisk: error message.'); + end +-if ~exist(filename,'file'), +- error(['binary file ' filename ' not found.']); +-end + + if ~md.qmu.isdakota, + ++ %Check that file exists ++ if ~exist(filename,'file'), ++ error(['binary file ' filename ' not found.']); ++ end ++ + %initialize md.results if not a structure yet + if ~isstruct(md.results), + md.results=struct(); Index: /issm/oecreview/Archive/11319-11340/ISSM-11334-11335.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11334-11335.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11334-11335.diff (revision 11515) @@ -0,0 +1,161 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp (revision 11335) +@@ -0,0 +1,66 @@ ++/*\file CreateJacobianMatrix.c ++ *\brief: build system matrices (stiffness matrix, loads vector) ++ */ ++ ++#include "./CreateJacobianMatrix.h" ++ ++void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ ++ ++ /*input datasets: */ ++ Elements *elements = NULL; ++ Nodes *nodes = NULL; ++ Vertices *vertices = NULL; ++ Loads *loads = NULL; ++ Materials *materials = NULL; ++ Parameters *parameters = NULL; ++ double kmax; ++ ++ /* output datasets: */ ++ Mat Jff = NULL; ++ ++ /*Boot module: */ ++ MODULEBOOT(); ++ ++ /*checks on arguments on the matlab side: */ ++ CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&CreateJacobianMatrixUsage); ++ ++ /*Input datasets: */ ++ FetchMatlabData((DataSet**)&elements,ELEMENTS); ++ FetchMatlabData((DataSet**)&nodes,NODES); ++ FetchMatlabData((DataSet**)&vertices,VERTICES); ++ FetchMatlabData((DataSet**)&loads,LOADS); ++ FetchMatlabData((DataSet**)&materials,MATERIALS); ++ FetchMatlabData(¶meters,PARAMETERS); ++ FetchMatlabData(&kmax,KMAX); ++ ++ /*configure: */ ++ elements-> Configure(elements,loads, nodes,vertices, materials,parameters); ++ nodes-> Configure(elements,loads, nodes,vertices, materials,parameters); ++ loads-> Configure(elements, loads, nodes,vertices, materials,parameters); ++ materials-> Configure(elements, loads, nodes,vertices, materials,parameters); ++ ++ /*!Generate internal degree of freedom numbers: */ ++ CreateJacobianMatrixx(&Jff,elements,nodes,vertices,loads,materials,parameters,kmax); ++ ++ /*write output datasets: */ ++ WriteMatlabData(JFF,Jff); ++ ++ /*Free ressources: */ ++ delete elements; ++ delete nodes; ++ delete vertices; ++ delete loads; ++ delete materials; ++ delete parameters; ++ MatFree(&Jff); ++ ++ /*end module: */ ++ MODULEEND(); ++} ++ ++void CreateJacobianMatrixUsage(void) ++{ ++ _printf_(true,"\n"); ++ _printf_(true," usage: [Jff] = %s(elements,nodes,vertices,loads,materials,parameters,kmax);\n",__FUNCT__); ++ _printf_(true,"\n"); ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h (revision 11335) +@@ -0,0 +1,37 @@ ++/* ++ CreateJacobianMatrix.h ++*/ ++ ++#ifndef _CREATEJACOBIANMATRIX_H ++#define _CREATEJACOBIANMATRIX_H ++ ++/* local prototypes: */ ++void CreateJacobianMatrixUsage(void); ++ ++#include "../../c/modules/modules.h" ++#include "../../c/Container/Container.h" ++#include "../../c/shared/shared.h" ++#include "../../c/EnumDefinitions/EnumDefinitions.h" ++ ++#undef __FUNCT__ ++#define __FUNCT__ "CreateJacobianMatrix" ++ ++/* serial input macros: */ ++#define ELEMENTS (mxArray *)prhs[0] ++#define NODES (mxArray *)prhs[1] ++#define VERTICES (mxArray *)prhs[2] ++#define LOADS (mxArray *)prhs[3] ++#define MATERIALS (mxArray *)prhs[4] ++#define PARAMETERS (mxArray *)prhs[5] ++#define KMAX (mxArray *)prhs[6] ++ ++/* serial output macros: */ ++#define JFF (mxArray**)&plhs[0] ++ ++/* serial arg counts: */ ++#undef NLHS ++#define NLHS 1 ++#undef NRHS ++#define NRHS 7 ++ ++#endif /* _CREATEJACOBIANMATRIX_H*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11334) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11335) +@@ -21,6 +21,7 @@ + ContourToNodes \ + CostFunction \ + CreateNodalConstraints\ ++ CreateJacobianMatrix\ + Echo\ + ElementConnectivity\ + EnumToString\ +@@ -326,6 +327,10 @@ + SystemMatrices_SOURCES = SystemMatrices/SystemMatrices.cpp\ + SystemMatrices/SystemMatrices.h + ++ ++CreateJacobianMatrix_SOURCES = CreateJacobianMatrix/CreateJacobianMatrix.cpp\ ++ CreateJacobianMatrix/CreateJacobianMatrix.h ++ + SurfaceArea_SOURCES = SurfaceArea/SurfaceArea.cpp\ + SurfaceArea/SurfaceArea.h + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/diagnostic_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/diagnostic_core.m (revision 11334) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/diagnostic_core.m (revision 11335) +@@ -14,6 +14,7 @@ + ishutter=femmodel.parameters.FlowequationIshutter; + ismacayealpattyn=femmodel.parameters.FlowequationIsmacayealpattyn; + isstokes=femmodel.parameters.FlowequationIsstokes; ++ isnewton=femmodel.parameters.DiagnosticIsnewton; + dakota_analysis=femmodel.parameters.QmuIsdakota; + control_analysis=femmodel.parameters.InversionIscontrol; + solution_type=femmodel.parameters.SolutionType; +@@ -52,7 +53,11 @@ + + issmprintf(VerboseSolution,'\n%s',[' computing horizontal velocities']); + femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); +- femmodel=solver_nonlinear(femmodel,modify_loads); ++ if isnewton, ++ femmodel=solver_newton(femmodel); ++ else ++ femmodel=solver_nonlinear(femmodel,modify_loads); ++ end + end + + if ismacayealpattyn & isstokes, Index: /issm/oecreview/Archive/11319-11340/ISSM-11335-11336.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11335-11336.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11335-11336.diff (revision 11515) @@ -0,0 +1,67 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m (revision 11336) +@@ -0,0 +1,62 @@ ++function femmodel=solver_newton(femmodel) ++%SOLVER_NEWTON - core solver of diagnostic run ++% ++% Usage: ++% [femmodel]=solver_newton(femmodel) ++ ++ %Branch on partitioning schema requested ++ maxiter=femmodel.parameters.DiagnosticMaxiter; ++ configuration_type=femmodel.parameters.ConfigurationType; ++ [femmodel.nodes]=UpdateConstraints(femmodel.nodes,femmodel.constraints,femmodel.parameters); ++ ++ %initialize solution vector ++ converged=0; count=1; ++ ++ %Start non-linear iteration using input velocity: ++ ug=GetSolutionFromInputs(femmodel.elements, femmodel.nodes, femmodel.vertices, femmodel.loads, femmodel.materials, femmodel.parameters); ++ uf=Reducevectorgtof( ug, femmodel.nodes,femmodel.parameters); ++ ++ %Update the solution to make sure that vx and vxold are similar ++ [femmodel.elements femmodel.loads]=InputUpdateFromConstant(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,double(converged),ConvergedEnum); ++ [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ug); ++ ++ while(~converged), ++ ++ %save pointer to old velocity ++ old_ug=ug; ++ old_uf=uf; ++ ++ %Solver forward model ++ [K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters); ++ ys=CreateNodalConstraints(femmodel.nodes,configuration_type); ++ p_f=Reduceload( p_f, K_fs, ys); ++ issmprintf(VerboseSolver(),'%s%g',' condition number of stiffness matrix: ',condest(K_ff)); ++ uf=Solver(K_ff,p_f,old_uf,df,femmodel.parameters); ++ ug=Mergesolutionfromftog( uf, ys, femmodel.nodes,femmodel.parameters); ++ [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ug); ++ ++ %Check convergence ++ converged=convergence(K_ff,p_f,uf,old_uf,femmodel.parameters); ++ if(converged==1) break; end ++ if(count>maxiter), ++ issmprintf(true,'%s%i%s',' maximum number of iterations ',maxiter,' exceeded'); ++ break; ++ end ++ ++ %Prepare next iteration using Newton's method ++ [K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters); ++ ys=CreateNodalConstraints(femmodel.nodes,configuration_type); ++ p_f=Reduceload( p_f, K_fs, ys); ++ pJf=p_f-K_ff*uf; ++ Jff=CreateJacobianMatrix(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,kmax); ++ duf=Solver(Jff,pJf,[],[],femmodel.parameters); ++ ys=0*ys; ++ uf=uf+duf; ++ ug=Mergesolutionfromftog(uf,ys,femmodel.nodes,femmodel.parameters); ++ [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ug); ++ ++ %increase count ++ count=count+1; ++ ++ end ++end Index: /issm/oecreview/Archive/11319-11340/ISSM-11336-11337.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11336-11337.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11336-11337.diff (revision 11515) @@ -0,0 +1,39 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11336) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11337) +@@ -67,15 +67,17 @@ + } + + /*Prepare next iteration using Newton's method*/ +- SystemMatricesx(&Kff,NULL,&pf,NULL,&kmax,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); +- CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,kmax); +- CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);VecScale(ys,0.); ++ SystemMatricesx(&Kff,&Kfs,&pf,NULL,&kmax,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); ++ CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type); ++ Reduceloadx(pf,Kfs,ys); MatFree(&Kfs); ++ + VecDuplicate(pf,&pJf); + MatMultPatch(Kff,uf,pJf); MatFree(&Kff); + VecScale(pJf,-1.); + VecAXPY(pJf,+1.,pf); VecFree(&pf); +- Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); +- MatFree(&Jff); VecFree(&pJf); ++ ++ CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,kmax); ++ Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); MatFree(&Jff);//VecFree(&pJf); + VecAXPY(uf,1.,duf); VecFree(&duf); + Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); + InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m (revision 11336) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m (revision 11337) +@@ -50,7 +50,6 @@ + pJf=p_f-K_ff*uf; + Jff=CreateJacobianMatrix(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,kmax); + duf=Solver(Jff,pJf,[],[],femmodel.parameters); +- ys=0*ys; + uf=uf+duf; + ug=Mergesolutionfromftog(uf,ys,femmodel.nodes,femmodel.parameters); + [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ug); Index: /issm/oecreview/Archive/11319-11340/ISSM-11337-11338.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11337-11338.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11337-11338.diff (revision 11515) @@ -0,0 +1,140 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11337) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11338) +@@ -787,7 +787,7 @@ + switch(analysis_type){ + #ifdef _HAVE_DIAGNOSTIC_ + case DiagnosticHorizAnalysisEnum: +- Ke=CreateJacobianDiagnosticPattyn(); ++ Ke=CreateJacobianDiagnosticHoriz(); + break; + #endif + default: +@@ -7423,6 +7423,24 @@ + return pe; + } + /*}}}*/ ++/*FUNCTION Penta::CreateJacobianDiagnosticHoriz{{{1*/ ++ElementMatrix* Penta::CreateJacobianDiagnosticHoriz(void){ ++ ++ int approximation; ++ inputs->GetInputValue(&approximation,ApproximationEnum); ++ ++ switch(approximation){ ++ case MacAyealApproximationEnum: ++ _error_("Not supported yet"); ++ case PattynApproximationEnum: ++ return CreateJacobianDiagnosticPattyn(); ++ case StokesApproximationEnum: ++ return CreateJacobianDiagnosticStokes(); ++ default: ++ _error_("Approximation %s not supported yet",EnumToStringx(approximation)); ++ } ++} ++/*}}}*/ + /*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{1*/ + ElementMatrix* Penta::CreateJacobianDiagnosticPattyn(void){ + +@@ -7490,6 +7508,74 @@ + return Ke; + } + /*}}}*/ ++/*FUNCTION Penta::CreateJacobianDiagnosticStokes{{{1*/ ++ElementMatrix* Penta::CreateJacobianDiagnosticStokes(void){ ++ ++ _error_("Not implemented yet"); ++ /*Constants*/ ++ const int numdof=NDOF2*NUMVERTICES; ++ ++ /*Intermediaries */ ++ int i,j,ig; ++ int approximation; ++ double xyz_list[NUMVERTICES][3]; ++ double Jdet; ++ double eps1dotdphii,eps1dotdphij; ++ double eps2dotdphii,eps2dotdphij; ++ double mu_prime; ++ double epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ ++ double eps1[3],eps2[3]; ++ double phi[NUMVERTICES]; ++ double dphi[3][NUMVERTICES]; ++ GaussPenta *gauss=NULL; ++ ++ /*Initialize Jacobian with regular Pattyn (first part of the Gateau derivative)*/ ++ ElementMatrix* Ke=CreateKMatrixDiagnosticPattyn(); ++ ++ /*Retrieve all inputs and parameters*/ ++ inputs->GetInputValue(&approximation,ApproximationEnum); ++ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ ++ /* Start looping on the number of gaussian points: */ ++ gauss=new GaussPenta(5,5); ++ for (ig=gauss->begin();igend();ig++){ ++ ++ gauss->GaussPoint(ig); ++ ++ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); ++ GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); ++ ++ this->GetStrainRate3dPattyn(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); ++ matice->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); ++ eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; ++ eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; ++ eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; ++ ++ for(i=0;i<6;i++){ ++ for(j=0;j<6;j++){ ++ eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; ++ eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; ++ eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; ++ eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; ++ ++ Ke->values[12*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; ++ Ke->values[12*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; ++ } ++ } ++ } ++ ++ /*Transform Coordinate System*/ ++ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); ++ ++ /*Clean up and return*/ ++ delete gauss; ++ return Ke; ++} ++/*}}}*/ + /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/ + void Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11337) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11338) +@@ -234,7 +234,9 @@ + ElementMatrix* CreateKMatrixDiagnosticVert(void); + ElementMatrix* CreateKMatrixDiagnosticVertVolume(void); + ElementMatrix* CreateKMatrixDiagnosticVertSurface(void); ++ ElementMatrix* CreateJacobianDiagnosticHoriz(void); + ElementMatrix* CreateJacobianDiagnosticPattyn(void); ++ ElementMatrix* CreateJacobianDiagnosticStokes(void); + void InputUpdateFromSolutionDiagnosticHoriz( double* solutiong); + void InputUpdateFromSolutionDiagnosticMacAyeal( double* solutiong); + void InputUpdateFromSolutionDiagnosticMacAyealPattyn( double* solutiong); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11337) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 11338) +@@ -77,7 +77,7 @@ + VecAXPY(pJf,+1.,pf); VecFree(&pf); + + CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,kmax); +- Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); MatFree(&Jff);//VecFree(&pJf); ++ Solverx(&duf,Jff,pJf,NULL,NULL,femmodel->parameters); MatFree(&Jff);VecFree(&pJf); + VecAXPY(uf,1.,duf); VecFree(&duf); + Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys); + InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); Index: /issm/oecreview/Archive/11319-11340/ISSM-11338-11339.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11338-11339.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11338-11339.diff (revision 11515) @@ -0,0 +1,109 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/tres.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/tres.m (revision 11338) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/tres.m (revision 11339) +@@ -9,29 +9,17 @@ + + if strcmpi(string,'diagnostic'), + if md.mesh.dimension==2, +- if isfield(md.results.DiagnosticSolution,'VxAverage'), +- md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.VxAverage); +- else +- md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- end +- if isfield(md.results.DiagnosticSolution,'VyAverage'), +- md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.VyAverage); +- else +- md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- end ++ md.initialization.vx=md.results.DiagnosticSolution.Vx; ++ md.initialization.vy=md.results.DiagnosticSolution.Vy; + else +- md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- if isfield(md.results.DiagnosticSolution,'Vz'), +- md.initialization.vz=PatchToVec(md.results.DiagnosticSolution.Vz); +- else +- md.initialization.vz=zeros(md.mesh.numberofvertices,1); +- end ++ md.initialization.vx=md.results.DiagnosticSolution.Vx; ++ md.initialization.vy=md.results.DiagnosticSolution.Vy; ++ md.initialization.vz=md.results.DiagnosticSolution.Vz; + end +- md.initialization.vel=PatchToVec(md.results.DiagnosticSolution.Vel); ++ md.initialization.vel=md.results.DiagnosticSolution.Vel; + + if isfield(md.results.DiagnosticSolution,'Pressure'), +- md.initialization.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure); ++ md.initialization.pressure=md.results.DiagnosticSolution.Pressure; + end + if md.rifts.numrifts, + if isfield(md.results.DiagnosticSolution,'riftproperties'), +@@ -41,7 +29,7 @@ + if md.inversion.iscontrol==1, + for control_parameters=md.inversion.control_parameters + %Will need to be updated... good luck ;) +- md.(EnumToModelField(control_parameters))=PatchToVec(md.results.DiagnosticSolution.(EnumToString(control_parameters))); ++ md.(EnumToModelField(control_parameters))=md.results.DiagnosticSolution.(EnumToString(control_parameters)); + end + end + +@@ -58,12 +46,12 @@ + count=1; + for i=1:length(results), + if ~isempty(md.results.TransientSolution(i).Vel), +- results2(count).Vel=PatchToVec(md.results.TransientSolution(i).Vel); +- results2(count).Surface=PatchToVec(md.results.TransientSolution(i).Surface); +- results2(count).Thickness=PatchToVec(md.results.TransientSolution(i).Thickness); +- results2(count).Bed=PatchToVec(md.results.TransientSolution(i).Bed); +- results2(count).Vx=PatchToVec(md.results.TransientSolution(i).Vx); +- results2(count).Vy=PatchToVec(md.results.TransientSolution(i).Vy); ++ results2(count).Vel=md.results.TransientSolution(i).Vel; ++ results2(count).Surface=md.results.TransientSolution(i).Surface; ++ results2(count).Thickness=md.results.TransientSolution(i).Thickness; ++ results2(count).Bed=md.results.TransientSolution(i).Bed; ++ results2(count).Vx=md.results.TransientSolution(i).Vx; ++ results2(count).Vy=md.results.TransientSolution(i).Vy; + results2(count).time=md.results.TransientSolution(i).time; + results2(count).step=md.results.TransientSolution(i).step; + if ~strcmpi(md.groundingline.migration,'None'), +@@ -75,28 +63,28 @@ + md.results.TransientSolution=results2; + clear results,results2; + elseif strcmpi(string,'steadystate'), +- md.initialization.vx=PatchToVec(md.results.SteadystateSolution.Vx); +- md.initialization.vy=PatchToVec(md.results.SteadystateSolution.Vy); ++ md.initialization.vx=md.results.SteadystateSolution.Vx; ++ md.initialization.vy=md.results.SteadystateSolution.Vy; + if isfield(md.results.SteadystateSolution,'Vz'), +- md.initialization.vz=PatchToVec(md.results.SteadystateSolution.Vz); ++ md.initialization.vz=md.results.SteadystateSolution.Vz; + end + +- md.initialization.vel=PatchToVec(md.results.SteadystateSolution.Vel); +- md.initialization.pressure=PatchToVec(md.results.SteadystateSolution.Pressure); +- md.initialization.temperature=PatchToVec(md.results.SteadystateSolution.Temperature); +- md.basalforcings.melting_rate=PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate); ++ md.initialization.vel=md.results.SteadystateSolution.Vel; ++ md.initialization.pressure=md.results.SteadystateSolution.Pressure; ++ md.initialization.temperature=md.results.SteadystateSolution.Temperature; ++ md.basalforcings.melting_rate=md.results.SteadystateSolution.BasalforcingsMeltingRate; + + if md.inversion.iscontrol==1, + for control_parameters=md.inversion.control_parameters +- md.(EnumToModelField(control_parameters))=PatchToVec(md.results.SteadystateSolution.(EnumToString(control_parameters))); ++ md.(EnumToModelField(control_parameters))=md.results.SteadystateSolution.(EnumToString(control_parameters)); + end + end + + elseif strcmpi(string,'thermal'), +- md.initialization.temperature=PatchToVec(md.results.ThermalSolution.Temperature); +- md.basalforcings.melting_rate=PatchToVec(md.results.ThermalSolution.BasalMeltingRate); ++ md.initialization.temperature=md.results.ThermalSolution.Temperature; ++ md.basalforcings.melting_rate=md.results.ThermalSolution.BasalMeltingRate; + elseif strcmpi(string,'hydrology'), +- md.initialization.watercolumn=PatchToVec(md.results.HydrologySolution.Watercolumn); ++ md.initialization.watercolumn=md.results.HydrologySolution.Watercolumn; + + else + error(['tres error message: analysis ' string ' not supported yet!']); Index: /issm/oecreview/Archive/11319-11340/ISSM-11339-11340.diff =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-11339-11340.diff (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-11339-11340.diff (revision 11515) @@ -0,0 +1,55 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11339) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11340) +@@ -7431,7 +7431,7 @@ + + switch(approximation){ + case MacAyealApproximationEnum: +- _error_("Not supported yet"); ++ return CreateJacobianDiagnosticMacayeal2d(); + case PattynApproximationEnum: + return CreateJacobianDiagnosticPattyn(); + case StokesApproximationEnum: +@@ -7441,6 +7441,29 @@ + } + } + /*}}}*/ ++/*FUNCTION Penta::CreateJacobianDiagnosticMacayeal2d{{{1*/ ++ElementMatrix* Penta::CreateJacobianDiagnosticMacayeal2d(void){ ++ ++ /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the ++ bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build ++ the stiffness matrix. */ ++ if (!IsOnBed()) return NULL; ++ ++ /*Depth Averaging B*/ ++ this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); ++ ++ /*Call Tria function*/ ++ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. ++ ElementMatrix* Ke=tria->CreateJacobianDiagnosticMacayeal(); ++ delete tria->matice; delete tria; ++ ++ /*Delete B averaged*/ ++ this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum); ++ ++ /*clean up and return*/ ++ return Ke; ++} ++/*}}}*/ + /*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{1*/ + ElementMatrix* Penta::CreateJacobianDiagnosticPattyn(void){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11339) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11340) +@@ -235,6 +235,7 @@ + ElementMatrix* CreateKMatrixDiagnosticVertVolume(void); + ElementMatrix* CreateKMatrixDiagnosticVertSurface(void); + ElementMatrix* CreateJacobianDiagnosticHoriz(void); ++ ElementMatrix* CreateJacobianDiagnosticMacayeal2d(void); + ElementMatrix* CreateJacobianDiagnosticPattyn(void); + ElementMatrix* CreateJacobianDiagnosticStokes(void); + void InputUpdateFromSolutionDiagnosticHoriz( double* solutiong); Index: /issm/oecreview/Archive/11319-11340/ISSM-DocReview-11319-11340.tex =================================================================== --- /issm/oecreview/Archive/11319-11340/ISSM-DocReview-11319-11340.tex (revision 11515) +++ /issm/oecreview/Archive/11319-11340/ISSM-DocReview-11319-11340.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11319-11340/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11319-11340/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11319-11340/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11319-11340 Index: /issm/oecreview/Archive/11319-11340/Makefile =================================================================== --- /issm/oecreview/Archive/11319-11340/Makefile (revision 11515) +++ /issm/oecreview/Archive/11319-11340/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11319-11340 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11319-11340/log.tex =================================================================== --- /issm/oecreview/Archive/11319-11340/log.tex (revision 11515) +++ /issm/oecreview/Archive/11319-11340/log.tex (revision 11515) @@ -0,0 +1,34 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11319-11320.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp M /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h M /issm/trunk-jpl/src/c/objects/KML/KML\_Container.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Feature.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_File.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_GroundOverlay.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_MultiGeometry.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.h M /issm/trunk-jpl/src/c/objects/KML/KML\_Overlay.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Placemark.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Polygon.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Style.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.cpp \\ Export determination: 6. \\Rationale: KML: Implemented KML\_Unknown class to digest and regurgitate unknown KML elements. +M /issm/trunk-jpl/test/NightlyRun/test218.m Update tolerances \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11320-11321.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test218.m \\ Export determination: 6. \\Rationale: Update tolerances +M /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp take 2d or 3d intersection \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11321-11322.diff: \\ Function name: \\M /issm/trunk-jpl/src/mex/MeshProfileIntersection/MeshProfileIntersection.cpp \\ Export determination: 6. \\Rationale: take 2d or 3d intersection +M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/Makefile.am A /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx A /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp A /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/modules/modules.h M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.h M /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp M /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/diagnostic\_core.cpp A /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp M /issm/trunk-jpl/src/c/solvers/solvers.h M /issm/trunk-jpl/src/m/classes/diagnostic.m A /issm/trunk-jpl/src/m/enum/DiagnosticIsnewtonEnum.m A /issm/trunk-jpl/src/m/enum/PentaP1ElementResultEnum.m A /issm/trunk-jpl/src/m/enum/PentaP1InputEnum.m D /issm/trunk-jpl/src/m/enum/PentaVertexElementResultEnum.m D /issm/trunk-jpl/src/m/enum/PentaVertexInputEnum.m A /issm/trunk-jpl/src/m/enum/TriaP1ElementResultEnum.m A /issm/trunk-jpl/src/m/enum/TriaP1InputEnum.m D /issm/trunk-jpl/src/m/enum/TriaVertexElementResultEnum.m D /issm/trunk-jpl/src/m/enum/TriaVertexInputEnum.m M /issm/trunk-jpl/src/m/model/loadresultsfromdisk.m Added Newton's method for Pattyn, parallel only for now, to be improved \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11322-11323.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/Makefile.am A /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx A /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp A /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/modules/modules.h M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.h M /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp M /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp M /issm/trunk-jpl/src/c/solutions/diagnostic\_core.cpp A /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp M /issm/trunk-jpl/src/c/solvers/solvers.h M /issm/trunk-jpl/src/m/classes/diagnostic.m A /issm/trunk-jpl/src/m/enum/DiagnosticIsnewtonEnum.m A /issm/trunk-jpl/src/m/enum/PentaP1ElementResultEnum.m A /issm/trunk-jpl/src/m/enum/PentaP1InputEnum.m D /issm/trunk-jpl/src/m/enum/PentaVertexElementResultEnum.m D /issm/trunk-jpl/src/m/enum/PentaVertexInputEnum.m A /issm/trunk-jpl/src/m/enum/TriaP1ElementResultEnum.m A /issm/trunk-jpl/src/m/enum/TriaP1InputEnum.m D /issm/trunk-jpl/src/m/enum/TriaVertexElementResultEnum.m D /issm/trunk-jpl/src/m/enum/TriaVertexInputEnum.m M /issm/trunk-jpl/src/m/model/loadresultsfromdisk.m \\ Export determination: 6. \\Rationale: Added Newton's method for Pattyn, parallel only for now, to be improved +M /issm/trunk-jpl/test/NightlyRun/test1104.m M /issm/trunk-jpl/test/NightlyRun/test1106.m M /issm/trunk-jpl/test/NightlyRun/test1107.m minor tolerances validation tests \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11323-11324.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test1104.m M /issm/trunk-jpl/test/NightlyRun/test1106.m M /issm/trunk-jpl/test/NightlyRun/test1107.m \\ Export determination: 6. \\Rationale: minor tolerances validation tests +M /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp Fixed many memory leaks \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11324-11325.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp \\ Export determination: 6. \\Rationale: Fixed many memory leaks +M /issm/trunk-jpl/test/Archives/Archive101.mat M /issm/trunk-jpl/test/Archives/Archive1109.mat M /issm/trunk-jpl/test/NightlyRun/test1109.m resolved validation test errors \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11325-11326.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive101.mat M /issm/trunk-jpl/test/Archives/Archive1109.mat M /issm/trunk-jpl/test/NightlyRun/test1109.m \\ Export determination: 6. \\Rationale: resolved validation test errors +M /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim updated syntax highlighting \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11326-11327.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim \\ Export determination: 6. \\Rationale: updated syntax highlighting +M /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp M /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h M /issm/trunk-jpl/src/c/objects/Loads/Icefront.h M /issm/trunk-jpl/src/c/objects/Loads/Load.h M /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h M /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h M /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp M /issm/trunk-jpl/src/c/objects/Loads/Penpair.h M /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h M /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp Added penalties in Newton's method \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11327-11328.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp M /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h M /issm/trunk-jpl/src/c/objects/Loads/Icefront.h M /issm/trunk-jpl/src/c/objects/Loads/Load.h M /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h M /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h M /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp M /issm/trunk-jpl/src/c/objects/Loads/Penpair.h M /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h M /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp \\ Export determination: 6. \\Rationale: Added penalties in Newton's method +M /issm/trunk-jpl/test/Archives/Archive1208.mat minor archives \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11328-11329.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive1208.mat \\ Export determination: 6. \\Rationale: minor archives \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11331-11332.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp M /issm/trunk-jpl/src/c/objects/Loads/Icefront.h M /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.h M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp \\ Export determination: 6. \\Rationale: Added Newton's method for MacAyeal \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11332-11333.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h M /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp M /issm/trunk-jpl/src/c/objects/Loads/Icefront.h M /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.h M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp \\ Export determination: 6. \\Rationale: Added Newton's method for MacAyeal +M /issm/trunk-jpl/src/m/model/loadresultsfromdisk.m Fixed nightly run \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11333-11334.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/loadresultsfromdisk.m \\ Export determination: 6. \\Rationale: Fixed nightly run \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11334-11335.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/solutions/diagnostic\_core.m A /issm/trunk-jpl/src/mex/CreateJacobianMatrix A /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp A /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h M /issm/trunk-jpl/src/mex/Makefile.am \\ Export determination: 6. \\Rationale: Added mex module for Newton's method \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11335-11336.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/solutions/diagnostic\_core.m A /issm/trunk-jpl/src/mex/CreateJacobianMatrix A /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.cpp A /issm/trunk-jpl/src/mex/CreateJacobianMatrix/CreateJacobianMatrix.h M /issm/trunk-jpl/src/mex/Makefile.am \\ Export determination: 6. \\Rationale: Added mex module for Newton's method +A /issm/trunk-jpl/src/m/solvers/solver\_newton.m Added mex module for Newton's method \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11336-11337.diff: \\ Function name: \\A /issm/trunk-jpl/src/m/solvers/solver\_newton.m \\ Export determination: 6. \\Rationale: Added mex module for Newton's method +M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp M /issm/trunk-jpl/src/m/solvers/solver\_newton.m Fixed Newton's method: do not change ys \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11337-11338.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp M /issm/trunk-jpl/src/m/solvers/solver\_newton.m \\ Export determination: 6. \\Rationale: Fixed Newton's method: do not change ys +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp Prepared Stokes Newton's iterations \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11338-11339.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/solvers/solver\_newton.cpp \\ Export determination: 6. \\Rationale: Prepared Stokes Newton's iterations +M /issm/trunk-jpl/src/m/model/tres.m removed all PatchToVec, not needed anymore \\\\ +\noindent \textbf{Change \#19} with diff file ISSM-11339-11340.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/tres.m \\ Export determination: 6. \\Rationale: removed all PatchToVec, not needed anymore +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h Added Newton for MacAyeal 3d \\\\ Index: /issm/oecreview/Archive/11319-11340/r1.tex =================================================================== --- /issm/oecreview/Archive/11319-11340/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11319-11340/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11319 Index: /issm/oecreview/Archive/11319-11340/r2.tex =================================================================== --- /issm/oecreview/Archive/11319-11340/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11319-11340/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11340 Index: /issm/oecreview/Archive/11341-11360/Date.tex =================================================================== --- /issm/oecreview/Archive/11341-11360/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11341-11360/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11341-11360/ISSM-11341-11342.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11341-11342.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11341-11342.diff (revision 11515) @@ -0,0 +1,27 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11341) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/cron/cronfiles/linux_cronfile (revision 11342) +@@ -5,10 +5,15 @@ + MAILTO=eric.larour@jpl.nasa.gov,mathieu.morlighem@jpl.nasa.gov,helene.seroussi@jpl.nasa.gov,Christopher.P.Borstad@jpl.nasa.gov,Nicole-Jeanne.Schlegel@jpl.nasa.gov,Feras.A.Habbal@jpl.nasa.gov + + #cronjob +-00 09 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-30 12 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 15 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 18 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 23 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_nightly +-00 23 * * 6 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_validation +-00 23 * * 7 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_ucitrunk ++00 09 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily ++30 12 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily ++00 15 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily ++00 18 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_daily ++00 23 * * 1-5 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_nightly ++00 20 * * 6 cd /u/astrid-r1b/schlegel/ExecutionNightlyRun && rm -r test* ++00 21 * * 6 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/trunk-jpl/test/NightlyRun && make clean ++00 22 * * 6 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/trunk-jpl/test/NightlyRun && rm -r qmu* ++00 23 * * 6 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_validation ++00 21 * * 7 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/trunk/test/NightlyRun && make clean ++00 22 * * 7 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/trunk/test/NightlyRun && rm -r qmu* ++00 23 * * 7 cd /u/astrid-r1b/schlegel/issmuci/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_schlegel_ucitrunk Index: /issm/oecreview/Archive/11341-11360/ISSM-11342-11343.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11342-11343.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11342-11343.diff (revision 11515) @@ -0,0 +1,82 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 11342) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 11343) +@@ -43,11 +43,13 @@ + + bool flag=true; + +- _printf_(flag,"KML_Unknown_%s:\n",name); ++ _printf_(flag,"KML_Unknown %s:\n",name); + KML_Object::Echo(); + + if (value ) + _printf_(flag," value: \"%s\"\n" ,value); ++ else ++ _printf_(flag," value: [none]\n" ); + + return; + } +@@ -67,11 +69,13 @@ + + bool flag=true; + +- _printf_(flag,"%sKML_Unknown_%s:\n",indent,name); ++ _printf_(flag,"%sKML_Unknown %s:\n",indent,name); + KML_Object::DeepEcho(indent); + + if (value ) + _printf_(flag,"%s value: \"%s\"\n" ,indent,value); ++ else ++ _printf_(flag,"%s value: [none]\n" ,indent); + + return; + } +@@ -79,8 +83,6 @@ + /*FUNCTION KML_Unknown::Write {{{1*/ + void KML_Unknown::Write(FILE* filout,const char* indent){ + +- char indent2[81]; +- + fprintf(filout,"%s<%s",indent,name); + WriteAttrib(filout," "); + fprintf(filout,">\n"); +@@ -89,11 +91,8 @@ + if (value ) + fprintf(filout,"%s %s\n",indent,value); + +- memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char)); +- strcat(indent2," "); ++ KML_Object::Write(filout,indent); + +- KML_Object::Write(filout,indent2); +- + fprintf(filout,"%s\n",indent,name); + + return; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 11342) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 11343) +@@ -75,6 +75,7 @@ + void KML_Object::DeepEcho(const char* indent){ + + int i; ++ char indent2[81]; + bool flag=true; + + /* loop over the attributes for the object */ +@@ -97,9 +98,12 @@ + + /* loop over the unknown objects for the object */ + ++ memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char)); ++ strcat(indent2," "); ++ + if (unknwn->Size()) + for (i=0; iSize(); i++) { +- ((KML_Unknown *)unknwn->GetObjectByOffset(i))->DeepEcho(indent); ++ ((KML_Unknown *)unknwn->GetObjectByOffset(i))->DeepEcho(indent2); + } + else + _printf_(flag,"%s unknwn: [empty]\n" ,indent); Index: /issm/oecreview/Archive/11341-11360/ISSM-11344-11345.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11344-11345.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11344-11345.diff (revision 11515) @@ -0,0 +1,9 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/INSTALL +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/INSTALL (revision 11344) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/INSTALL (revision 11345) +@@ -1,2 +1,3 @@ +-For the installation process please go to the ISSM website ++For the installation process please go to the ISSM website: ++ + http://issm.jpl.nasa.gov/ Index: /issm/oecreview/Archive/11341-11360/ISSM-11345-11346.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11345-11346.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11345-11346.diff (revision 11515) @@ -0,0 +1,123 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 11345) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 11346) +@@ -103,7 +103,9 @@ + + if (unknwn->Size()) + for (i=0; iSize(); i++) { ++ _printf_(flag,"%s unknwn: -------- begin [%d] --------\n" ,indent,i); + ((KML_Unknown *)unknwn->GetObjectByOffset(i))->DeepEcho(indent2); ++ _printf_(flag,"%s unknwn: -------- end [%d] --------\n" ,indent,i); + } + else + _printf_(flag,"%s unknwn: [empty]\n" ,indent); +@@ -147,6 +149,108 @@ + else if (strncmp(kstr,"<",1)) + _error_("KML_Object::Read -- Unexpected field \"%s\".\n",kstr); + ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++// else if (!strncmp(kstr,"Read(fid,kstr); ++// unknwn ->AddObject((Object*)kobj); ++// } ++ ++// else if (!strncmp(kstr,"Read(fid,kstr); ++// unknwn ->AddObject((Object*)kobj); ++// } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++ else if (!strncmp(kstr,"Read(fid,kstr); ++ unknwn ->AddObject((Object*)kobj); ++ } ++ ++// else if (!strncmp(kstr,"Read(fid,kstr); ++// unknwn ->AddObject((Object*)kobj); ++// } ++ ++// else if (!strncmp(kstr,"Read(fid,kstr); ++// unknwn ->AddObject((Object*)kobj); ++// } ++ + else if (!strncmp(kstr,"<",1)) { + _printf_(true,"KML_Object::Read -- Unrecognized opening tag %s.\n",kstr); + // KMLFileTagSkip(kstr, Index: /issm/oecreview/Archive/11341-11360/ISSM-11346-11347.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11346-11347.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11346-11347.diff (revision 11515) @@ -0,0 +1,392 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 11347) +@@ -94,7 +94,7 @@ + break; + + case TransientSolutionEnum: +- numanalyses=8; ++ numanalyses=9; + analyses=(int*)xmalloc(numanalyses*sizeof(int)); + analyses[0]=DiagnosticHorizAnalysisEnum; + analyses[1]=DiagnosticVertAnalysisEnum; +@@ -104,6 +104,7 @@ + analyses[5]=ThermalAnalysisEnum; + analyses[6]=MeltingAnalysisEnum; + analyses[7]=PrognosticAnalysisEnum; ++ analyses[8]=EnthalpyAnalysisEnum; + break; + + default: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/transient_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/transient_core.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/transient_core.cpp (revision 11347) +@@ -23,7 +23,7 @@ + + /*parameters: */ + double finaltime,dt,yts; +- bool control_analysis,isdiagnostic,isprognostic,isthermal,isgroundingline; ++ bool control_analysis,isdiagnostic,isprognostic,isthermal,isgroundingline,isenthalpy; + bool dakota_analysis=false; + bool time_adapt=false; + int solution_type; +@@ -50,6 +50,7 @@ + femmodel->parameters->FindParam(&isprognostic,TransientIsprognosticEnum); + femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum); + femmodel->parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum); ++ femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum); + if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); + femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum); + if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum); +@@ -90,7 +91,12 @@ + if(isthermal && dim==3){ + _printf_(VerboseSolution()," computing temperatures:\n"); + #ifdef _HAVE_THERMAL_ +- thermal_core_step(femmodel,step,time); ++ if(isenthalpy==0){ ++ thermal_core_step(femmodel,step,time); ++ } ++ else{ ++ enthalpy_core_step(femmodel,step,time); ++ } + #else + _error_("ISSM was not compiled with thermal capabilities. Exiting"); + #endif +@@ -134,7 +140,9 @@ + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum,step,time); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time); + if(dim==3 && isthermal) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time); +- InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time); ++ if(isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterfractionEnum,step,time); ++ if(isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,step,time); ++ if(!isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMassBalanceEnum,step,time); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaskElementonfloatingiceEnum,step,time); + RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs,step,time); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11347) +@@ -160,6 +160,7 @@ + ThermalPenaltyThresholdEnum, + ThermalSpctemperatureEnum, + ThermalStabilizationEnum, ++ ThermalIsenthalpyEnum, + ThicknessEnum, + TimesteppingCflCoefficientEnum, + TimesteppingFinalTimeEnum, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11347) +@@ -162,6 +162,7 @@ + else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; + else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; + else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; ++ else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; + else if (strcmp(name,"Thickness")==0) return ThicknessEnum; + else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; + else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11347) +@@ -164,6 +164,7 @@ + case ThermalPenaltyThresholdEnum : return "ThermalPenaltyThreshold"; + case ThermalSpctemperatureEnum : return "ThermalSpctemperature"; + case ThermalStabilizationEnum : return "ThermalStabilization"; ++ case ThermalIsenthalpyEnum : return "ThermalIsenthalpy"; + case ThicknessEnum : return "Thickness"; + case TimesteppingCflCoefficientEnum : return "TimesteppingCflCoefficient"; + case TimesteppingFinalTimeEnum : return "TimesteppingFinalTime"; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 11347) +@@ -78,6 +78,7 @@ + parameters->AddObject(iomodel->CopyConstantObject(TransientIsprognosticEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIsthermalEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum)); ++ parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum)); + parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum)); + parameters->AddObject(iomodel->CopyConstantObject(AutodiffForwardEnum)); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 11347) +@@ -19,7 +19,7 @@ + void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, FILE* IOMODEL,const int solution_type,const int nummodels,const int* analysis_type_list){ + + int i,analysis_type,dim,verbose; +- bool isthermal,isprognostic,isdiagnostic,isgroundingline; ++ bool isthermal,isprognostic,isdiagnostic,isgroundingline,isenthalpy; + + /*output: */ + Elements *elements = NULL; +@@ -38,6 +38,7 @@ + iomodel->Constant(&dim,MeshDimensionEnum); + iomodel->Constant(&verbose,VerboseEnum); + iomodel->Constant(&isthermal,TransientIsthermalEnum); ++ iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum); + iomodel->Constant(&isprognostic,TransientIsprognosticEnum); + iomodel->Constant(&isdiagnostic,TransientIsdiagnosticEnum); + iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum); +@@ -51,8 +52,13 @@ + /*Hack for trasient runs (to be improved)*/ + if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && dim==2) continue; + if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && dim==2) continue; ++ if(solution_type==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && dim==2) continue; + if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isthermal==false) continue; + if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isthermal==false) continue; ++ if(solution_type==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isthermal==false) continue; ++ if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isenthalpy==true) continue; ++ if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isenthalpy==true) continue; ++ if(solution_type==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isenthalpy==false) continue; + if(solution_type==TransientSolutionEnum && analysis_type==PrognosticAnalysisEnum && isprognostic==false && isgroundingline==false) continue; + if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticHorizAnalysisEnum && isdiagnostic==false) continue; + if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticVertAnalysisEnum && isdiagnostic==false) continue; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11347) +@@ -419,7 +419,7 @@ + return thermalconductivity/(rho_ice*heatcapacity); + } + else{ +- return 0.1*thermalconductivity/(rho_ice*heatcapacity); ++ return 1*thermalconductivity/(rho_ice*heatcapacity); + } + } + /*}}}1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11347) +@@ -4084,10 +4084,12 @@ + double Jdet2d,dt; + double rho_ice,heatcapacity,geothermalflux_value; + double basalfriction,alpha2,vx,vy; +- double scalar; ++ double scalar,enthalpy,enthalpyup; ++ double pressure,pressureup; + double basis[NUMVERTICES]; + Friction* friction=NULL; + GaussPenta* gauss=NULL; ++ GaussPenta* gaussup=NULL; + + /* Geothermal flux on ice sheet base and basal friction */ + if (!IsOnBed() || IsFloating()) return NULL; +@@ -4105,6 +4107,8 @@ + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); ++ Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); ++ Input* enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); + Input* geothermalflux_input=inputs->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); + + /*Build frictoin element, needed later: */ +@@ -4112,27 +4116,45 @@ + + /* Start looping on the number of gauss 2d (nodes on the bedrock) */ + gauss=new GaussPenta(0,1,2,2); ++ gaussup=new GaussPenta(3,4,5,2); + for(ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); ++ gaussup->GaussPoint(ig); + + GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); + GetNodalFunctionsP1(&basis[0], gauss); + +- geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); +- friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); +- vx_input->GetInputValue(&vx,gauss); +- vy_input->GetInputValue(&vy,gauss); +- basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)); +- +- scalar=gauss->weight*Jdet2d*(basalfriction+geothermalflux_value)/(heatcapacity*rho_ice); +- if(dt) scalar=dt*scalar; ++ enthalpy_input->GetInputValue(&enthalpy,gauss); ++ pressure_input->GetInputValue(&pressure,gauss); ++// if(enthalpy>matpar->PureIceEnthalpy(pressure)){ ++// enthalpy_input->GetInputValue(&enthalpyup,gaussup); ++// pressure_input->GetInputValue(&pressureup,gaussup); ++// if(enthalpyup>matpar->PureIceEnthalpy(pressureup)){ ++// //do nothing, don't add heatflux ++// } ++// else{ ++// //need to change spcenthalpy according to Aschwanden ++// //NEED TO UPDATE ++// } ++// } ++// else{ ++ geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); ++ friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); ++ vx_input->GetInputValue(&vx,gauss); ++ vy_input->GetInputValue(&vy,gauss); ++ basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)); + +- for(i=0;ivalues[i]+=scalar*basis[i]; ++ scalar=gauss->weight*Jdet2d*(basalfriction+geothermalflux_value)/(heatcapacity*rho_ice); ++ if(dt) scalar=dt*scalar; ++ ++ for(i=0;ivalues[i]+=scalar*basis[i]; ++// } + } + + /*Clean up and return*/ + delete gauss; ++ delete gaussup; + delete friction; + return pe; + } +@@ -4308,7 +4330,7 @@ + for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); + if(waterfraction[i]<0) _error_("Negative water fraction found in solution vector"); +- if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); ++ // if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); + } + + this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,values)); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 11347) +@@ -84,6 +84,9 @@ + if(converged==true)break; + if(count>=max_nonlinear_iterations){ + _printf_(true," maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); ++ converged=true; ++ InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum); ++ InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); + break; + } + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/AnalysisConfiguration.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/AnalysisConfiguration.m (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/AnalysisConfiguration.m (revision 11347) +@@ -41,8 +41,8 @@ + analyses=[BedSlopeAnalysisEnum]; + + case TransientSolutionEnum, +- numanalyses=8; +- analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum;PrognosticAnalysisEnum]; ++ numanalyses=9; ++ analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum;PrognosticAnalysisEnum;EnthalpyAnalysisEnum]; + + case FlaimSolutionEnum, + numanalyses=1; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/transient_core.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/transient_core.m (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/transient_core.m (revision 11347) +@@ -18,6 +18,7 @@ + isprognostic=femmodel.parameters.TransientIsprognostic; + isthermal=femmodel.parameters.TransientIsthermal; + isgroundingline=femmodel.parameters.TransientIsgroundingline; ++ isenthalpy=femmodel.parameters.ThermalIsenthalpy; + groundinglinemigration=femmodel.parameters.GroundinglineMigration; + + %Initialize +@@ -56,7 +57,11 @@ + + if (isthermal & dim==3) + issmprintf(VerboseSolution,'\n%s',[' computing temperature']); +- femmodel=thermal_core_step(femmodel); ++ if (isenthalpy==0), ++ femmodel=thermal_core_step(femmodel); ++ else ++ femmodel=enthalpy_core_step(femmodel); ++ end + end + + if (isdiagnostic) +@@ -89,6 +94,8 @@ + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceEnum,step,time); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedEnum,step,time); + if (dim==3 & isthermal), femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,step,time);end ++ if (dim==3 & isenthalpy), femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,WaterfractionEnum,step,time);end ++ if (dim==3 & isenthalpy), femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,EnthalpyEnum,step,time);end + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalforcingsMeltingRateEnum,step,time); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceforcingsMassBalanceEnum,step,time); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,MaskElementonfloatingiceEnum,step,time); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/ThermalIsenthalpyEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/ThermalIsenthalpyEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/ThermalIsenthalpyEnum.m (revision 11347) +@@ -0,0 +1,11 @@ ++function macro=ThermalIsenthalpyEnum() ++%THERMALISENTHALPYENUM - Enum of ThermalIsenthalpy ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=ThermalIsenthalpyEnum() ++ ++macro=StringToEnum('ThermalIsenthalpy'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/initialization.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/initialization.m (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/initialization.m (revision 11347) +@@ -61,7 +61,7 @@ + checkfield(md,'initialization.vz','NaN',1,'size',[md.mesh.numberofvertices 1]); + checkfield(md,'initialization.pressure','NaN',1,'size',[md.mesh.numberofvertices 1]); + end +- if ismember(EnthalpyAnalysisEnum,analyses), ++ if (ismember(EnthalpyAnalysisEnum,analyses) & md.thermal.isenthalpy), + checkfield(md,'initialization.waterfraction','>=',0,'size',[md.mesh.numberofvertices 1]); + end + end % }}} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11346) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11347) +@@ -11,6 +11,7 @@ + maxiter = 0; + penalty_lock = 0; + penalty_factor = 0; ++ isenthalpy = 0; + end + methods + function obj = thermal(varargin) % {{{ +@@ -41,6 +42,9 @@ + + %factor used to compute the values of the penalties: kappa=max(stiffness matrix)*10^penalty_factor + obj.penalty_factor=3; ++ ++ %Should we use cold ice (default) or enthalpy formulation ++ obj.isenthalpy=0; + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -51,6 +55,7 @@ + checkfield(md,'thermal.spctemperature','forcing',1); + if ismember(EnthalpyAnalysisEnum,analyses), + checkfield(md,'thermal.spctemperature','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*md.geometry.thickness,'message','spctemperature should be below the adjusted melting point'); ++ checkfield(md,'thermal.isenthalpy','numel',1,'values',[0 1]); + end + end % }}} + function disp(obj) % {{{ +@@ -61,6 +66,7 @@ + fielddisplay(obj,'maxiter','maximum number of non linear iterations'); + fielddisplay(obj,'penalty_lock','stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)'); + fielddisplay(obj,'penalty_threshold','threshold to declare convergence of thermal solution (default is 0)'); ++ fielddisplay(obj,'isenthalpy','use an enthalpy formulation to include temperate ice (default is 0)'); + + end % }}} + function marshall(obj,fid) % {{{ +@@ -70,6 +76,7 @@ + WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer'); + WriteData(fid,'object',obj,'fieldname','penalty_lock','format','Integer'); + WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','isenthalpy','format','Boolean'); + end % }}} + end + end Index: /issm/oecreview/Archive/11341-11360/ISSM-11347-11348.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11347-11348.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11347-11348.diff (revision 11515) @@ -0,0 +1,208 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test354.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test354.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test354.m (revision 11348) +@@ -0,0 +1,55 @@ ++md=triangle(model,'../Exp/Square.exp',200000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'pattyn','all'); ++md.cluster=generic('name',oshostname(),'np',3); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md.initialization.temperature(:)=272; ++md.thermal.spctemperature(find(md.mesh.vertexonsurface))=272; ++md.thermal.isenthalpy=1; ++md.basalforcings.geothermalflux(:)=5; ++md=solve(md,TransientSolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; ++field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; ++field_values={... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).Enthalpy),... ++ (md.results.TransientSolution(1).Waterfraction),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).Enthalpy),... ++ (md.results.TransientSolution(2).Waterfraction),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).Enthalpy),... ++ (md.results.TransientSolution(3).Waterfraction),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test143.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test143.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test143.m (revision 11348) +@@ -0,0 +1,51 @@ ++md=triangle(model,'../Exp/Square.exp',200000); ++md=setmask(md,'all',''); ++md=parameterize(md,'../Par/SquareShelfConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'pattyn','all'); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md.thermal.isenthalpy=1; ++md.thermal.stabilization=2; ++md.cluster=none; ++md=solve(md,TransientSolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; ++field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; ++field_values={... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).Enthalpy),... ++ (md.results.TransientSolution(1).Waterfraction),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).Enthalpy),... ++ (md.results.TransientSolution(2).Waterfraction),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).Enthalpy),... ++ (md.results.TransientSolution(3).Waterfraction),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.bin +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.bin +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test144.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test144.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test144.m (revision 11348) +@@ -0,0 +1,55 @@ ++md=triangle(model,'../Exp/Square.exp',200000); ++md=setmask(md,'all',''); ++md=parameterize(md,'../Par/SquareShelfConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'pattyn','all'); ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md.thermal.isenthalpy=1; ++md.thermal.stabilization=2; ++md.cluster=generic('name',oshostname(),'np',3); ++md=solve(md,TransientSolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names={... ++ 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; ++field_tolerances={... ++ 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... ++ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... ++ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; ++field_values={... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).Enthalpy),... ++ (md.results.TransientSolution(1).Waterfraction),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).Enthalpy),... ++ (md.results.TransientSolution(2).Waterfraction),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).Enthalpy),... ++ (md.results.TransientSolution(3).Waterfraction),... ++ }; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/IdToName.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/IdToName.m (revision 11347) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/IdToName.m (revision 11348) +@@ -47,6 +47,8 @@ + case 140, name='SquareShelfConstrainedEnthalpySteaParallel'; + case 141, name='SquareShelfConstrainedEnthalpyTranSerial'; + case 142, name='SquareShelfConstrainedEnthalpyTranParallel'; ++ case 143, name='SquareShelfConstrainedTransP3dEnthSerial'; ++ case 144, name='SquareShelfConstrainedTransP3dEnthParallel'; + case 201, name='SquareShelfDiagM2dSerial'; + case 202, name='SquareShelfDiagM2dParallel'; + case 203, name='SquareShelfDiagM3dSerial'; +@@ -167,6 +169,8 @@ + case 350, name='SquareSheetConstrainedEnthalpySteaParallel'; + case 351, name='SquareSheetConstrainedEnthalpyTranSerial'; + case 352, name='SquareSheetConstrainedEnthalpyTranParallel'; ++ case 353, name='SquareSheetConstrainedTransP3dEnthSerial'; ++ case 354, name='SquareSheetConstrainedTransP3dEnthParallel'; + case 401, name='SquareSheetShelfDiagM2dSerial'; + case 402, name='SquareSheetShelfDiagM2dParallel'; + case 403, name='SquareSheetShelfDiagM3dSerial'; Index: /issm/oecreview/Archive/11341-11360/ISSM-11348-11349.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11348-11349.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11348-11349.diff (revision 11515) @@ -0,0 +1,64 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.bin +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.m (revision 11349) +@@ -0,0 +1,55 @@ ++md=triangle(model,'../Exp/Square.exp',200000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'pattyn','all'); ++md.cluster=none; ++md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); ++md.initialization.temperature(:)=272; ++md.thermal.spctemperature(find(md.mesh.vertexonsurface))=272; ++md.thermal.isenthalpy=1; ++md.basalforcings.geothermalflux(:)=5; ++md=solve(md,TransientSolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; ++field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-9,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; ++field_values={... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).Enthalpy),... ++ (md.results.TransientSolution(1).Waterfraction),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).Enthalpy),... ++ (md.results.TransientSolution(2).Waterfraction),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).Enthalpy),... ++ (md.results.TransientSolution(3).Waterfraction),... ++ }; Index: /issm/oecreview/Archive/11341-11360/ISSM-11349-11350.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11349-11350.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11349-11350.diff (revision 11515) @@ -0,0 +1,40 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive354.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive354.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive143.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive143.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive353.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive353.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive144.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive144.mat +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + Index: /issm/oecreview/Archive/11341-11360/ISSM-11350-11351.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11350-11351.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11350-11351.diff (revision 11515) @@ -0,0 +1,26 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11350) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 11351) +@@ -419,7 +419,7 @@ + return thermalconductivity/(rho_ice*heatcapacity); + } + else{ +- return 1*thermalconductivity/(rho_ice*heatcapacity); ++ return 0.1*thermalconductivity/(rho_ice*heatcapacity); + } + } + /*}}}1*/ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11350) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11351) +@@ -4330,7 +4330,7 @@ + for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); + if(waterfraction[i]<0) _error_("Negative water fraction found in solution vector"); +- // if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); ++ if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); + } + + this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,values)); Index: /issm/oecreview/Archive/11341-11360/ISSM-11351-11352.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11351-11352.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11351-11352.diff (revision 11515) @@ -0,0 +1,44 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh (revision 11352) +@@ -0,0 +1,33 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install petsc-3.2-p3 src ++mkdir install src ++ ++#Untar and move petsc to install directory ++tar -zxvf petsc-3.2-p3.tar.gz ++mv petsc-3.2-p3/* src/ ++rm -rf petsc-3.2-p3 ++ ++#configure ++cd src ++./config/configure.py \ ++ --prefix="$ISSM_TIER/externalpackages/petsc/install" \ ++ --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \ ++ --with-debugging=0 \ ++ --with-shared-libraries=0 \ ++ --known-mpi-shared-libraries=1 \ ++ --with-mpi-lib=/usr/mpi/intel/mvapich2-1.4.1-qlc/lib/libmpi.so \ ++ --with-mpi-include=/usr/mpi/intel/mvapich2-1.4.1-qlc/include/ \ ++ --download-mumps=yes \ ++ --download-scalapack=yes \ ++ --download-blacs=yes \ ++ --download-blas=yes \ ++ --download-f-blas-lapack=yes \ ++ --download-plapack=yes \ ++ --download-parmetis=yes \ ++ --with-pic=1 ++ ++#Compile petsc and install it ++make ++make install + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh +___________________________________________________________________ +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11341-11360/ISSM-11352-11353.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11352-11353.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11352-11353.diff (revision 11515) @@ -0,0 +1,21 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/expandresponses.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/expandresponses.m (revision 11352) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/expandresponses.m (revision 11353) +@@ -1,4 +1,5 @@ + function dresp=expandresponses(md,responses) ++%EXPANDRESPONSES - expand responses + + fnames=fieldnames(responses); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m (revision 11352) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/solver_newton.m (revision 11353) +@@ -56,6 +56,5 @@ + + %increase count + count=count+1; +- + end + end Index: /issm/oecreview/Archive/11341-11360/ISSM-11353-11354.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11353-11354.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11353-11354.diff (revision 11515) @@ -0,0 +1,28 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 11353) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 11354) +@@ -103,8 +103,8 @@ + analyses[4]=BedSlopeAnalysisEnum; + analyses[5]=ThermalAnalysisEnum; + analyses[6]=MeltingAnalysisEnum; +- analyses[7]=PrognosticAnalysisEnum; +- analyses[8]=EnthalpyAnalysisEnum; ++ analyses[7]=EnthalpyAnalysisEnum; ++ analyses[8]=PrognosticAnalysisEnum; + break; + + default: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/AnalysisConfiguration.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/AnalysisConfiguration.m (revision 11353) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/AnalysisConfiguration.m (revision 11354) +@@ -42,7 +42,7 @@ + + case TransientSolutionEnum, + numanalyses=9; +- analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum;PrognosticAnalysisEnum;EnthalpyAnalysisEnum]; ++ analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum;EnthalpyAnalysisEnum;PrognosticAnalysisEnum]; + + case FlaimSolutionEnum, + numanalyses=1; Index: /issm/oecreview/Archive/11341-11360/ISSM-11354-11355.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11354-11355.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11354-11355.diff (revision 11515) @@ -0,0 +1,148 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11354) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11355) +@@ -3853,10 +3853,12 @@ + double Jdet2d,dt; + double rho_ice,heatcapacity,geothermalflux_value; + double basalfriction,alpha2,vx,vy; +- double scalar; ++ double scalar,enthalpy,enthalpyup; ++ double pressure,pressureup; + double basis[NUMVERTICES]; + Friction* friction=NULL; + GaussPenta* gauss=NULL; ++ GaussPenta* gaussup=NULL; + + /* Geothermal flux on ice sheet base and basal friction */ + if (!IsOnBed() || IsFloating()) return NULL; +@@ -3874,6 +3876,8 @@ + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); ++ Input* enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); ++ Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); + Input* geothermalflux_input=inputs->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); + + /*Build frictoin element, needed later: */ +@@ -3881,27 +3885,45 @@ + + /* Start looping on the number of gauss 2d (nodes on the bedrock) */ + gauss=new GaussPenta(0,1,2,2); ++ gaussup=new GaussPenta(3,4,5,2); + for(ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); ++ gaussup->GaussPoint(ig); + + GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); + GetNodalFunctionsP1(&basis[0], gauss); + +- geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); +- friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); +- vx_input->GetInputValue(&vx,gauss); +- vy_input->GetInputValue(&vy,gauss); +- basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)); +- +- scalar=gauss->weight*Jdet2d*(basalfriction+geothermalflux_value)/(rho_ice); +- if(dt) scalar=dt*scalar; ++ enthalpy_input->GetInputValue(&enthalpy,gauss); ++ pressure_input->GetInputValue(&pressure,gauss); ++ if(enthalpy>matpar->PureIceEnthalpy(pressure)){ ++ enthalpy_input->GetInputValue(&enthalpyup,gaussup); ++ pressure_input->GetInputValue(&pressureup,gaussup); ++ if(enthalpyup>matpar->PureIceEnthalpy(pressureup)){ ++ //do nothing, don't add heatflux ++ } ++ else{ ++ //need to change spcenthalpy according to Aschwanden ++ //NEED TO UPDATE ++ } ++ } ++ else{ ++ geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); ++ friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); ++ vx_input->GetInputValue(&vx,gauss); ++ vy_input->GetInputValue(&vy,gauss); ++ basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)); + +- for(i=0;ivalues[i]+=scalar*basis[i]; ++ scalar=gauss->weight*Jdet2d*(basalfriction+geothermalflux_value)/(rho_ice); ++ if(dt) scalar=dt*scalar; ++ ++ for(i=0;ivalues[i]+=scalar*basis[i]; ++ } + } + + /*Clean up and return*/ + delete gauss; ++ delete gaussup; + delete friction; + return pe; + } +@@ -4084,12 +4106,10 @@ + double Jdet2d,dt; + double rho_ice,heatcapacity,geothermalflux_value; + double basalfriction,alpha2,vx,vy; +- double scalar,enthalpy,enthalpyup; +- double pressure,pressureup; + double basis[NUMVERTICES]; ++ double scalar; + Friction* friction=NULL; + GaussPenta* gauss=NULL; +- GaussPenta* gaussup=NULL; + + /* Geothermal flux on ice sheet base and basal friction */ + if (!IsOnBed() || IsFloating()) return NULL; +@@ -4107,8 +4127,6 @@ + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); +- Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); +- Input* enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); + Input* geothermalflux_input=inputs->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input); + + /*Build frictoin element, needed later: */ +@@ -4116,29 +4134,13 @@ + + /* Start looping on the number of gauss 2d (nodes on the bedrock) */ + gauss=new GaussPenta(0,1,2,2); +- gaussup=new GaussPenta(3,4,5,2); + for(ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); +- gaussup->GaussPoint(ig); + + GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); + GetNodalFunctionsP1(&basis[0], gauss); + +- enthalpy_input->GetInputValue(&enthalpy,gauss); +- pressure_input->GetInputValue(&pressure,gauss); +-// if(enthalpy>matpar->PureIceEnthalpy(pressure)){ +-// enthalpy_input->GetInputValue(&enthalpyup,gaussup); +-// pressure_input->GetInputValue(&pressureup,gaussup); +-// if(enthalpyup>matpar->PureIceEnthalpy(pressureup)){ +-// //do nothing, don't add heatflux +-// } +-// else{ +-// //need to change spcenthalpy according to Aschwanden +-// //NEED TO UPDATE +-// } +-// } +-// else{ + geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); + friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); + vx_input->GetInputValue(&vx,gauss); +@@ -4149,12 +4151,10 @@ + if(dt) scalar=dt*scalar; + + for(i=0;ivalues[i]+=scalar*basis[i]; +-// } + } + + /*Clean up and return*/ + delete gauss; +- delete gaussup; + delete friction; + return pe; + } Index: /issm/oecreview/Archive/11341-11360/ISSM-11355-11356.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11355-11356.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11355-11356.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11355) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/thermal.m (revision 11356) +@@ -53,7 +53,7 @@ + + checkfield(md,'thermal.stabilization','numel',1,'values',[0 1 2]); + checkfield(md,'thermal.spctemperature','forcing',1); +- if ismember(EnthalpyAnalysisEnum,analyses), ++ if (ismember(EnthalpyAnalysisEnum,analyses) & md.thermal.isenthalpy), + checkfield(md,'thermal.spctemperature','<',md.materials.meltingpoint-md.materials.beta*md.materials.rho_ice*md.constants.g*md.geometry.thickness,'message','spctemperature should be below the adjusted melting point'); + checkfield(md,'thermal.isenthalpy','numel',1,'values',[0 1]); + end Index: /issm/oecreview/Archive/11341-11360/ISSM-11356-11357.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11356-11357.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11356-11357.diff (revision 11515) @@ -0,0 +1,69 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11356) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11357) +@@ -25,9 +25,11 @@ + + /*TAO*/ + int ierr; +- int num_controls; ++ int num_controls,solution_type; ++ int nsteps,maxiter; + AppCtx user; + TaoSolver tao; ++ int *dummy = NULL; + int *control_list = NULL; + Vec X = NULL; + Vec XL = NULL; +@@ -40,8 +42,12 @@ + if(ierr) _error_("Could not initialize Tao"); + + /*Recover some parameters*/ ++ femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); + femmodel->parameters->FindParam(&num_controls,InversionNumControlParametersEnum); + femmodel->parameters->FindParam(&control_list,NULL,InversionControlParametersEnum); ++ femmodel->parameters->FindParam(&nsteps,InversionNstepsEnum); ++ femmodel->parameters->FindParam(&dummy,NULL,NULL,InversionMaxiterPerStepEnum); ++ maxiter=nsteps*dummy[0]; xfree((void**)&dummy); + + /*Initialize TAO*/ + _printf_(VerboseControl(),"%s\n"," Initializing the Toolkit for Advanced Optimization (TAO)"); +@@ -53,8 +59,8 @@ + //TaoSetType(tao,"tao_lmvm"); + + /*Prepare all TAO parameters*/ +- TaoSetMaximumFunctionEvaluations(tao,50); +- TaoSetMaximumIterations(tao,10); ++ TaoSetMaximumFunctionEvaluations(tao,maxiter); ++ TaoSetMaximumIterations(tao,nsteps); + TaoSetTolerances(tao,0.,0.,0.,0.,0.); + + GetVectorFromControlInputsx(&X, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value"); +@@ -78,6 +84,13 @@ + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_list[i]); + } + ++ /*Finalize*/ ++ _printf_(VerboseControl(),"%s\n"," preparing final solution"); ++ femmodel->parameters->SetParam(false,InversionIscontrolEnum); //needed to turn control result output in solutioncore ++ void (*solutioncore)(FemModel*)=NULL; ++ CorePointerFromSolutionEnum(&solutioncore,femmodel->parameters,solution_type); ++ solutioncore(femmodel); ++ + /*Clean up and return*/ + xfree((void**)&control_list); + VecFree(&X); +@@ -118,13 +131,11 @@ + + /*Compute objective function*/ + CostFunctionx(fcn,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); +- _printf_(true,"f(x)=%g\n",*fcn); + + /*Compute gradient*/ + Gradjx(&gradient,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); + VecCopy(gradient,G); VecFree(&gradient); + VecScale(G,-1.); +- //VecView(G,PETSC_VIEWER_STDOUT_WORLD); + + /*Clean-up and return*/ + xfree((void**)&cost_functions); Index: /issm/oecreview/Archive/11341-11360/ISSM-11357-11358.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11357-11358.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11357-11358.diff (revision 11515) @@ -0,0 +1,147 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleVecParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 11358) +@@ -54,10 +54,10 @@ + void GetParameterValue(bool* pbool){_error_("DoubleVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("DoubleVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int** pintarray,int* pM); +- void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));}; ++ void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleVec param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));}; + void GetParameterValue(double* pdouble){_error_("DoubleVec param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("DoubleVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("DoubleVec param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("DoubleVec param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM); + void GetParameterValue(double** pdoublearray,int* pM, int* pN); + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("DoubleVec param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 11358) +@@ -57,7 +57,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN); + void GetParameterValue(double* pdouble){*pdouble=value;} + void GetParameterValue(char** pstring){_error_("Double param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("Double param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("Double param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM); + void GetParameterValue(double** pdoublearray,int* pM, int* pN); + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("Double param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 11358) +@@ -59,7 +59,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("DoubleMatArray param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double* pdouble){_error_("DoubleMatArray param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("DoubleMatArray param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("DoubleMatArray param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("DoubleMatArray param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("DoubleMatArray param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("DoubleMatArray param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/PetscVecParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/PetscVecParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/PetscVecParam.h (revision 11358) +@@ -57,7 +57,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("PetscVec param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double* pdouble){_error_("PetscVec param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("PetscVec param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("PetscVec param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("PetscVec param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("PetscVec param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("PetscVec param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("PetscVec param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleMatParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 11358) +@@ -58,7 +58,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN); + void GetParameterValue(double* pdouble){_error_("DoubleMat param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("DoubleMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("DoubleMat param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("DoubleMat param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("DoubleMat param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM,int* pN); + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("DoubleMat param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/FileParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/FileParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/FileParam.h (revision 11358) +@@ -56,7 +56,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double* pdouble){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("FileParam of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("FileParam of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("FileParam of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("FileParam of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("FileParam of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("File param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/PetscMatParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/PetscMatParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/PetscMatParam.h (revision 11358) +@@ -57,7 +57,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("PetscMat param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double* pdouble){_error_("PetscMat param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("PetscMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("PetscMat param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("PetscMat param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("PetscMat param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("PetscMat param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("PetscMat param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/IntParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/IntParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/IntParam.h (revision 11358) +@@ -57,7 +57,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Int param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double* pdouble){_error_("Int param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("Int param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("Int param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("Int param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("Int param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("Int param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("Int param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/BoolParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/BoolParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/BoolParam.h (revision 11358) +@@ -56,7 +56,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Bool param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double* pdouble){_error_("Bool param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("Bool param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("Bool param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("Bool param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("Bool param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("Bool param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("Bool param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/IntMatParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 11358) +@@ -58,7 +58,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN); + void GetParameterValue(double* pdouble){_error_("IntMat param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring){_error_("IntMat param of enum %i (%s) cannot return a string",enum_type,EnumToStringx(enum_type));} +- void GetParameterValue(char*** pstringarray,int* pM){_error_("IntMat param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("IntMat param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("IntMat param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM,int* pN){_error_("IntMat param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));}; + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("IntMat param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/StringParam.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/StringParam.h (revision 11357) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Params/StringParam.h (revision 11358) +@@ -57,7 +57,7 @@ + void GetParameterValue(int** pintarray,int* pM,int* pN){_error_("String param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double* pdouble){_error_("String param of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(char** pstring); +- void GetParameterValue(char*** pstringarray,int* pM){_error_("String param of enum %i (%s) cannot return a string arrayl",enum_type,EnumToStringx(enum_type));} ++ void GetParameterValue(char*** pstringarray,int* pM){_error_("String param of enum %i (%s) cannot return a string array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM){_error_("String param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double** pdoublearray,int* pM, int* pN){_error_("String param of enum %i (%s) cannot return a double array",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){_error_("String param of enum %i (%s) cannot return a matrix array",enum_type,EnumToStringx(enum_type));} Index: /issm/oecreview/Archive/11341-11360/ISSM-11358-11359.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11358-11359.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11358-11359.diff (revision 11515) @@ -0,0 +1,22 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11358) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 11359) +@@ -29,7 +29,7 @@ + int nsteps,maxiter; + AppCtx user; + TaoSolver tao; +- int *dummy = NULL; ++ double *dummy = NULL; + int *control_list = NULL; + Vec X = NULL; + Vec XL = NULL; +@@ -47,7 +47,7 @@ + femmodel->parameters->FindParam(&control_list,NULL,InversionControlParametersEnum); + femmodel->parameters->FindParam(&nsteps,InversionNstepsEnum); + femmodel->parameters->FindParam(&dummy,NULL,NULL,InversionMaxiterPerStepEnum); +- maxiter=nsteps*dummy[0]; xfree((void**)&dummy); ++ maxiter=nsteps*(int)dummy[0]; xfree((void**)&dummy); + + /*Initialize TAO*/ + _printf_(VerboseControl(),"%s\n"," Initializing the Toolkit for Advanced Optimization (TAO)"); Index: /issm/oecreview/Archive/11341-11360/ISSM-11359-11360.diff =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-11359-11360.diff (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-11359-11360.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test314.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test314.m (revision 11359) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test314.m (revision 11360) +@@ -8,7 +8,7 @@ + + %Fields and tolerances to track changes + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; +-field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10}; ++field_tolerances={1e-09,1e-09,1e-10,2e-10,1e-10}; + field_values={... + (md.results.DiagnosticSolution.Vx),... + (md.results.DiagnosticSolution.Vy),... Index: /issm/oecreview/Archive/11341-11360/ISSM-DocReview-11341-11360.tex =================================================================== --- /issm/oecreview/Archive/11341-11360/ISSM-DocReview-11341-11360.tex (revision 11515) +++ /issm/oecreview/Archive/11341-11360/ISSM-DocReview-11341-11360.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11341-11360/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11341-11360/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11341-11360/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11341-11360 Index: /issm/oecreview/Archive/11341-11360/Makefile =================================================================== --- /issm/oecreview/Archive/11341-11360/Makefile (revision 11515) +++ /issm/oecreview/Archive/11341-11360/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11341-11360 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11341-11360/log.tex =================================================================== --- /issm/oecreview/Archive/11341-11360/log.tex (revision 11515) +++ /issm/oecreview/Archive/11341-11360/log.tex (revision 11515) @@ -0,0 +1,36 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11341-11342.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: Almost done with Jacobian Stokes +M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile schlegel cronfile \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11342-11343.diff: \\ Function name: \\M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile \\ Export determination: 6. \\Rationale: schlegel cronfile +M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.cpp KML: Aesthetic changes to output. \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11343-11344.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.cpp \\ Export determination: 6. \\Rationale: KML: Aesthetic changes to output. \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11344-11345.diff: \\ Function name: \\M /issm/trunk-jpl/INSTALL \\ Export determination: 6. \\Rationale: test ignore \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11345-11346.diff: \\ Function name: \\M /issm/trunk-jpl/INSTALL \\ Export determination: 6. \\Rationale: test ignore +M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.cpp KML: Allow recognized elements within unknown elements. \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11346-11347.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.cpp \\ Export determination: 6. \\Rationale: KML: Allow recognized elements within unknown elements. +M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp M /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp M /issm/trunk-jpl/src/c/solutions/transient\_core.cpp M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp M /issm/trunk-jpl/src/m/classes/initialization.m M /issm/trunk-jpl/src/m/classes/thermal.m A /issm/trunk-jpl/src/m/enum/ThermalIsenthalpyEnum.m M /issm/trunk-jpl/src/m/solutions/AnalysisConfiguration.m M /issm/trunk-jpl/src/m/solutions/transient\_core.m added possibility to used enthalpy in transient solutions \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11347-11348.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp M /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp M /issm/trunk-jpl/src/c/solutions/transient\_core.cpp M /issm/trunk-jpl/src/c/solvers/solver\_nonlinear.cpp M /issm/trunk-jpl/src/m/classes/initialization.m M /issm/trunk-jpl/src/m/classes/thermal.m A /issm/trunk-jpl/src/m/enum/ThermalIsenthalpyEnum.m M /issm/trunk-jpl/src/m/solutions/AnalysisConfiguration.m M /issm/trunk-jpl/src/m/solutions/transient\_core.m \\ Export determination: 6. \\Rationale: added possibility to used enthalpy in transient solutions +M /issm/trunk-jpl/test/NightlyRun/IdToName.m A /issm/trunk-jpl/test/NightlyRun/test143.m A /issm/trunk-jpl/test/NightlyRun/test144.m A /issm/trunk-jpl/test/NightlyRun/test353.bin A /issm/trunk-jpl/test/NightlyRun/test354.m added transient NR with enthalpy \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11348-11349.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/IdToName.m A /issm/trunk-jpl/test/NightlyRun/test143.m A /issm/trunk-jpl/test/NightlyRun/test144.m A /issm/trunk-jpl/test/NightlyRun/test353.bin A /issm/trunk-jpl/test/NightlyRun/test354.m \\ Export determination: 6. \\Rationale: added transient NR with enthalpy +D /issm/trunk-jpl/test/NightlyRun/test353.bin A /issm/trunk-jpl/test/NightlyRun/test353.m minor wrong file \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11349-11350.diff: \\ Function name: \\D /issm/trunk-jpl/test/NightlyRun/test353.bin A /issm/trunk-jpl/test/NightlyRun/test353.m \\ Export determination: 6. \\Rationale: minor wrong file +A /issm/trunk-jpl/test/Archives/Archive143.mat A /issm/trunk-jpl/test/Archives/Archive144.mat A /issm/trunk-jpl/test/Archives/Archive353.mat A /issm/trunk-jpl/test/Archives/Archive354.mat archives for transient enthalpy \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11350-11351.diff: \\ Function name: \\A /issm/trunk-jpl/test/Archives/Archive143.mat A /issm/trunk-jpl/test/Archives/Archive144.mat A /issm/trunk-jpl/test/Archives/Archive353.mat A /issm/trunk-jpl/test/Archives/Archive354.mat \\ Export determination: 6. \\Rationale: archives for transient enthalpy +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp minor \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11351-11352.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp \\ Export determination: 6. \\Rationale: minor +A /issm/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh Added installation script for Greenplanet \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11352-11353.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh \\ Export determination: 6. \\Rationale: Added installation script for Greenplanet +M /issm/trunk-jpl/src/m/qmu/expandresponses.m M /issm/trunk-jpl/src/m/solvers/solver\_newton.m minor: testing for George \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11353-11354.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/qmu/expandresponses.m M /issm/trunk-jpl/src/m/solvers/solver\_newton.m \\ Export determination: 6. \\Rationale: minor: testing for George +M /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp M /issm/trunk-jpl/src/m/solutions/AnalysisConfiguration.m fixed nr temporarily but not very good way of handeling things \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11354-11355.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp M /issm/trunk-jpl/src/m/solutions/AnalysisConfiguration.m \\ Export determination: 6. \\Rationale: fixed nr temporarily but not very good way of handeling things +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp got confused between thermal and enthalpy model ... \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11355-11356.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: got confused between thermal and enthalpy model ... +M /issm/trunk-jpl/src/m/classes/thermal.m minor last modification to fix NR \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11356-11357.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/thermal.m \\ Export determination: 6. \\Rationale: minor last modification to fix NR +M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp improved tao: added options from matlab model and returns all model output \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11357-11358.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: improved tao: added options from matlab model and returns all model output +M /issm/trunk-jpl/src/c/objects/Params/BoolParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h M /issm/trunk-jpl/src/c/objects/Params/FileParam.h M /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h M /issm/trunk-jpl/src/c/objects/Params/IntParam.h M /issm/trunk-jpl/src/c/objects/Params/PetscMatParam.h M /issm/trunk-jpl/src/c/objects/Params/PetscVecParam.h M /issm/trunk-jpl/src/c/objects/Params/StringParam.h minor typos \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11358-11359.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Params/BoolParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h M /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h M /issm/trunk-jpl/src/c/objects/Params/FileParam.h M /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h M /issm/trunk-jpl/src/c/objects/Params/IntParam.h M /issm/trunk-jpl/src/c/objects/Params/PetscMatParam.h M /issm/trunk-jpl/src/c/objects/Params/PetscVecParam.h M /issm/trunk-jpl/src/c/objects/Params/StringParam.h \\ Export determination: 6. \\Rationale: minor typos +M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp minor \\\\ +\noindent \textbf{Change \#19} with diff file ISSM-11359-11360.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/solutions/controltao\_core.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/test/NightlyRun/test314.m minor \\\\ Index: /issm/oecreview/Archive/11341-11360/r1.tex =================================================================== --- /issm/oecreview/Archive/11341-11360/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11341-11360/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11341 Index: /issm/oecreview/Archive/11341-11360/r2.tex =================================================================== --- /issm/oecreview/Archive/11341-11360/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11341-11360/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11360 Index: /issm/oecreview/Archive/11361-11380/Date.tex =================================================================== --- /issm/oecreview/Archive/11361-11380/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11361-11380/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11361-11380/ISSM-11361-11362.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11361-11362.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11361-11362.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11361) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11362) +@@ -3986,7 +3986,7 @@ + rho_ice=matpar->GetRhoIce(); + heatcapacity=matpar->GetHeatCapacity(); + thermalconductivity=matpar->GetThermalConductivity(); +- kappa=heatcapacity/(rho_ice*thermalconductivity); ++ kappa=thermalconductivity/(rho_ice*heatcapacity); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); + this->parameters->FindParam(&stabilization,ThermalStabilizationEnum); + Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Index: /issm/oecreview/Archive/11361-11380/ISSM-11362-11363.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11362-11363.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11362-11363.diff (revision 11515) @@ -0,0 +1,44 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11362) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11363) +@@ -3902,18 +3902,18 @@ + + enthalpy_input->GetInputValue(&enthalpy,gauss); + pressure_input->GetInputValue(&pressure,gauss); +- if(enthalpy>matpar->PureIceEnthalpy(pressure)){ +- enthalpy_input->GetInputValue(&enthalpyup,gaussup); +- pressure_input->GetInputValue(&pressureup,gaussup); +- if(enthalpyup>matpar->PureIceEnthalpy(pressureup)){ +- //do nothing, don't add heatflux +- } +- else{ +- //need to change spcenthalpy according to Aschwanden +- //NEED TO UPDATE +- } +- } +- else{ ++// if(enthalpy>matpar->PureIceEnthalpy(pressure)){ ++// enthalpy_input->GetInputValue(&enthalpyup,gaussup); ++// pressure_input->GetInputValue(&pressureup,gaussup); ++// if(enthalpyup>matpar->PureIceEnthalpy(pressureup)){ ++// //do nothing, don't add heatflux ++// } ++// else{ ++// //need to change spcenthalpy according to Aschwanden ++// //NEED TO UPDATE ++// } ++// } ++// else{ + geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); + friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); + vx_input->GetInputValue(&vx,gauss); +@@ -3924,7 +3924,7 @@ + if(dt) scalar=dt*scalar; + + for(i=0;ivalues[i]+=scalar*basis[i]; +- } ++// } + } + + /*Clean up and return*/ Index: /issm/oecreview/Archive/11361-11380/ISSM-11363-11364.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11363-11364.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11363-11364.diff (revision 11515) @@ -0,0 +1,23 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test354.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test354.m (revision 11363) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test354.m (revision 11364) +@@ -12,12 +12,12 @@ + md=solve(md,TransientSolutionEnum); + + %Fields and tolerances to track changes +-field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... +- 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... +- 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +-field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... +- 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... +- 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; ++field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; ++field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... Index: /issm/oecreview/Archive/11361-11380/ISSM-11364-11365.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11364-11365.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11364-11365.diff (revision 11515) @@ -0,0 +1,85 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/gemini.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/gemini.m (revision 11364) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/gemini.m (revision 11365) +@@ -9,13 +9,13 @@ + properties (SetAccess=public) + % {{{1 + name='gemini' +- login='larour'; ++ login='username'; + np=50; + port=0; + queue='debug'; + time=60; +- codepath='/workg/edw/larour/issm-2.0/bin' +- executionpath='/workg/edw/larour/Testing/Execution' ++ codepath='/workg/edw/issm-2.0/bin' ++ executionpath='/workg/edw/Testing/Execution' + %}}} + end + methods +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/castor.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/castor.m (revision 11364) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/castor.m (revision 11365) +@@ -9,13 +9,13 @@ + properties (SetAccess=public) + % {{{1 + name='castor' +- login='larour'; +- np =128; %number of processors ++ login='username'; ++ np =128; + port=0; + queue='shortc'; + time=180; +- codepath='/workp/edw/larour/issm-2.0/bin' +- executionpath='/workp/edw/larour/Testing/Execution' ++ codepath='/workp/edw/issm-2.0/bin' ++ executionpath='/workp/edw/Testing/Execution' + %}}} + end + methods +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/cosmos.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/cosmos.m (revision 11364) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/cosmos.m (revision 11365) +@@ -9,13 +9,13 @@ + properties (SetAccess=public) + % {{{1 + name='cosmos' +- login='larour'; ++ login='username'; + np=128; + port=0; + queue='shortq'; + time=3*60; +- codepath='/work00/edw/larour/issm-2.0/bin'; +- executionpath='/work00/edw/larour/Execution'; ++ codepath='/work00/edw/issm-2.0/bin'; ++ executionpath='/work00/edw/Execution'; + %}}} + end + methods +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/pollux.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/pollux.m (revision 11364) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/pollux.m (revision 11365) +@@ -9,13 +9,13 @@ + properties (SetAccess=public) + % {{{1 + name='pollux' +- login='larour'; ++ login='username'; + np=128; + port=0; + queue='shortp'; + time=180; +- codepath='/workc/edw/larour/issm-2.0/bin' +- executionpath='/workc/edw/larour/Testing/Execution' ++ codepath='/workc/edw/issm-2.0/bin' ++ executionpath='/workc/edw/Testing/Execution' + %}}} + end + methods Index: /issm/oecreview/Archive/11361-11380/ISSM-11365-11366.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11365-11366.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11365-11366.diff (revision 11515) @@ -0,0 +1,30 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh (revision 11365) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh (revision 11366) +@@ -14,20 +14,18 @@ + ./config/configure.py \ + --prefix="$ISSM_TIER/externalpackages/petsc/install" \ + --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \ ++ --PETSC_ARCH="$ISSM_ARCH" \ ++ --with-batch=1 \ + --with-debugging=0 \ + --with-shared-libraries=0 \ + --known-mpi-shared-libraries=1 \ +- --with-mpi-lib=/usr/mpi/intel/mvapich2-1.4.1-qlc/lib/libmpi.so \ +- --with-mpi-include=/usr/mpi/intel/mvapich2-1.4.1-qlc/include/ \ ++ --with-mpi-dir=/sopt/mpi/mvapich-1.1/intel/ \ ++ --with-blas-lapack-dir=/opt/intel/mkl/10.2.4.032/ \ + --download-mumps=yes \ + --download-scalapack=yes \ + --download-blacs=yes \ +- --download-blas=yes \ +- --download-f-blas-lapack=yes \ + --download-plapack=yes \ + --download-parmetis=yes \ + --with-pic=1 + +-#Compile petsc and install it +-make +-make install ++echo "== Follow PETSc's instructions" Index: /issm/oecreview/Archive/11361-11380/ISSM-11366-11367.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11366-11367.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11366-11367.diff (revision 11515) @@ -0,0 +1,46 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-greenplanet.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-greenplanet.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-greenplanet.sh (revision 11367) +@@ -0,0 +1,20 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install metis-4.0 ++mkdir install ++ ++#Untar ++tar -zxvf metis-4.0.tar.gz ++ ++#Move metis into install directory ++mv metis-4.0/* install ++rm -rf metis-4.0 ++ ++#Apply patches ++cd install ++patch -p1 < ../metis-4.0.patch ++patch Makefile.in ../configs/4.0/greenplanet/Makefile.in.patch ++ ++#Compile ++make + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-greenplanet.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet/Makefile.in.patch +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet/Makefile.in.patch (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet/Makefile.in.patch (revision 11367) +@@ -0,0 +1,10 @@ ++3,5c3 ++< CC = gcc ++< OBJ_EXT=o ++< LIB_EXT=a ++--- ++> CC = icc ++8c6 ++< OPTFLAGS = -DLINUX -fPIC ++--- ++> OPTFLAGS = -O3 Index: /issm/oecreview/Archive/11361-11380/ISSM-11368-11369.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11368-11369.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11368-11369.diff (revision 11515) @@ -0,0 +1,20 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11368) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11369) +@@ -3749,7 +3749,6 @@ + GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); + GetNodalFunctionsP1(&L[0], gauss); + +- enthalpy_input->GetInputValue(&enthalpy, gauss); + this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); + matice->GetViscosity3dStokes(&viscosity,&epsilon[0]); + GetPhi(&phi, &epsilon[0], viscosity); +@@ -3761,6 +3760,7 @@ + + /* Build transient now */ + if(dt){ ++ enthalpy_input->GetInputValue(&enthalpy, gauss); + scalar_transient=enthalpy*Jdet*gauss->weight; + for(i=0;ivalues[i]+=scalar_transient*L[i]; + } Index: /issm/oecreview/Archive/11361-11380/ISSM-11369-11370.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11369-11370.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11369-11370.diff (revision 11515) @@ -0,0 +1,35 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-greenplanet.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-greenplanet.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-greenplanet.sh (revision 11370) +@@ -0,0 +1,24 @@ ++#!/bin/csh ++ ++#PETSc 3.2 ++#/sopt/mpi/mvapich-1.1/intel/ ++ ++./configure \ ++ --prefix=$ISSM_TIER \ ++ --with-serial=no \ ++ --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \ ++ --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \ ++ --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \ ++ --with-mpi-include=/sopt/mpi/mvapich-1.1/intel/include/ \ ++ --with-mpi-lib="-L/sopt/mpi/mvapich-1.1/intel/lib/ -lmpich " \ ++ --with-petsc-arch=$ISSM_ARCH \ ++ --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \ ++ --with-mkl-dir=/opt/intel/mkl/10.2.4.032/ \ ++ --with-plapack-lib="-L$ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \ ++ --with-plapack-include="-I$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \ ++ --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \ ++ --with-scalapack-dir=$ISSM_TIER/externalpackages/petsc/install/ \ ++ --with-blacs-dir=$ISSM_TIER/externalpackages/petsc/install/ \ ++ --with-graphics-lib=/usr/lib64/libX11.so \ ++ --with-cxxoptflags="-O3 -xS" \ ++ --with-vendor=intel-linux + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-greenplanet.sh +___________________________________________________________________ +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11361-11380/ISSM-11371-11372.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11371-11372.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11371-11372.diff (revision 11515) @@ -0,0 +1,207 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 11372) +@@ -0,0 +1,202 @@ ++%PFE class definition ++% ++% Usage: ++% cluster=greenplanet(); ++% cluster=greenplanet('np',3); ++% cluster=greenplanet('np',3,'login','username'); ++ ++classdef greenplanet ++ properties (SetAccess=public) ++ % {{{1 ++ name='greenplanet' ++ login=''; ++ numnodes=20; ++ cpuspernode=8; ++ port=8000; ++ queue='rignot'; ++ codepath=''; ++ executionpath=''; ++ interactive=0; ++ end ++ properties (SetAccess=private) ++ np=20*8; ++ % }}} ++ end ++ methods ++ function cluster=greenplanet(varargin) % {{{1 ++ ++ %initialize cluster using default settings if provided ++ if (exist('greenplanet_settings')==2), greenplanet_settings; end ++ ++ %use provided options to change fields ++ options=pairoptions(varargin{:}); ++ for i=1:size(options.list,1), ++ fieldname=options.list{i,1}; ++ fieldvalue=options.list{i,2}; ++ if ismember(fieldname,properties('greenplanet')), ++ cluster.(fieldname)=fieldvalue; ++ else ++ disp(['''' fieldname ''' is not a property of cluster greenplanet']); ++ end ++ end ++ end ++ %}}} ++ function disp(cluster) % {{{1 ++ % display the object ++ disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); ++ disp(sprintf(' name: %s',cluster.name)); ++ disp(sprintf(' login: %s',cluster.login)); ++ disp(sprintf(' port: %i',cluster.port)); ++ disp(sprintf(' numnodes: %i',cluster.numnodes)); ++ disp(sprintf(' cpuspernode: %i',cluster.cpuspernode)); ++ disp(sprintf(' np: %i',cluster.cpuspernode*cluster.numnodes)); ++ disp(sprintf(' queue: %s',cluster.queue)); ++ disp(sprintf(' codepath: %s',cluster.codepath)); ++ disp(sprintf(' executionpath: %s',cluster.executionpath)); ++ disp(sprintf(' interactive: %i',cluster.interactive)); ++ end ++ %}}} ++ function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ ++ available_queues={'rignot','default'}; ++ queue_requirements_time=[Inf Inf]; ++ queue_requirements_np=[80 80]; ++ ++ QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,1) ++ ++ %Miscelaneous ++ if isempty(cluster.login), checkmessage('login empty'); end ++ if isempty(cluster.codepath), checkmessage('codepath empty'); end ++ if isempty(cluster.executionpath), checkmessage('executionpath empty'); end ++ ++ end ++ %}}} ++ function BuildQueueScript(cluster,md) % {{{1 ++ ++ %retrieve parameters ++ modelname=md.miscellaneous.name; ++ solution=md.private.solution; ++ isvalgrind=md.debug.valgrind; ++ ++ %compute number of processors ++ cluster.np=cluster.numnodes*cluster.cpuspernode; ++ ++ %open file for writing: ++ fid=fopen([modelname '.queue'],'w'); ++ ++ fprintf(fid,'#PBS -S /bin/bash\n'); ++ fprintf(fid,'#PBS -N %s\n',modelname); ++ fprintf(fid,'#PBS -q %s \n',cluster.queue); ++ fprintf(fid,'#PBS -l nodes=%i:ppn=%i\n',cluster.numnodes,cluster.cpuspernode); ++ fprintf(fid,'#PBS -m bea\n'); ++ fprintf(fid,'#PBS -M mmorligh@uci.edu\n'); ++ fprintf(fid,'#PBS -o %s.outlog \n',modelname); ++ fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); ++ ++ fprintf(fid,'cd %s\n\n',cluster.executionpath); ++ fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); ++ ++ if ~md.settings.io_gather, ++ %concatenate the output files: ++ fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); ++ end ++ ++ %close file ++ fclose(fid); ++ ++ %in interactive mode, create a run file, and errlog and outlog file ++ if cluster.interactive, ++ fid=fopen([modelname '.run'],'w'); ++ fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); ++ ++ if ~md.settings.io_gather, ++ %concatenate the output files: ++ fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); ++ end ++ fclose(fid); ++ fid=fopen([modelname '.errlog'],'w'); ++ fclose(fid); ++ fid=fopen([modelname '.outlog'],'w'); ++ fclose(fid); ++ end ++ end %}}} ++ function LaunchQueueJob(cluster,md,options)% {{{1 ++ ++ %lauch command, to be executed via ssh ++ if ~cluster.interactive, ++ launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... ++ ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && qsub ' md.miscellaneous.name '.queue ']; ++ else ++ launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive) ' && tar -zxf ' md.private.runtimename '.tar.gz']; ++ end ++ ++ if ~strcmpi(options.batch,'yes'), ++ ++ %compress the files into one zip. ++ compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.miscellaneous.name '.bin ' md.miscellaneous.name '.queue ' md.miscellaneous.name '.petsc ']; ++ if md.qmu.isdakota, ++ compressstring=[compressstring md.miscellaneous.name '.qmu.in ']; ++ end ++ if cluster.interactive, ++ compressstring=[compressstring md.miscellaneous.name '.run ' md.miscellaneous.name '.errlog ' md.miscellaneous.name '.outlog ']; ++ end ++ system(compressstring); ++ ++ disp('uploading input file and queueing script'); ++ if cluster.interactive, ++ directory=[cluster.executionpath '/Interactive' num2str(cluster.interactive)]; ++ else ++ directory=cluster.executionpath; ++ end ++ ++ issmscpout(cluster.name,directory,cluster.login,cluster.port,{[md.private.runtimename '.tar.gz']}); ++ ++ disp('launching solution sequence on remote cluster'); ++ issmssh(cluster.name,cluster.login,cluster.port,launchcommand); ++ ++ else ++ disp('batch mode requested: not launching job interactively'); ++ disp('launch solution sequence on remote cluster by hand'); ++ end ++ end ++ %}}} ++ function Download(cluster,md)% {{{1 ++ ++ %some check ++ if isempty(md.private.runtimename), ++ if ~cluster.interactive, ++ error('greenplanet Download error message: supply runtime name for results to be loaded!'); ++ end ++ end ++ ++ %Figure out the directory where all the files are in: ++ if ~cluster.interactive, ++ directory=[cluster.executionpath '/' md.private.runtimename '/']; ++ else ++ directory=[cluster.executionpath '/Interactive' num2str(cluster.interactive) '/']; ++ end ++ ++ %What packages are we picking up from remote cluster ++ if ~cluster.interactive, ++ packages={[md.miscellaneous.name '.outlog'],[md.miscellaneous.name '.errlog']}; ++ else ++ packages={}; ++ end ++ if md.qmu.isdakota, ++ packages{end+1}=[md.miscellaneous.name '.qmu.err']; ++ packages{end+1}=[md.miscellaneous.name '.qmu.out']; ++ if isfield(md.qmu.params,'tabular_graphics_data'), ++ if md.qmu.params.tabular_graphics_data==true, ++ packages{end+1}='dakota_tabular.dat'; ++ end ++ end ++ else ++ packages{end+1}=[md.miscellaneous.name '.outbin']; ++ end ++ ++ %copy files from cluster to present directory ++ issmscpin(cluster.name, cluster.login, cluster.port, directory, packages); ++ ++ end %}}} ++ end ++end Index: /issm/oecreview/Archive/11361-11380/ISSM-11373-11374.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11373-11374.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11373-11374.diff (revision 11515) @@ -0,0 +1,15 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 11373) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 11374) +@@ -93,8 +93,8 @@ + fprintf(fid,'#PBS -o %s.outlog \n',modelname); + fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); + +- fprintf(fid,'cd %s\n\n',cluster.executionpath); +- fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); ++ fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,md.private.runtimename); ++ fprintf(fid,'/sopt/mpi/mvapich-1.1/intel/bin/mpiexec -mpich-p4-no-shmem -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); + + if ~md.settings.io_gather, + %concatenate the output files: Index: /issm/oecreview/Archive/11361-11380/ISSM-11375-11376.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11375-11376.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11375-11376.diff (revision 11515) @@ -0,0 +1,101 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test143.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test143.m (revision 11375) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test143.m (revision 11376) +@@ -10,10 +10,12 @@ + md=solve(md,TransientSolutionEnum); + + %Fields and tolerances to track changes +-field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... +- 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... +- 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +-field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; ++field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; ++field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test144.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test144.m (revision 11375) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test144.m (revision 11376) +@@ -10,14 +10,13 @@ + md=solve(md,TransientSolutionEnum); + + %Fields and tolerances to track changes +-field_names={... +- 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... +- 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... +- 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; ++field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; + field_tolerances={... +- 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... +- 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... +- 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; ++ 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... ++ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... ++ 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m (revision 11375) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m (revision 11376) +@@ -4,9 +4,9 @@ + md=extrude(md,3,1); + md=setflowequation(md,'macayeal','all'); + md.timestepping.time_step=0; +-md.cluster=generic('name',oshostname(),'np',3); ++md.cluster=generic('name',oshostname(),'np',1); + md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +-%md.debug.valgrind=1; ++md.debug.valgrind=1; + md=solve(md,EnthalpySolutionEnum); + %md=solve(md,ThermalSolutionEnum); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.m (revision 11375) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test353.m (revision 11376) +@@ -12,12 +12,12 @@ + md=solve(md,TransientSolutionEnum); + + %Fields and tolerances to track changes +-field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... +- 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... +- 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; +-field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... +- 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... +- 1e-9,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; ++field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1', ... ++ 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2', ... ++ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3'}; ++field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive354.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive143.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive353.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive144.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11361-11380/ISSM-11376-11377.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11376-11377.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11376-11377.diff (revision 11515) @@ -0,0 +1,17 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m (revision 11376) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test350.m (revision 11377) +@@ -4,11 +4,9 @@ + md=extrude(md,3,1); + md=setflowequation(md,'macayeal','all'); + md.timestepping.time_step=0; +-md.cluster=generic('name',oshostname(),'np',1); ++md.cluster=generic('name',oshostname(),'np',3); + md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); +-md.debug.valgrind=1; + md=solve(md,EnthalpySolutionEnum); +-%md=solve(md,ThermalSolutionEnum); + + %Fields and tolerances to track changes + field_names ={'Enthalpy','Waterfraction','Temperature'}; Index: /issm/oecreview/Archive/11361-11380/ISSM-11377-11378.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11377-11378.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11377-11378.diff (revision 11515) @@ -0,0 +1,190 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.exrc +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.exrc (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.exrc (revision 11378) +@@ -0,0 +1,55 @@ ++set noic ++set autoindent ++set wrapmargin=0 ++set tabstop=4 ++set shiftwidth=4 ++set nomesg ++map #5 o$.......2.......3.......4.......5.......6.......7.......8.......9.......0....... ++map #6 !}fmt -w 80 ++ ++map #7 o$........1.........2.........3.........4.........5.........6.........7.. ++map #9 i/*50a- ++map #10 2i 50a-a*/ ++ab bc /* ++ab ec */ ++ab IOMS IMOS ++ab TF THISFUNCTION ++ab PS PetscSynchronizedPrintf(MPI_COMM_WORLD,""); ++PetscSynchronizedFlush(MPI_COMM_WORLD); ++ab As /*Assign output pointers:*/ ++ab Fe /*Free ressources:*/ ++ab p1 printf("ok1\n"); ++ab p2 printf("ok2\n"); ++ab p3 printf("ok3\n"); ++ab p4 printf("ok4\n"); ++ab p5 printf("ok5\n"); ++ab p6 printf("ok6\n"); ++ab p7 printf("ok7\n"); ++ab p8 printf("ok8\n"); ++ab p9 printf("ok9\n"); ++ ++ab cit \textit{temp} [2001] \cite{temp2001} ++ab xf xfree((void**)&); ++ ++:function! ReverseBackground() ++: let Mysyn=&syntax ++: if &bg=="light" ++: se bg=dark ++: highlight Normal guibg=black guifg=white ++: else ++: se bg=light ++: highlight Normal guibg=white guifg=black ++: endif ++: syn on ++: exe "set syntax=" . Mysyn ++: echo "now syntax is "&syntax ++:endfunction ++:command! Invbg call ReverseBackground() ++:noremap :Invbg ++ ++ ++" Abbreviations {{{1 ++" ---------------------------------------------------------------------- ++au BufRead,BufNewFile *.c* iab des "printf(\"file: ".expand('%')." line: %i\\n\",__LINE__);" ++au BufRead,BufNewFile *.c* iab dep "PetscSynchronizedPrintf(MPI_COMM_WORLD,\"file: ".expand('%:p')." line: ".line(".")."\\n\");\nPetscSynchronizedFlush(MPI_COMM_WORLD);" ++"}}} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.bashrc +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.bashrc (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.bashrc (revision 11378) +@@ -0,0 +1 @@ ++link .bash_profile +\ No newline at end of file + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.bashrc +___________________________________________________________________ +Added: svn:special + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/intel-windows7.sh +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/intel-windows7.sh +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.vimrc +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.vimrc (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.vimrc (revision 11378) +@@ -0,0 +1,96 @@ ++ ++" Use Vim settings, rather then Vi settings (much better!). ++" This must be first, because it changes other options as a side effect. ++set nocompatible ++set foldmethod=marker ++ ++" allow backspacing over everything in insert mode ++set backspace=indent,eol,start ++ ++set autoindent " always set autoindenting on ++set history=50 " keep 50 lines of command line history ++set ruler " show the cursor position all the time ++set showcmd " display incomplete commands ++set incsearch " do incremental searching ++set softtabstop=3 ++set uc=0 " disable swap files ++set shell=/bin/bash ++set nobackup ++ ++" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries ++" let &guioptions = substitute(&guioptions, "t", "", "g") ++ ++" Don't use Ex mode, use Q for formatting ++map Q gq ++ ++" Make p in Visual mode replace the selected text with the "" register. ++vnoremap p :let current_reg = @"gvs=current_reg ++ ++" This is an alternative that also works in block mode, but the deleted ++" text is lost and it only works for putting the current register. ++"vnoremap p "_dp ++ ++" Switch syntax highlighting on, when the terminal has colors ++" Also switch on highlighting the last used search pattern. ++syntax on ++set hlsearch ++ ++" Only do this part when compiled with support for autocommands. ++if has("autocmd") ++ ++ " Enable file type detection. ++ " Use the default filetype settings, so that mail gets 'tw' set to 72, ++ " 'cindent' is on in C files, etc. ++ " Also load indent files, to automatically do language-dependent indenting. ++ filetype plugin indent on ++ ++ " For all text files set 'textwidth' to 78 characters. ++ autocmd FileType text setlocal textwidth=0 ++ ++ " When editing a file, always jump to the last known cursor position. ++ " Don't do it when the position is invalid or when inside an event handler ++ " (happens when dropping a file on gvim). ++ autocmd BufReadPost * ++ \ if line("'\"") > 0 && line("'\"") <= line("$") | ++ \ exe "normal g`\"" | ++ \ endif | ++ \ if foldlevel('.') > 0 | ++ \ exe ":foldopen!" | ++ \ endif ++ ++ ++ ++endif " has("autocmd") ++colo default ++ ++ ++"execute "source ~/.vim/plugin/FeralToggleCommentify.vim" ++"map : call ToggleCommentify()j ++"imap :call ToggleCommentify()j ++ ++ ++ ++function! InsertTabWrapper(direction) ++let col = col('.') - 1 ++if !col || getline('.')[col - 1] !~ '\k' ++ return "\" ++elseif "backward" == a:direction ++ return "\" ++else ++ return "\" ++endif ++endfunction ++ ++inoremap =InsertTabWrapper ("forward") ++inoremap =InsertTabWrapper ("backward") ++ ++source ~/.exrc ++set wildmenu ++set background=dark ++ ++"Do local Makefile ++map :!/home/larour/bin/cs ++"Compile server code ++map :!/home/larour/bin/c ++"Change to directory of current file automatically ++autocmd BufEnter * lcd %:p:h + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.vimrc +___________________________________________________________________ +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11361-11380/ISSM-11378-11379.diff =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-11378-11379.diff (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-11378-11379.diff (revision 11515) @@ -0,0 +1,35 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/intel-windows7.sh +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/intel-windows7.sh +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/notes +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/notes (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/notes (revision 11379) +@@ -0,0 +1,8 @@ ++Compiling ISSM using Matlab compatible compilers. ++ ++At: http://www.mathworks.com/support/compilers/R2011b/win64.html#n2 ++you will find a list of Matlab supported compilers. ++ ++ ++ ++We'll try the compile with the Microsoft Windows SDK 7.1: http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=8279 +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/winsdk_web.exe +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/x-dosexec + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/winsdk_web.exe +___________________________________________________________________ +Added: svn:mime-type + + application/x-dosexec +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11361-11380/ISSM-DocReview-11361-11380.tex =================================================================== --- /issm/oecreview/Archive/11361-11380/ISSM-DocReview-11361-11380.tex (revision 11515) +++ /issm/oecreview/Archive/11361-11380/ISSM-DocReview-11361-11380.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11361-11380/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11361-11380/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11361-11380/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11361-11380 Index: /issm/oecreview/Archive/11361-11380/Makefile =================================================================== --- /issm/oecreview/Archive/11361-11380/Makefile (revision 11515) +++ /issm/oecreview/Archive/11361-11380/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11361-11380 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11361-11380/log.tex =================================================================== --- /issm/oecreview/Archive/11361-11380/log.tex (revision 11515) +++ /issm/oecreview/Archive/11361-11380/log.tex (revision 11515) @@ -0,0 +1,29 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11361-11362.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h \\ Export determination: 6. \\Rationale: fixing stabilization for enthalpy solution +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp minor wrong kappa parameter \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11362-11363.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: minor wrong kappa parameter +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp switch back geothermal flux for NR \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11363-11364.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: switch back geothermal flux for NR +M /issm/trunk-jpl/test/NightlyRun/test354.m minor field names \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11364-11365.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test354.m \\ Export determination: 6. \\Rationale: minor field names +M /issm/trunk-jpl/src/m/classes/clusters/castor.m M /issm/trunk-jpl/src/m/classes/clusters/cosmos.m M /issm/trunk-jpl/src/m/classes/clusters/gemini.m M /issm/trunk-jpl/src/m/classes/clusters/pollux.m removed private info \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11365-11366.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/clusters/castor.m M /issm/trunk-jpl/src/m/classes/clusters/cosmos.m M /issm/trunk-jpl/src/m/classes/clusters/gemini.m M /issm/trunk-jpl/src/m/classes/clusters/pollux.m \\ Export determination: 6. \\Rationale: removed private info +M /issm/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh Fixed PETSc's compilation on Greenplanet \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11366-11367.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh \\ Export determination: 6. \\Rationale: Fixed PETSc's compilation on Greenplanet +A /issm/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet A /issm/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet/Makefile.in.patch A /issm/trunk-jpl/externalpackages/metis/install-4.0-greenplanet.sh Added for Greenplanet compilation \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11367-11368.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet A /issm/trunk-jpl/externalpackages/metis/configs/4.0/greenplanet/Makefile.in.patch A /issm/trunk-jpl/externalpackages/metis/install-4.0-greenplanet.sh \\ Export determination: 6. \\Rationale: Added for Greenplanet compilation \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11368-11369.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: hopefully fixed nr for good \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11369-11370.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: hopefully fixed nr for good +A /issm/trunk-jpl/configs/config-greenplanet.sh Added config for greenplanet \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11370-11371.diff: \\ Function name: \\A /issm/trunk-jpl/configs/config-greenplanet.sh \\ Export determination: 6. \\Rationale: Added config for greenplanet \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11371-11372.diff: \\ Function name: \\A /issm/trunk-jpl/src/m/classes/clusters/greenplanet.m \\ Export determination: 6. \\Rationale: Added greenplanet cluster \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11372-11373.diff: \\ Function name: \\A /issm/trunk-jpl/src/m/classes/clusters/greenplanet.m \\ Export determination: 6. \\Rationale: Added greenplanet cluster \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11373-11374.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/clusters/greenplanet.m \\ Export determination: 6. \\Rationale: Fixed execution script \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11374-11375.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/clusters/greenplanet.m \\ Export determination: 6. \\Rationale: Fixed execution script \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11375-11376.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive143.mat M /issm/trunk-jpl/test/Archives/Archive144.mat M /issm/trunk-jpl/test/Archives/Archive353.mat M /issm/trunk-jpl/test/Archives/Archive354.mat M /issm/trunk-jpl/test/NightlyRun/test143.m M /issm/trunk-jpl/test/NightlyRun/test144.m M /issm/trunk-jpl/test/NightlyRun/test350.m M /issm/trunk-jpl/test/NightlyRun/test353.m \\ Export determination: 6. \\Rationale: updated archives \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11376-11377.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive143.mat M /issm/trunk-jpl/test/Archives/Archive144.mat M /issm/trunk-jpl/test/Archives/Archive353.mat M /issm/trunk-jpl/test/Archives/Archive354.mat M /issm/trunk-jpl/test/NightlyRun/test143.m M /issm/trunk-jpl/test/NightlyRun/test144.m M /issm/trunk-jpl/test/NightlyRun/test350.m M /issm/trunk-jpl/test/NightlyRun/test353.m \\ Export determination: 6. \\Rationale: updated archives +M /issm/trunk-jpl/test/NightlyRun/test350.m minor \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11377-11378.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test350.m \\ Export determination: 6. \\Rationale: minor +A /issm/trunk-jpl/externalpackages/intel/.bashrc A /issm/trunk-jpl/externalpackages/intel/.exrc A /issm/trunk-jpl/externalpackages/intel/.vimrc A /issm/trunk-jpl/externalpackages/intel/intel-windows7.sh diverse \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11378-11379.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/intel/.bashrc A /issm/trunk-jpl/externalpackages/intel/.exrc A /issm/trunk-jpl/externalpackages/intel/.vimrc A /issm/trunk-jpl/externalpackages/intel/intel-windows7.sh \\ Export determination: 6. \\Rationale: diverse +A /issm/trunk-jpl/externalpackages/win7 A /issm/trunk-jpl/externalpackages/win7/intel-windows7.sh A /issm/trunk-jpl/externalpackages/win7/notes A /issm/trunk-jpl/externalpackages/win7/winsdk\_web.exe windows build \\\\ +\noindent \textbf{Change \#19} with diff file ISSM-11379-11380.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/win7 A /issm/trunk-jpl/externalpackages/win7/intel-windows7.sh A /issm/trunk-jpl/externalpackages/win7/notes A /issm/trunk-jpl/externalpackages/win7/winsdk\_web.exe \\ Export determination: 6. \\Rationale: windows build \\\\ Index: /issm/oecreview/Archive/11361-11380/r1.tex =================================================================== --- /issm/oecreview/Archive/11361-11380/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11361-11380/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11361 Index: /issm/oecreview/Archive/11361-11380/r2.tex =================================================================== --- /issm/oecreview/Archive/11361-11380/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11361-11380/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11380 Index: /issm/oecreview/Archive/11381-11400/Date.tex =================================================================== --- /issm/oecreview/Archive/11381-11400/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11381-11400/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11381-11400/ISSM-11381-11382.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11381-11382.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11381-11382.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh (revision 11381) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh (revision 11382) +@@ -19,7 +19,7 @@ + --with-debugging=0 \ + --with-shared-libraries=0 \ + --known-mpi-shared-libraries=1 \ +- --with-mpi-dir=/sopt/mpi/mvapich-1.1/intel/ \ ++ --with-mpi-dir=/sopt/mpi/openmpi-1.5.4_psm/intel/ \ + --with-blas-lapack-dir=/opt/intel/mkl/10.2.4.032/ \ + --download-mumps=yes \ + --download-scalapack=yes \ Index: /issm/oecreview/Archive/11381-11400/ISSM-11382-11383.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11382-11383.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11382-11383.diff (revision 11515) @@ -0,0 +1,420 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.h (revision 11382) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.h (revision 11383) +@@ -20,7 +20,7 @@ + + DataSet* attrib; + DataSet* commnt; +- DataSet* unknwn; ++ DataSet* kmlobj; + + /*KML_Object constructors, destructors {{{1*/ + KML_Object(); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_File.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_File.cpp (revision 11382) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_File.cpp (revision 11383) +@@ -23,17 +23,14 @@ + /*FUNCTION KML_File::KML_File(){{{1*/ + KML_File::KML_File(){ + +- kmlobj =new DataSet; ++ ; + + } + /*}}}*/ + /*FUNCTION KML_File::~KML_File(){{{1*/ + KML_File::~KML_File(){ + +- if (kmlobj) { +- delete kmlobj; +- kmlobj =NULL; +- } ++ ; + + } + /*}}}*/ +@@ -47,8 +44,6 @@ + _printf_(flag,"KML_File:\n"); + KML_Object::Echo(); + +- _printf_(flag," kmlobj: (size=%d)\n" ,kmlobj->Size()); +- + return; + } + /*}}}*/ +@@ -65,36 +60,17 @@ + /*FUNCTION KML_File::DeepEcho {{{1*/ + void KML_File::DeepEcho(const char* indent){ + +- int i; +- char indent2[81]; + bool flag=true; + + _printf_(flag,"%sKML_File:\n",indent); + KML_Object::DeepEcho(indent); + +-/* loop over the kml objects for the file */ +- +- memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char)); +- strcat(indent2," "); +- +- if (kmlobj->Size()) +- for (i=0; iSize(); i++) { +- _printf_(flag,"%s kmlobj: -------- begin [%d] --------\n" ,indent,i); +- ((KML_Object *)kmlobj->GetObjectByOffset(i))->DeepEcho(indent2); +- _printf_(flag,"%s kmlobj: -------- end [%d] --------\n" ,indent,i); +- } +- else +- _printf_(flag,"%s kmlobj: [empty]\n" ,indent); +- + return; + } + /*}}}*/ + /*FUNCTION KML_File::Write {{{1*/ + void KML_File::Write(FILE* filout,const char* indent){ + +- int i; +- char indent2[81]; +- + fprintf(filout,"%s\n"); +@@ -102,15 +78,6 @@ + + KML_Object::Write(filout,indent); + +-/* loop over the kml objects for the file */ +- +- memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char)); +- +- strcat(indent2," "); +- +- for (i=0; iSize(); i++) +- ((KML_Object *)kmlobj->GetObjectByOffset(i))->Write(filout,indent2); +- + fprintf(filout,"%s\n",indent); + + return; +@@ -143,108 +110,6 @@ + else if (strncmp(kstri,"<",1)) + _error_("KML_File::Read -- Unexpected field \"%s\".\n",kstri); + +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +-// else if (!strncmp(kstri,"Read(fid,kstri); +-// kmlobj ->AddObject((Object*)kobj); +-// } +- +-// else if (!strncmp(kstri,"Read(fid,kstri); +-// kmlobj ->AddObject((Object*)kobj); +-// } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +- else if (!strncmp(kstri,"Read(fid,kstri); +- kmlobj ->AddObject((Object*)kobj); +- } +- +-// else if (!strncmp(kstri,"Read(fid,kstri); +-// kmlobj ->AddObject((Object*)kobj); +-// } +- +-// else if (!strncmp(kstri,"Read(fid,kstri); +-// kmlobj ->AddObject((Object*)kobj); +-// } +- + else if (!strncmp(kstri,"<",1)) + KML_Object::Read(fid,kstri); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 11382) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 11383) +@@ -25,7 +25,7 @@ + + attrib =new DataSet; + commnt =new DataSet; +- unknwn =new DataSet; ++ kmlobj =new DataSet; + + } + /*}}}*/ +@@ -40,9 +40,9 @@ + delete commnt; + commnt =NULL; + } +- if (unknwn) { +- delete unknwn; +- unknwn =NULL; ++ if (kmlobj) { ++ delete kmlobj; ++ kmlobj =NULL; + } + + } +@@ -56,7 +56,7 @@ + + _printf_(flag," attrib: (size=%d)\n" ,attrib->Size()); + _printf_(flag," commnt: (size=%d)\n" ,commnt->Size()); +- _printf_(flag," unknwn: (size=%d)\n" ,unknwn->Size()); ++ _printf_(flag," kmlobj: (size=%d)\n" ,kmlobj->Size()); + + return; + } +@@ -101,14 +101,14 @@ + memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char)); + strcat(indent2," "); + +- if (unknwn->Size()) +- for (i=0; iSize(); i++) { +- _printf_(flag,"%s unknwn: -------- begin [%d] --------\n" ,indent,i); +- ((KML_Unknown *)unknwn->GetObjectByOffset(i))->DeepEcho(indent2); +- _printf_(flag,"%s unknwn: -------- end [%d] --------\n" ,indent,i); ++ if (kmlobj->Size()) ++ for (i=0; iSize(); i++) { ++ _printf_(flag,"%s kmlobj: -------- begin [%d] --------\n" ,indent,i); ++ ((KML_Unknown *)kmlobj->GetObjectByOffset(i))->DeepEcho(indent2); ++ _printf_(flag,"%s kmlobj: -------- end [%d] --------\n" ,indent,i); + } + else +- _printf_(flag,"%s unknwn: [empty]\n" ,indent); ++ _printf_(flag,"%s kmlobj: [empty]\n" ,indent); + + return; + } +@@ -127,9 +127,9 @@ + memcpy(indent2,indent,(strlen(indent)+1)*sizeof(char)); + strcat(indent2," "); + +- if (unknwn->Size()) +- for (i=0; iSize(); i++) { +- ((KML_Unknown *)unknwn->GetObjectByOffset(i))->Write(filout,indent2); ++ if (kmlobj->Size()) ++ for (i=0; iSize(); i++) { ++ ((KML_Unknown *)kmlobj->GetObjectByOffset(i))->Write(filout,indent2); + } + + return; +@@ -152,103 +152,103 @@ + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + // else if (!strncmp(kstr,"Read(fid,kstr); +-// unknwn ->AddObject((Object*)kobj); ++// kmlobj ->AddObject((Object*)kobj); + // } + + // else if (!strncmp(kstr,"Read(fid,kstr); +-// unknwn ->AddObject((Object*)kobj); ++// kmlobj ->AddObject((Object*)kobj); + // } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + else if (!strncmp(kstr,"Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + // else if (!strncmp(kstr,"Read(fid,kstr); +-// unknwn ->AddObject((Object*)kobj); ++// kmlobj ->AddObject((Object*)kobj); + // } + + // else if (!strncmp(kstr,"Read(fid,kstr); +-// unknwn ->AddObject((Object*)kobj); ++// kmlobj ->AddObject((Object*)kobj); + // } + + else if (!strncmp(kstr,"<",1)) { +@@ -257,7 +257,7 @@ + // fid); + kobj=(KML_Object*)new KML_Unknown(); + kobj->Read(fid,kstr); +- unknwn ->AddObject((Object*)kobj); ++ kmlobj ->AddObject((Object*)kobj); + } + + return; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_File.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_File.h (revision 11382) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_File.h (revision 11383) +@@ -19,8 +19,6 @@ + + public: + +- DataSet* kmlobj; +- + /*KML_File constructors, destructors {{{1*/ + KML_File(); + ~KML_File(); Index: /issm/oecreview/Archive/11381-11400/ISSM-11384-11385.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11384-11385.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11384-11385.diff (revision 11515) @@ -0,0 +1,50 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 11385) +@@ -0,0 +1,20 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install metis-4.0 ++mkdir install ++ ++#Untar ++tar -zxvf metis-4.0.tar.gz ++ ++#Move metis into install directory ++mv metis-4.0/* install ++rm -rf metis-4.0 ++ ++#Apply patches ++cd install ++patch -p1 < ../metis-4.0.patch ++patch Makefile.in ../configs/4.0/win7/Makefile.in.patch ++ ++#Compile ++make + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 11385) +@@ -0,0 +1,14 @@ ++3,5c3,5 ++< CC = gcc ++< OBJ_EXT=o ++< LIB_EXT=a ++--- ++> CC = cl ++> OBJ_EXT=obj ++> LIB_EXT=lib ++8c8 ++< OPTFLAGS = -DLINUX -fPIC ++--- ++> OPTFLAGS = -DWIN32 -D__VC__ ++22d21 ++< #RANLIB = Index: /issm/oecreview/Archive/11381-11400/ISSM-11385-11386.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11385-11386.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11385-11386.diff (revision 11515) @@ -0,0 +1,91 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh (revision 11386) +@@ -0,0 +1,44 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install petsc-3.1-p7 src ++mkdir install src ++ ++#Untar and move petsc to install directory ++tar -zxvf petsc-3.1-p7.tar.gz ++mv petsc-3.1-p7/* src/ ++rm -rf petsc-3.1-p7 ++ ++#configure ++cd src ++./config/configure.py \ ++ --with-parallel-no \ ++ --prefix="$ISSM_TIER/externalpackages/petsc/install" \ ++ --PETSC_ARCH=cygwin-intel \ ++ --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \ ++ --with-debugging=0 \ ++ --with-mpi=0 \ ++ --download-c-blas-lapack=1 ++ ++#./config/configure.py \ ++# --prefix="$ISSM_TIER/externalpackages/petsc/install" \ ++# --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/src" \ ++# --PETSC_ARCH=macosx-gnu \ ++# --with-mpi-dir=$ISSM_TIER/externalpackages/mpich2/install \ ++# --with-debugging=0 \ ++# --with-shared=0 \ ++# --download-mumps=yes \ ++# --download-scalapack=yes \ ++# --download-blacs=yes \ ++# --download-blas=yes \ ++# --download-f-blas-lapack=yes \ ++# --download-plapack=yes \ ++# --FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -arch i386" \ ++# --COPTFLAGS="-march=opteron -O2 -arch i386" \ ++# --FOPTFLAGS="-march=opteron -O2 -arch i386" \ ++# --CXXOPTFLAGS="-march=opteron -O2 -arch i386" \ ++# --download-parmetis=yes ++ ++#Compile petsc and install it ++make ++make install + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-2.3.2-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-2.3.2-win7.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-2.3.2-win7.sh (revision 11386) +@@ -0,0 +1,25 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install petsc-2.3.2-p3 src ++mkdir install src ++ ++#Untar and move petsc to install directory ++tar -zxvf petsc-2.3.2-p3.tar.gz ++mv petsc-2.3.2-p3/* install/ ++rm -rf petsc-2.3.2-p3 ++ ++#configure ++cd install ++./config/configure.py \ ++ --with-parallel-no \ ++ --prefix="$ISSM_TIER/externalpackages/petsc/install" \ ++ --PETSC_ARCH=cygwin-intel \ ++ --PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install" \ ++ --with-debugging=0 \ ++ --with-mpi=0 \ ++ --download-c-blas-lapack=1 ++ ++#Compile petsc and install it ++make ++make install + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/petsc/install-2.3.2-win7.sh +___________________________________________________________________ +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11381-11400/ISSM-11386-11387.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11386-11387.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11386-11387.diff (revision 11515) @@ -0,0 +1,73 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/intel-windows7.sh +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/vs10.0.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/vs10.0.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/win7/vs10.0.sh (revision 11387) +@@ -0,0 +1,64 @@ ++declare -x ALLUSERSPROFILE="C:\\ProgramData" ++declare -x APPDATA="C:\\Users\\larour\\AppData\\Roaming" ++declare -x COMMONPROGRAMFILES="C:\\Program Files (x86)\\Common Files" ++declare -x COMPUTERNAME="WIN-IH1FCG0JVB1" ++declare -x COMSPEC="C:\\Windows\\system32\\cmd.exe" ++declare -x CommonProgramW6432="C:\\Program Files\\Common Files" ++declare -x DevEnvDir="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\IDE\\" ++declare -x FP_NO_HOST_CHECK="NO" ++declare -x Framework35Version="v3.5" ++declare -x FrameworkDIR32="C:\\Windows\\Microsoft.NET\\Framework\\" ++declare -x FrameworkDir="C:\\Windows\\Microsoft.NET\\Framework\\" ++declare -x FrameworkVersion="v4.0.30319" ++declare -x FrameworkVersion32="v4.0.30319" ++declare -x GREP_COLOR="00;38;5;226" ++declare -x GREP_OPTIONS="--binary-file=without-match" ++declare -x HOME="/home/larour" ++declare -x HOMEDRIVE="C:" ++declare -x HOMEPATH="\\Users\\larour" ++declare -x HOSTNAME="WIN-IH1FCG0JVB1" ++declare -x INCLUDE="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\INCLUDE;C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\include;" ++declare -x INFOPATH="/usr/local/info:/usr/share/info:/usr/info:" ++declare -x LANG="C.UTF-8" ++declare -x LIB="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\LIB;C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\lib;" ++declare -x LIBPATH="C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Windows\\Microsoft.NET\\Framework\\v3.5;C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\LIB;" ++declare -x LOCALAPPDATA="C:\\Users\\larour\\AppData\\Local" ++declare -x LOGONSERVER="\\\\WIN-IH1FCG0JVB1" ++declare -x MANPATH="/usr/local/man:/usr/share/man:/usr/man:" ++declare -x NUMBER_OF_PROCESSORS="1" ++declare -x OLDPWD="/cygdrive/c/issm-uci/trunk-jpl" ++declare -x OS="Windows_NT" ++declare -x PATH="/usr/local/bin:/usr/bin:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/IDE:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/BIN:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/Common7/Tools:/cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319:/cygdrive/c/Windows/Microsoft.NET/Framework/v3.5:/cygdrive/c/Program Files (x86)/Microsoft Visual Studio 10.0/VC/VCPackages:/cygdrive/c/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/bin/NETFX 4.0 Tools:/cygdrive/c/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files/Microsoft Windows Performance Toolkit" ++declare -x PATHEXT=".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC" ++declare -x PRINTER="137.78.140.129#:1" ++declare -x PROCESSOR_ARCHITECTURE="x86" ++declare -x PROCESSOR_ARCHITEW6432="AMD64" ++declare -x PROCESSOR_IDENTIFIER="Intel64 Family 6 Model 42 Stepping 7, GenuineIntel" ++declare -x PROCESSOR_LEVEL="6" ++declare -x PROCESSOR_REVISION="2a07" ++declare -x PROGRAMFILES="C:\\Program Files (x86)" ++declare -x PROMPT="\$P\$G" ++declare -x PS1="\\[\\e]0;\\w\\a\\]\\n\\[\\e[32m\\]\\u@\\h \\[\\e[33m\\]\\w\\[\\e[0m\\]\\n\\\$ " ++declare -x PSModulePath="C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules\\" ++declare -x PUBLIC="C:\\Users\\Public" ++declare -x ProgramData="C:\\ProgramData" ++declare -x ProgramW6432="C:\\Program Files" ++declare -x REPO="jpl" ++declare -x SESSIONNAME="Console" ++declare -x SHLVL="1" ++declare -x SYSTEMDRIVE="C:" ++declare -x SYSTEMROOT="C:\\Windows" ++declare -x TEMP="/tmp" ++declare -x TERM="cygwin" ++declare -x TMP="/tmp" ++declare -x USER="larour" ++declare -x USERDOMAIN="WIN-IH1FCG0JVB1" ++declare -x USERNAME="larour" ++declare -x USERPROFILE="C:\\Users\\larour" ++declare -x VCINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\" ++declare -x VS100COMNTOOLS="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\Tools\\" ++declare -x VSINSTALLDIR="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\" ++declare -x WINDIR="C:\\Windows" ++declare -x WindowsSdkDir="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.0A\\" ++declare -x windows_tracing_flags="3" ++declare -x windows_tracing_logfile="C:\\BVTBin\\Tests\\installpackage\\csilogfile.log" Index: /issm/oecreview/Archive/11381-11400/ISSM-11387-11388.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11387-11388.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11387-11388.diff (revision 11515) @@ -0,0 +1,68 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m (revision 11387) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m (revision 11388) +@@ -5,7 +5,7 @@ + + classdef solver + properties (SetAccess=public) +- options={NoneAnalysisEnum,mumpsoptions}; ++ options=cell(0,0); + end + methods + function obj = solver(varargin) % {{{ +@@ -25,22 +25,30 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + ++ %MUMPS is the default solver ++ obj.options={'NoneAnalysis',mumpsoptions}; ++ + end % }}} +- function obj=addoptions(obj,analysis,solveroptions) % {{{1 ++ function obj = addoptions(obj,analysis,solveroptions) % {{{1 ++ ++ %Convert analysis from enum to string ++ analysis=EnumToString(analysis); ++ + %first, find out if analysis has already been supplied + found=false; + for i=1:size(obj.options,1), + inanalysis=obj.options{i,1}; +- if inanalysis==analysis, ++ if strcmp(inanalysis,analysis), + found=true; +- obj.options{i,1}=analysis; +- obj.options{i,2}=solveroptions; ++ obj.options{i,1} = analysis; ++ obj.options{i,2} = solveroptions; + break; + end + end ++ + if ~found, +- obj.options{end+1,1}=analysis; +- obj.options{end,2}=solveroptions; ++ obj.options{end+1,1}= analysis; ++ obj.options{end,2} = solveroptions; + end + end + %}}} +@@ -69,7 +77,7 @@ + options=solver.options{i,2}; + + %first write analysis: +- fprintf(fid,'\n+%s\n',EnumToString(analysis)); %append a + to recognize it's an analysis enum ++ fprintf(fid,'\n+%s\n',analysis); %append a + to recognize it's an analysis enum + + %now, write options + for j=1:size(options,2), +@@ -125,7 +133,7 @@ + end + end + +- disp(sprintf(' %s -> ''%s''',EnumToString(analysis),string)); ++ disp(sprintf(' %s -> ''%s''',analysis,string)); + end + end + %}}} Index: /issm/oecreview/Archive/11381-11400/ISSM-11388-11389.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11388-11389.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11388-11389.diff (revision 11515) @@ -0,0 +1,17 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m (revision 11388) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m (revision 11389) +@@ -53,7 +53,11 @@ + end + %}}} + function checkconsistency(obj,md,solution,analyses) % {{{ +- ++ for i=1:size(obj.options,1), ++ if ~ischar(obj.options{i,1}), ++ checkmessage('solver is not well formatted: Analyses are not strings'); ++ end ++ end + end % }}} + function PetscFile(solver,filename) % {{{ + %PETSCFILE - build petsc file Index: /issm/oecreview/Archive/11381-11400/ISSM-11389-11390.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11389-11390.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11389-11390.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11389) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11390) +@@ -3536,7 +3536,7 @@ + + GetBConduct(&B_conduct[0][0],&xyz_list[0][0],gauss); + +- D_scalar_conduct=gauss->weight*Jdet*(thermalconductivity/(rho_ice*heatcapacity)); ++ D_scalar_conduct=gauss->weight*Jdet*kappa; + if(dt) D_scalar_conduct=D_scalar_conduct*dt; + + D[0][0]=D_scalar_conduct; D[0][1]=0; D[0][2]=0; Index: /issm/oecreview/Archive/11381-11400/ISSM-11390-11391.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11390-11391.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11390-11391.diff (revision 11515) @@ -0,0 +1,49 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11390) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11391) +@@ -3732,12 +3732,11 @@ + thermalconductivity=matpar->GetThermalConductivity(); + this->parameters->FindParam(&dt,TimesteppingTimeStepEnum); + this->parameters->FindParam(&stabilization,ThermalStabilizationEnum); +- Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); +- Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); +- Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); +- Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); +- Input* enthalpy_input=NULL; +- if (dt) enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(inputs); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); ++ Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); ++ Input* enthalpy_input=NULL; enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); + if (stabilization==2) diameter=MinEdgeLength(xyz_list); + + /* Start looping on the number of gaussian points: */ +@@ -3751,16 +3750,16 @@ + + this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); + matice->GetViscosity3dStokes(&viscosity,&epsilon[0]); ++ enthalpy_input->GetInputValue(&enthalpy, gauss); + GetPhi(&phi, &epsilon[0], viscosity); + +- scalar_def=phi/(rho_ice)*Jdet*gauss->weight; ++ scalar_def=phi/rho_ice*Jdet*gauss->weight; + if(dt) scalar_def=scalar_def*dt; + + for(i=0;ivalues[i]+=scalar_def*L[i]; + + /* Build transient now */ + if(dt){ +- enthalpy_input->GetInputValue(&enthalpy, gauss); + scalar_transient=enthalpy*Jdet*gauss->weight; + for(i=0;ivalues[i]+=scalar_transient*L[i]; + } +@@ -3773,7 +3772,6 @@ + vz_input->GetInputValue(&w, gauss); + pressure_input->GetInputValue(&pressure, gauss); + kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure); +- + tau_parameter=GetStabilizationParameter(u,v,w,diameter,kappa); + + for(i=0;ivalues[i]+=tau_parameter*scalar_def*(u*dbasis[0][i]+v*dbasis[1][i]+w*dbasis[2][i]); Index: /issm/oecreview/Archive/11381-11400/ISSM-11391-11392.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11391-11392.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11391-11392.diff (revision 11515) @@ -0,0 +1,21 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11391) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11392) +@@ -3319,13 +3319,9 @@ + GetBAdvec(&B_advec[0][0],&xyz_list[0][0],gauss); + GetBprimeAdvec(&Bprime_advec[0][0],&xyz_list[0][0],gauss); + +- vx_input->GetInputValue(&u, gauss); +- vy_input->GetInputValue(&v, gauss); +- vz_input->GetInputValue(&w, gauss); +- vxm_input->GetInputValue(&um,gauss); +- vym_input->GetInputValue(&vm,gauss); +- vzm_input->GetInputValue(&wm,gauss); +- vx=u-um; vy=v-vm; vz=w-wm; ++ vx_input->GetInputValue(&u, gauss); vxm_input->GetInputValue(&um,gauss); vx=u-um; ++ vy_input->GetInputValue(&v, gauss); vym_input->GetInputValue(&vm,gauss); vy=v-vm; ++ vz_input->GetInputValue(&w, gauss); vzm_input->GetInputValue(&wm,gauss); vz=w-wm; + + D_scalar_advec=gauss->weight*Jdet; + if(dt) D_scalar_advec=D_scalar_advec*dt; Index: /issm/oecreview/Archive/11381-11400/ISSM-11392-11393.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11392-11393.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11392-11393.diff (revision 11515) @@ -0,0 +1,65 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11392) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11393) +@@ -3707,7 +3707,8 @@ + double Jdet,phi,dt; + double rho_ice,heatcapacity; + double thermalconductivity,kappa; +- double viscosity,enthalpy,pressure; ++ double viscosity,pressure; ++ double enthalpy,enthalpypicard; + double tau_parameter,diameter; + double u,v,w; + double scalar_def,scalar_transient; +@@ -3732,8 +3733,15 @@ + Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); + Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input); +- Input* enthalpy_input=NULL; enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); +- if (stabilization==2) diameter=MinEdgeLength(xyz_list); ++ Input* enthalpy_input=NULL; ++ Input* enthalpypicard_input=NULL; ++ if(dt){ ++ enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input); ++ } ++ if (stabilization==2){ ++ diameter=MinEdgeLength(xyz_list); ++ enthalpypicard_input=inputs->GetInput(EnthalpyPicardEnum); _assert_(enthalpypicard_input); ++ } + + /* Start looping on the number of gaussian points: */ + gauss=new GaussPenta(2,3); +@@ -3746,7 +3754,6 @@ + + this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); + matice->GetViscosity3dStokes(&viscosity,&epsilon[0]); +- enthalpy_input->GetInputValue(&enthalpy, gauss); + GetPhi(&phi, &epsilon[0], viscosity); + + scalar_def=phi/rho_ice*Jdet*gauss->weight; +@@ -3756,6 +3763,7 @@ + + /* Build transient now */ + if(dt){ ++ enthalpy_input->GetInputValue(&enthalpy, gauss); + scalar_transient=enthalpy*Jdet*gauss->weight; + for(i=0;ivalues[i]+=scalar_transient*L[i]; + } +@@ -3767,6 +3775,7 @@ + vy_input->GetInputValue(&v, gauss); + vz_input->GetInputValue(&w, gauss); + pressure_input->GetInputValue(&pressure, gauss); ++ enthalpypicard_input->GetInputValue(&enthalpypicard, gauss); + kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure); + tau_parameter=GetStabilizationParameter(u,v,w,diameter,kappa); + +@@ -4331,7 +4340,7 @@ + for(i=0;iEnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]); + if(waterfraction[i]<0) _error_("Negative water fraction found in solution vector"); +- if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); ++ //if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); + } + + this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,values)); Index: /issm/oecreview/Archive/11381-11400/ISSM-11393-11394.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11393-11394.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11393-11394.diff (revision 11515) @@ -0,0 +1,17 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11393) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11394) +@@ -3584,9 +3584,9 @@ + vel=sqrt(pow(vx,2.)+pow(vy,2.)+pow(vz,2.))+1.e-14; + h=sqrt( pow(hx*vx/vel,2.) + pow(hy*vy/vel,2.) + pow(hz*vz/vel,2.)); + +- K[0][0]=h/(2*vel)*fabs(vx*vx); K[0][1]=h/(2*vel)*fabs(vx*vy); K[0][2]=h/(2*vel)*fabs(vx*vz); +- K[1][0]=h/(2*vel)*fabs(vy*vx); K[1][1]=h/(2*vel)*fabs(vy*vy); K[1][2]=h/(2*vel)*fabs(vy*vz); +- K[2][0]=h/(2*vel)*fabs(vz*vx); K[2][1]=h/(2*vel)*fabs(vz*vy); K[2][2]=h/(2*vel)*fabs(vz*vz); ++ K[0][0]=h/(2*vel)*vx*vx; K[0][1]=h/(2*vel)*vx*vy; K[0][2]=h/(2*vel)*vx*vz; ++ K[1][0]=h/(2*vel)*vy*vx; K[1][1]=h/(2*vel)*vy*vy; K[1][2]=h/(2*vel)*vy*vz; ++ K[2][0]=h/(2*vel)*vz*vx; K[2][1]=h/(2*vel)*vz*vy; K[2][2]=h/(2*vel)*vz*vz; + + D_scalar_stab=gauss->weight*Jdet; + if(dt) D_scalar_stab=D_scalar_stab*dt; Index: /issm/oecreview/Archive/11381-11400/ISSM-11394-11395.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11394-11395.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11394-11395.diff (revision 11515) @@ -0,0 +1,30 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11394) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11395) +@@ -3353,9 +3353,9 @@ + GetElementSizes(&hx,&hy,&hz); + vel=sqrt(pow(vx,2.)+pow(vy,2.)+pow(vz,2.))+1.e-14; + h=sqrt( pow(hx*vx/vel,2.) + pow(hy*vy/vel,2.) + pow(hz*vz/vel,2.)); +- K[0][0]=h/(2*vel)*fabs(vx*vx); K[0][1]=h/(2*vel)*fabs(vx*vy); K[0][2]=h/(2*vel)*fabs(vx*vz); +- K[1][0]=h/(2*vel)*fabs(vy*vx); K[1][1]=h/(2*vel)*fabs(vy*vy); K[1][2]=h/(2*vel)*fabs(vy*vz); +- K[2][0]=h/(2*vel)*fabs(vz*vx); K[2][1]=h/(2*vel)*fabs(vz*vy); K[2][2]=h/(2*vel)*fabs(vz*vz); ++ K[0][0]=h/(2*vel)*vx*vx; K[0][1]=h/(2*vel)*vx*vy; K[0][2]=h/(2*vel)*vx*vz; ++ K[1][0]=h/(2*vel)*vy*vx; K[1][1]=h/(2*vel)*vy*vy; K[1][2]=h/(2*vel)*vy*vz; ++ K[2][0]=h/(2*vel)*vz*vx; K[2][1]=h/(2*vel)*vz*vy; K[2][2]=h/(2*vel)*vz*vz; + D_scalar_stab=gauss->weight*Jdet; + if(dt) D_scalar_stab=D_scalar_stab*dt; + for(i=0;i<3;i++) for(j=0;j<3;j++) K[i][j] = D_scalar_stab*K[i][j]; +@@ -3584,9 +3584,9 @@ + vel=sqrt(pow(vx,2.)+pow(vy,2.)+pow(vz,2.))+1.e-14; + h=sqrt( pow(hx*vx/vel,2.) + pow(hy*vy/vel,2.) + pow(hz*vz/vel,2.)); + +- K[0][0]=h/(2*vel)*vx*vx; K[0][1]=h/(2*vel)*vx*vy; K[0][2]=h/(2*vel)*vx*vz; +- K[1][0]=h/(2*vel)*vy*vx; K[1][1]=h/(2*vel)*vy*vy; K[1][2]=h/(2*vel)*vy*vz; +- K[2][0]=h/(2*vel)*vz*vx; K[2][1]=h/(2*vel)*vz*vy; K[2][2]=h/(2*vel)*vz*vz; ++ K[0][0]=h/(2*vel)*fabs(vx*vx); K[0][1]=h/(2*vel)*fabs(vx*vy); K[0][2]=h/(2*vel)*fabs(vx*vz); ++ K[1][0]=h/(2*vel)*fabs(vy*vx); K[1][1]=h/(2*vel)*fabs(vy*vy); K[1][2]=h/(2*vel)*fabs(vy*vz); ++ K[2][0]=h/(2*vel)*fabs(vz*vx); K[2][1]=h/(2*vel)*fabs(vz*vy); K[2][2]=h/(2*vel)*fabs(vz*vz); + + D_scalar_stab=gauss->weight*Jdet; + if(dt) D_scalar_stab=D_scalar_stab*dt; Index: /issm/oecreview/Archive/11381-11400/ISSM-11395-11396.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11395-11396.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11395-11396.diff (revision 11515) @@ -0,0 +1,40 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive350.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive354.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive141.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive351.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive142.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive352.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive353.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive139.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive140.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive349.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11381-11400/ISSM-11396-11397.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11396-11397.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11396-11397.diff (revision 11515) @@ -0,0 +1,64 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 11396) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 11397) +@@ -14,7 +14,8 @@ + #Apply patches + cd install + patch -p1 < ../metis-4.0.patch +-patch Makefile.in ../configs/4.0/win7/Makefile.in.patch ++patch -R Lib/Makefile ../configs/4.0/win7/Makefile.patch ++patch -R Makefile.in ../configs/4.0/win7/Makefile.in.patch + + #Compile + make +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 11396) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 11397) +@@ -1,14 +1,25 @@ + 3,5c3,5 +-< CC = gcc +-< OBJ_EXT=o +-< LIB_EXT=a ++< CC = cl ++< OBJ_EXT=obj ++< LIB_EXT=lib + --- +-> CC = cl +-> OBJ_EXT=obj +-> LIB_EXT=lib ++> CC = gcc ++> OBJ_EXT=o ++> LIB_EXT=a + 8c8 +-< OPTFLAGS = -DLINUX -fPIC ++< OPTFLAGS = -DWIN32 -D__VC__ + --- +-> OPTFLAGS = -DWIN32 -D__VC__ +-22d21 +-< #RANLIB = ++> OPTFLAGS = -DLINUX -fPIC ++16,17c16,24 ++< # What tool to use to create library ++< LIB=lib.exe ++--- ++> # What archiving to use ++> AR = ar rv ++> ++> # What to use for indexing the archive ++> RANLIB = ranlib ++> #RANLIB = ar -ts ++> #RANLIB = ++> ++> +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch (revision 11397) +@@ -0,0 +1,5 @@ ++24c24,25 ++< $(LIB) -out:$@ $(OBJS) ++--- ++> $(AR) $@ $(OBJS) ++> $(RANLIB) $@ Index: /issm/oecreview/Archive/11381-11400/ISSM-11397-11398.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11397-11398.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11397-11398.diff (revision 11515) @@ -0,0 +1,69 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/install-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/install-win7.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/install-win7.sh (revision 11398) +@@ -0,0 +1,23 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install triangle ++mkdir install ++ ++#Untar ++cd install ++cp ../triangle.zip ./ ++unzip triangle.zip ++ ++#copy new makefile ++cp ../configs/win7/configure.make ./ ++cp ../configs/win7/makefile ./ ++ ++#Patch triangle.c ++patch triangle.c ../triangle.c.patch ++ ++#Compile triangle ++make ++ ++#Patch triangle.h ++patch triangle.h ../triangle.h.patch + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/install-win7.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/configs/win7/configure.make +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/configs/win7/configure.make (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/configs/win7/configure.make (revision 11398) +@@ -0,0 +1,4 @@ ++CC=cl ++CSWITCHES = $(CFLAGS) -I$(MATLAB_DIR)/extern/include -I$(MATLAB_DIR)/include -DWIN32 ++OBJ_EXT=obj ++LIB_EXT=lib +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/configs/win7/makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/configs/win7/makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/configs/win7/makefile (revision 11398) +@@ -0,0 +1,21 @@ ++#Adaptation of Triangle makefile to compile only the triangle.c file, ++#into a standalone library that can then be used to compile mex modules ++ ++include ./configure.make ++ ++AR = ar ++ ++TRILIBDEFS = -DTRILIBRARY ++ ++all: triangle.$(LIB_EXT) ++ ++OBJECTS=triangle.$(OBJ_EXT) ++ ++triangle.$(LIB_EXT): $(OBJECTS) ++ lib -out:triangle.$(LIB_EXT) $(OBJECTS) ++ ++triangle.$(OBJ_EXT): triangle.c triangle.h ++ $(CC) $(CSWITCHES) $(TRILIBDEFS) -c triangle.c ++ ++clean: ++ rm -rf *.$(LIB_EXT) *.$(OBJ_EXT) *.LIB *.LST *.$(OBJ_EXT)bj *.BAK Index: /issm/oecreview/Archive/11381-11400/ISSM-11398-11399.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11398-11399.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11398-11399.diff (revision 11515) @@ -0,0 +1,12 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Patch.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Patch.cpp (revision 11398) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Patch.cpp (revision 11399) +@@ -11,6 +11,7 @@ + + #include + #include ++#include + #include "./objects.h" + #include "../Container/Container.h" + #include "../io/io.h" Index: /issm/oecreview/Archive/11381-11400/ISSM-11399-11400.diff =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-11399-11400.diff (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-11399-11400.diff (revision 11515) @@ -0,0 +1,884 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11399) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11400) +@@ -13,434 +13,450 @@ + + int StringToEnumx(const char* name){ + +- if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum; +- else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum; +- else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum; +- else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum; +- else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum; +- else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum; +- else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; +- else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum; +- else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum; +- else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum; +- else if (strcmp(name,"Bed")==0) return BedEnum; +- else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum; +- else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; +- else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum; +- else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum; +- else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum; +- else if (strcmp(name,"DiagnosticIsnewton")==0) return DiagnosticIsnewtonEnum; +- else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum; +- else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum; +- else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum; +- else if (strcmp(name,"DiagnosticReferential")==0) return DiagnosticReferentialEnum; +- else if (strcmp(name,"DiagnosticReltol")==0) return DiagnosticReltolEnum; +- else if (strcmp(name,"DiagnosticRequestedOutputs")==0) return DiagnosticRequestedOutputsEnum; +- else if (strcmp(name,"DiagnosticRestol")==0) return DiagnosticRestolEnum; +- else if (strcmp(name,"DiagnosticRiftPenaltyLock")==0) return DiagnosticRiftPenaltyLockEnum; +- else if (strcmp(name,"DiagnosticRiftPenaltyThreshold")==0) return DiagnosticRiftPenaltyThresholdEnum; +- else if (strcmp(name,"DiagnosticShelfDampening")==0) return DiagnosticShelfDampeningEnum; +- else if (strcmp(name,"DiagnosticSpcvx")==0) return DiagnosticSpcvxEnum; +- else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum; +- else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum; +- else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum; +- else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum; +- else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum; +- else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum; +- else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum; +- else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum; +- else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum; +- else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum; +- else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum; +- else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum; +- else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum; +- else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum; +- else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; +- else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; +- else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; +- else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum; +- else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum; +- else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum; +- else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum; +- else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum; +- else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum; +- else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum; +- else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; +- else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum; +- else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum; +- else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; +- else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; +- else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum; +- else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; +- else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; +- else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; +- else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; +- else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; +- else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; +- else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum; +- else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum; +- else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum; +- else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum; +- else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; +- else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; +- else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; +- else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; +- else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum; +- else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum; +- else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum; +- else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum; +- else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum; +- else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum; +- else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum; +- else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; +- else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; +- else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; +- else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; +- else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; +- else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; +- else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; +- else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; +- else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; +- else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; +- else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; +- else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; +- else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; +- else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; +- else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; +- else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum; +- else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum; +- else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum; +- else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; +- else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; +- else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum; +- else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; +- else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum; +- else if (strcmp(name,"MeshNumberofedges")==0) return MeshNumberofedgesEnum; +- else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum; +- else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum; +- else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum; +- else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum; +- else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum; +- else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum; +- else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum; +- else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; +- else if (strcmp(name,"MeshX")==0) return MeshXEnum; +- else if (strcmp(name,"MeshY")==0) return MeshYEnum; +- else if (strcmp(name,"MeshZ")==0) return MeshZEnum; +- else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum; +- else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum; +- else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum; +- else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum; +- else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum; +- else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; +- else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum; +- else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum; +- else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum; +- else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum; +- else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum; +- else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum; +- else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum; +- else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum; +- else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum; +- else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum; +- else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; +- else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum; +- else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; +- else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; +- else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; +- else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; +- else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; +- else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; +- else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; +- else if (strcmp(name,"Surface")==0) return SurfaceEnum; +- else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum; +- else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum; +- else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; +- else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; +- else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; +- else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum; +- else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; +- else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; +- else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; +- else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; +- else if (strcmp(name,"Thickness")==0) return ThicknessEnum; +- else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; +- else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; +- else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; +- else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; +- else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum; +- else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum; +- else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum; +- else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; +- else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; +- else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; +- else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum; +- else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum; +- else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum; +- else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum; +- else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; +- else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum; +- else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; +- else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; +- else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; +- else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum; +- else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; +- else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum; +- else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum; +- else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum; +- else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum; +- else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum; +- else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; +- else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; +- else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; +- else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; +- else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum; +- else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum; +- else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; +- else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; +- else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; +- else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum; +- else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum; +- else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; +- else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum; +- else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; +- else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum; +- else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum; +- else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; +- else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; +- else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; +- else if (strcmp(name,"Approximation")==0) return ApproximationEnum; +- else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum; +- else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum; +- else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum; +- else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum; +- else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; +- else if (strcmp(name,"PattynApproximation")==0) return PattynApproximationEnum; +- else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum; +- else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum; +- else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; +- else if (strcmp(name,"Loads")==0) return LoadsEnum; +- else if (strcmp(name,"Materials")==0) return MaterialsEnum; +- else if (strcmp(name,"Nodes")==0) return NodesEnum; +- else if (strcmp(name,"Parameters")==0) return ParametersEnum; +- else if (strcmp(name,"Vertices")==0) return VerticesEnum; +- else if (strcmp(name,"Results")==0) return ResultsEnum; +- else if (strcmp(name,"BoolInput")==0) return BoolInputEnum; +- else if (strcmp(name,"BoolParam")==0) return BoolParamEnum; +- else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; +- else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; +- else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum; +- else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; +- else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum; +- else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum; +- else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; +- else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; +- else if (strcmp(name,"Element")==0) return ElementEnum; +- else if (strcmp(name,"ElementResult")==0) return ElementResultEnum; +- else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; +- else if (strcmp(name,"FileParam")==0) return FileParamEnum; +- else if (strcmp(name,"Hook")==0) return HookEnum; +- else if (strcmp(name,"Icefront")==0) return IcefrontEnum; +- else if (strcmp(name,"Input")==0) return InputEnum; +- else if (strcmp(name,"IntInput")==0) return IntInputEnum; +- else if (strcmp(name,"IntParam")==0) return IntParamEnum; +- else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; +- else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; +- else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; +- else if (strcmp(name,"Matice")==0) return MaticeEnum; +- else if (strcmp(name,"Matpar")==0) return MatparEnum; +- else if (strcmp(name,"Node")==0) return NodeEnum; +- else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; +- else if (strcmp(name,"Param")==0) return ParamEnum; +- else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; +- else if (strcmp(name,"Pengrid")==0) return PengridEnum; +- else if (strcmp(name,"Penpair")==0) return PenpairEnum; +- else if (strcmp(name,"Penta")==0) return PentaEnum; +- else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum; +- else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum; +- else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum; +- else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; +- else if (strcmp(name,"Segment")==0) return SegmentEnum; +- else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; +- else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; +- else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; +- else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; +- else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum; +- else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; +- else if (strcmp(name,"StringParam")==0) return StringParamEnum; +- else if (strcmp(name,"Tria")==0) return TriaEnum; +- else if (strcmp(name,"TriaP1Input")==0) return TriaP1InputEnum; +- else if (strcmp(name,"Vertex")==0) return VertexEnum; +- else if (strcmp(name,"Air")==0) return AirEnum; +- else if (strcmp(name,"Ice")==0) return IceEnum; +- else if (strcmp(name,"Melange")==0) return MelangeEnum; +- else if (strcmp(name,"Water")==0) return WaterEnum; +- else if (strcmp(name,"Closed")==0) return ClosedEnum; +- else if (strcmp(name,"Free")==0) return FreeEnum; +- else if (strcmp(name,"Open")==0) return OpenEnum; +- else if (strcmp(name,"Adjointp")==0) return AdjointpEnum; +- else if (strcmp(name,"Adjointx")==0) return AdjointxEnum; +- else if (strcmp(name,"Adjointy")==0) return AdjointyEnum; +- else if (strcmp(name,"Adjointz")==0) return AdjointzEnum; +- else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum; +- else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum; +- else if (strcmp(name,"Boundary")==0) return BoundaryEnum; +- else if (strcmp(name,"Constant")==0) return ConstantEnum; +- else if (strcmp(name,"Converged")==0) return ConvergedEnum; +- else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum; +- else if (strcmp(name,"Fill")==0) return FillEnum; +- else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; +- else if (strcmp(name,"Friction")==0) return FrictionEnum; +- else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum; +- else if (strcmp(name,"Internal")==0) return InternalEnum; +- else if (strcmp(name,"IuToExt")==0) return IuToExtEnum; +- else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; +- else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; +- else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; +- else if (strcmp(name,"Misfit")==0) return MisfitEnum; +- else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; +- else if (strcmp(name,"Pressure")==0) return PressureEnum; +- else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; +- else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; +- else if (strcmp(name,"QmuVx")==0) return QmuVxEnum; +- else if (strcmp(name,"QmuVy")==0) return QmuVyEnum; +- else if (strcmp(name,"QmuVz")==0) return QmuVzEnum; +- else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum; +- else if (strcmp(name,"QmuBed")==0) return QmuBedEnum; +- else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum; +- else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum; +- else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum; +- else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum; +- else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum; +- else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum; +- else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum; +- else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; +- else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; +- else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; +- else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; +- else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; +- else if (strcmp(name,"Temperature")==0) return TemperatureEnum; +- else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum; +- else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; +- else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; +- else if (strcmp(name,"Type")==0) return TypeEnum; +- else if (strcmp(name,"Vel")==0) return VelEnum; +- else if (strcmp(name,"Velocity")==0) return VelocityEnum; +- else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; +- else if (strcmp(name,"Vx")==0) return VxEnum; +- else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; +- else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; +- else if (strcmp(name,"Vy")==0) return VyEnum; +- else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; +- else if (strcmp(name,"Vz")==0) return VzEnum; +- else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum; +- else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum; +- else if (strcmp(name,"VzPicard")==0) return VzPicardEnum; +- else if (strcmp(name,"VzStokes")==0) return VzStokesEnum; +- else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; +- else if (strcmp(name,"VyMesh")==0) return VyMeshEnum; +- else if (strcmp(name,"VzMesh")==0) return VzMeshEnum; +- else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; +- else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; +- else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum; +- else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum; +- else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum; +- else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum; +- else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum; +- else if (strcmp(name,"TransientInput")==0) return TransientInputEnum; +- else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum; +- else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum; +- else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; +- else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; +- else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; +- else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; +- else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; +- else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; +- else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; +- else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; +- else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; +- else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum; +- else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; +- else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; +- else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; +- else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; +- else if (strcmp(name,"P0")==0) return P0Enum; +- else if (strcmp(name,"P1")==0) return P1Enum; +- else if (strcmp(name,"P1DG")==0) return P1DGEnum; +- else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum; +- else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; +- else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; +- else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; +- else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; +- else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; +- else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; +- else if (strcmp(name,"J")==0) return JEnum; +- else if (strcmp(name,"Patch")==0) return PatchEnum; +- else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; +- else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; +- else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; +- else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum; +- else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; +- else if (strcmp(name,"Time")==0) return TimeEnum; +- else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; +- else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; +- else if (strcmp(name,"MinVel")==0) return MinVelEnum; +- else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; +- else if (strcmp(name,"MinVx")==0) return MinVxEnum; +- else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; +- else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; +- else if (strcmp(name,"MinVy")==0) return MinVyEnum; +- else if (strcmp(name,"MaxVy")==0) return MaxVyEnum; +- else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; +- else if (strcmp(name,"MinVz")==0) return MinVzEnum; +- else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; +- else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; +- else if (strcmp(name,"Relative")==0) return RelativeEnum; +- else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; +- else if (strcmp(name,"Incremental")==0) return IncrementalEnum; +- else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; +- else if (strcmp(name,"None")==0) return NoneEnum; +- else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; +- else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum; +- else if (strcmp(name,"Adjoint")==0) return AdjointEnum; +- else if (strcmp(name,"Colinear")==0) return ColinearEnum; +- else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum; +- else if (strcmp(name,"Fset")==0) return FsetEnum; +- else if (strcmp(name,"Gradient1")==0) return Gradient1Enum; +- else if (strcmp(name,"Gradient2")==0) return Gradient2Enum; +- else if (strcmp(name,"Gradient3")==0) return Gradient3Enum; +- else if (strcmp(name,"Gradient")==0) return GradientEnum; +- else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; +- else if (strcmp(name,"Gset")==0) return GsetEnum; +- else if (strcmp(name,"Index")==0) return IndexEnum; +- else if (strcmp(name,"Indexed")==0) return IndexedEnum; +- else if (strcmp(name,"Intersect")==0) return IntersectEnum; +- else if (strcmp(name,"Nodal")==0) return NodalEnum; +- else if (strcmp(name,"OldGradient")==0) return OldGradientEnum; +- else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum; +- else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum; +- else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum; +- else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum; +- else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum; +- else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; +- else if (strcmp(name,"Regular")==0) return RegularEnum; +- else if (strcmp(name,"Scaled")==0) return ScaledEnum; +- else if (strcmp(name,"Separate")==0) return SeparateEnum; +- else if (strcmp(name,"Sset")==0) return SsetEnum; +- else if (strcmp(name,"Verbose")==0) return VerboseEnum; +- else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum; +- else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; +- else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; +- else if (strcmp(name,"XY")==0) return XYEnum; +- else if (strcmp(name,"XYZP")==0) return XYZPEnum; +- else if (strcmp(name,"Option")==0) return OptionEnum; +- else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; +- else if (strcmp(name,"OptionChar")==0) return OptionCharEnum; +- else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; +- else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum; +- else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum; +- else if (strcmp(name,"Paterson")==0) return PatersonEnum; +- else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; +- else _error_("Enum %s not found",name); ++ int stage=0; + ++ if(stage==0){ ++ ++ if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum; ++ else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum; ++ else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum; ++ else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum; ++ else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum; ++ else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum; ++ else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; ++ else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum; ++ else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum; ++ else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum; ++ else if (strcmp(name,"Bed")==0) return BedEnum; ++ else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum; ++ else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; ++ else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum; ++ else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum; ++ else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum; ++ else if (strcmp(name,"DiagnosticIsnewton")==0) return DiagnosticIsnewtonEnum; ++ else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum; ++ else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum; ++ else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum; ++ else if (strcmp(name,"DiagnosticReferential")==0) return DiagnosticReferentialEnum; ++ else if (strcmp(name,"DiagnosticReltol")==0) return DiagnosticReltolEnum; ++ else if (strcmp(name,"DiagnosticRequestedOutputs")==0) return DiagnosticRequestedOutputsEnum; ++ else if (strcmp(name,"DiagnosticRestol")==0) return DiagnosticRestolEnum; ++ else if (strcmp(name,"DiagnosticRiftPenaltyLock")==0) return DiagnosticRiftPenaltyLockEnum; ++ else if (strcmp(name,"DiagnosticRiftPenaltyThreshold")==0) return DiagnosticRiftPenaltyThresholdEnum; ++ else if (strcmp(name,"DiagnosticShelfDampening")==0) return DiagnosticShelfDampeningEnum; ++ else if (strcmp(name,"DiagnosticSpcvx")==0) return DiagnosticSpcvxEnum; ++ else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum; ++ else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum; ++ else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum; ++ else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum; ++ else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum; ++ else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum; ++ else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum; ++ else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum; ++ else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum; ++ else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum; ++ else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum; ++ else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum; ++ else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum; ++ else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum; ++ else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; ++ else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; ++ else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; ++ else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum; ++ else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum; ++ else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum; ++ else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum; ++ else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum; ++ else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum; ++ else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum; ++ else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; ++ else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum; ++ else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum; ++ else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; ++ else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; ++ else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum; ++ else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; ++ else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; ++ else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; ++ else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; ++ else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; ++ else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; ++ else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum; ++ else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum; ++ else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum; ++ else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum; ++ else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; ++ else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; ++ else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; ++ else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; ++ else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum; ++ else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum; ++ else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum; ++ else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum; ++ else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum; ++ else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum; ++ else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum; ++ else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; ++ else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; ++ else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; ++ else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; ++ else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; ++ else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; ++ else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; ++ else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; ++ else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; ++ else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; ++ else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; ++ else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; ++ else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; ++ else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; ++ else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; ++ else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum; ++ else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum; ++ else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum; ++ else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; ++ else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; ++ else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum; ++ else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; ++ else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum; ++ else if (strcmp(name,"MeshNumberofedges")==0) return MeshNumberofedgesEnum; ++ else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum; ++ else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum; ++ else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum; ++ else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum; ++ else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum; ++ else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum; ++ else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum; ++ else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; ++ else if (strcmp(name,"MeshX")==0) return MeshXEnum; ++ else if (strcmp(name,"MeshY")==0) return MeshYEnum; ++ else if (strcmp(name,"MeshZ")==0) return MeshZEnum; ++ else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum; ++ else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum; ++ else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum; ++ else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum; ++ else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum; ++ else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; ++ else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum; ++ else stage=1; ++ } ++ ++ if(stage==1){ ++ ++ if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum; ++ else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum; ++ else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum; ++ else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum; ++ else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum; ++ else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum; ++ else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum; ++ else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum; ++ else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum; ++ else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; ++ else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum; ++ else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; ++ else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; ++ else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; ++ else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; ++ else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; ++ else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; ++ else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; ++ else if (strcmp(name,"Surface")==0) return SurfaceEnum; ++ else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum; ++ else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum; ++ else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; ++ else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; ++ else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; ++ else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum; ++ else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; ++ else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; ++ else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; ++ else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; ++ else if (strcmp(name,"Thickness")==0) return ThicknessEnum; ++ else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; ++ else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; ++ else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; ++ else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; ++ else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum; ++ else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum; ++ else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum; ++ else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; ++ else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; ++ else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; ++ else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum; ++ else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum; ++ else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum; ++ else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum; ++ else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; ++ else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum; ++ else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; ++ else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; ++ else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; ++ else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum; ++ else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; ++ else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum; ++ else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum; ++ else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum; ++ else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum; ++ else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum; ++ else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; ++ else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; ++ else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; ++ else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; ++ else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum; ++ else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum; ++ else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; ++ else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; ++ else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; ++ else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum; ++ else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum; ++ else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; ++ else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum; ++ else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; ++ else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum; ++ else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum; ++ else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; ++ else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; ++ else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; ++ else if (strcmp(name,"Approximation")==0) return ApproximationEnum; ++ else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum; ++ else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum; ++ else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum; ++ else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum; ++ else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; ++ else if (strcmp(name,"PattynApproximation")==0) return PattynApproximationEnum; ++ else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum; ++ else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum; ++ else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; ++ else if (strcmp(name,"Loads")==0) return LoadsEnum; ++ else if (strcmp(name,"Materials")==0) return MaterialsEnum; ++ else if (strcmp(name,"Nodes")==0) return NodesEnum; ++ else if (strcmp(name,"Parameters")==0) return ParametersEnum; ++ else if (strcmp(name,"Vertices")==0) return VerticesEnum; ++ else if (strcmp(name,"Results")==0) return ResultsEnum; ++ else if (strcmp(name,"BoolInput")==0) return BoolInputEnum; ++ else if (strcmp(name,"BoolParam")==0) return BoolParamEnum; ++ else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; ++ else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; ++ else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum; ++ else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; ++ else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum; ++ else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum; ++ else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; ++ else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; ++ else if (strcmp(name,"Element")==0) return ElementEnum; ++ else if (strcmp(name,"ElementResult")==0) return ElementResultEnum; ++ else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; ++ else if (strcmp(name,"FileParam")==0) return FileParamEnum; ++ else if (strcmp(name,"Hook")==0) return HookEnum; ++ else if (strcmp(name,"Icefront")==0) return IcefrontEnum; ++ else if (strcmp(name,"Input")==0) return InputEnum; ++ else if (strcmp(name,"IntInput")==0) return IntInputEnum; ++ else if (strcmp(name,"IntParam")==0) return IntParamEnum; ++ else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; ++ else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; ++ else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; ++ else if (strcmp(name,"Matice")==0) return MaticeEnum; ++ else if (strcmp(name,"Matpar")==0) return MatparEnum; ++ else if (strcmp(name,"Node")==0) return NodeEnum; ++ else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; ++ else if (strcmp(name,"Param")==0) return ParamEnum; ++ else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; ++ else if (strcmp(name,"Pengrid")==0) return PengridEnum; ++ else stage=2; ++ } ++ if(stage==2){ ++ if (strcmp(name,"Penpair")==0) return PenpairEnum; ++ else if (strcmp(name,"Penta")==0) return PentaEnum; ++ else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum; ++ else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum; ++ else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum; ++ else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; ++ else if (strcmp(name,"Segment")==0) return SegmentEnum; ++ else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; ++ else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; ++ else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; ++ else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; ++ else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum; ++ else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; ++ else if (strcmp(name,"StringParam")==0) return StringParamEnum; ++ else if (strcmp(name,"Tria")==0) return TriaEnum; ++ else if (strcmp(name,"TriaP1Input")==0) return TriaP1InputEnum; ++ else if (strcmp(name,"Vertex")==0) return VertexEnum; ++ else if (strcmp(name,"Air")==0) return AirEnum; ++ else if (strcmp(name,"Ice")==0) return IceEnum; ++ else if (strcmp(name,"Melange")==0) return MelangeEnum; ++ else if (strcmp(name,"Water")==0) return WaterEnum; ++ else if (strcmp(name,"Closed")==0) return ClosedEnum; ++ else if (strcmp(name,"Free")==0) return FreeEnum; ++ else if (strcmp(name,"Open")==0) return OpenEnum; ++ else if (strcmp(name,"Adjointp")==0) return AdjointpEnum; ++ else if (strcmp(name,"Adjointx")==0) return AdjointxEnum; ++ else if (strcmp(name,"Adjointy")==0) return AdjointyEnum; ++ else if (strcmp(name,"Adjointz")==0) return AdjointzEnum; ++ else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum; ++ else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum; ++ else if (strcmp(name,"Boundary")==0) return BoundaryEnum; ++ else if (strcmp(name,"Constant")==0) return ConstantEnum; ++ else if (strcmp(name,"Converged")==0) return ConvergedEnum; ++ else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum; ++ else if (strcmp(name,"Fill")==0) return FillEnum; ++ else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; ++ else if (strcmp(name,"Friction")==0) return FrictionEnum; ++ else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum; ++ else if (strcmp(name,"Internal")==0) return InternalEnum; ++ else if (strcmp(name,"IuToExt")==0) return IuToExtEnum; ++ else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; ++ else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; ++ else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; ++ else if (strcmp(name,"Misfit")==0) return MisfitEnum; ++ else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; ++ else if (strcmp(name,"Pressure")==0) return PressureEnum; ++ else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; ++ else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; ++ else if (strcmp(name,"QmuVx")==0) return QmuVxEnum; ++ else if (strcmp(name,"QmuVy")==0) return QmuVyEnum; ++ else if (strcmp(name,"QmuVz")==0) return QmuVzEnum; ++ else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum; ++ else if (strcmp(name,"QmuBed")==0) return QmuBedEnum; ++ else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum; ++ else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum; ++ else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum; ++ else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum; ++ else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum; ++ else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum; ++ else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum; ++ else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; ++ else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; ++ else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; ++ else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; ++ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; ++ else if (strcmp(name,"Temperature")==0) return TemperatureEnum; ++ else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum; ++ else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; ++ else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; ++ else if (strcmp(name,"Type")==0) return TypeEnum; ++ else if (strcmp(name,"Vel")==0) return VelEnum; ++ else if (strcmp(name,"Velocity")==0) return VelocityEnum; ++ else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; ++ else if (strcmp(name,"Vx")==0) return VxEnum; ++ else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; ++ else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; ++ else if (strcmp(name,"Vy")==0) return VyEnum; ++ else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; ++ else if (strcmp(name,"Vz")==0) return VzEnum; ++ else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum; ++ else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum; ++ else if (strcmp(name,"VzPicard")==0) return VzPicardEnum; ++ else if (strcmp(name,"VzStokes")==0) return VzStokesEnum; ++ else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; ++ else if (strcmp(name,"VyMesh")==0) return VyMeshEnum; ++ else if (strcmp(name,"VzMesh")==0) return VzMeshEnum; ++ else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; ++ else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; ++ else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum; ++ else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum; ++ else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum; ++ else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum; ++ else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum; ++ else if (strcmp(name,"TransientInput")==0) return TransientInputEnum; ++ else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum; ++ else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum; ++ else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; ++ else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; ++ else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; ++ else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; ++ else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; ++ else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; ++ else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; ++ else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; ++ else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; ++ else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum; ++ else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; ++ else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; ++ else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; ++ else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; ++ else if (strcmp(name,"P0")==0) return P0Enum; ++ else if (strcmp(name,"P1")==0) return P1Enum; ++ else if (strcmp(name,"P1DG")==0) return P1DGEnum; ++ else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum; ++ else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; ++ else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; ++ else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; ++ else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; ++ else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; ++ else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; ++ else stage==3; ++ } ++ if(stage==3){ ++ if (strcmp(name,"J")==0) return JEnum; ++ else if (strcmp(name,"Patch")==0) return PatchEnum; ++ else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; ++ else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; ++ else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; ++ else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum; ++ else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; ++ else if (strcmp(name,"Time")==0) return TimeEnum; ++ else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; ++ else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; ++ else if (strcmp(name,"MinVel")==0) return MinVelEnum; ++ else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; ++ else if (strcmp(name,"MinVx")==0) return MinVxEnum; ++ else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; ++ else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; ++ else if (strcmp(name,"MinVy")==0) return MinVyEnum; ++ else if (strcmp(name,"MaxVy")==0) return MaxVyEnum; ++ else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; ++ else if (strcmp(name,"MinVz")==0) return MinVzEnum; ++ else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; ++ else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; ++ else if (strcmp(name,"Relative")==0) return RelativeEnum; ++ else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; ++ else if (strcmp(name,"Incremental")==0) return IncrementalEnum; ++ else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; ++ else if (strcmp(name,"None")==0) return NoneEnum; ++ else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; ++ else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum; ++ else if (strcmp(name,"Adjoint")==0) return AdjointEnum; ++ else if (strcmp(name,"Colinear")==0) return ColinearEnum; ++ else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum; ++ else if (strcmp(name,"Fset")==0) return FsetEnum; ++ else if (strcmp(name,"Gradient1")==0) return Gradient1Enum; ++ else if (strcmp(name,"Gradient2")==0) return Gradient2Enum; ++ else if (strcmp(name,"Gradient3")==0) return Gradient3Enum; ++ else if (strcmp(name,"Gradient")==0) return GradientEnum; ++ else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; ++ else if (strcmp(name,"Gset")==0) return GsetEnum; ++ else if (strcmp(name,"Index")==0) return IndexEnum; ++ else if (strcmp(name,"Indexed")==0) return IndexedEnum; ++ else if (strcmp(name,"Intersect")==0) return IntersectEnum; ++ else if (strcmp(name,"Nodal")==0) return NodalEnum; ++ else if (strcmp(name,"OldGradient")==0) return OldGradientEnum; ++ else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum; ++ else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum; ++ else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum; ++ else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum; ++ else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum; ++ else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; ++ else if (strcmp(name,"Regular")==0) return RegularEnum; ++ else if (strcmp(name,"Scaled")==0) return ScaledEnum; ++ else if (strcmp(name,"Separate")==0) return SeparateEnum; ++ else if (strcmp(name,"Sset")==0) return SsetEnum; ++ else if (strcmp(name,"Verbose")==0) return VerboseEnum; ++ else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum; ++ else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; ++ else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; ++ else if (strcmp(name,"XY")==0) return XYEnum; ++ else if (strcmp(name,"XYZP")==0) return XYZPEnum; ++ else if (strcmp(name,"Option")==0) return OptionEnum; ++ else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; ++ else if (strcmp(name,"OptionChar")==0) return OptionCharEnum; ++ else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; ++ else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum; ++ else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum; ++ else if (strcmp(name,"Paterson")==0) return PatersonEnum; ++ else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; ++ else _error_("Enum %s not found",name); ++ } ++ + } Index: /issm/oecreview/Archive/11381-11400/ISSM-DocReview-11381-11400.tex =================================================================== --- /issm/oecreview/Archive/11381-11400/ISSM-DocReview-11381-11400.tex (revision 11515) +++ /issm/oecreview/Archive/11381-11400/ISSM-DocReview-11381-11400.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11381-11400/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11381-11400/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11381-11400/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11381-11400 Index: /issm/oecreview/Archive/11381-11400/Makefile =================================================================== --- /issm/oecreview/Archive/11381-11400/Makefile (revision 11515) +++ /issm/oecreview/Archive/11381-11400/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11381-11400 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11381-11400/log.tex =================================================================== --- /issm/oecreview/Archive/11381-11400/log.tex (revision 11515) +++ /issm/oecreview/Archive/11381-11400/log.tex (revision 11515) @@ -0,0 +1,36 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11381-11382.diff: \\ Function name: \\M /issm/trunk-jpl/configs/config-greenplanet.sh \\ Export determination: 6. \\Rationale: Better MPI for greenplanet +M /issm/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh Better MPI for greenplanet \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11382-11383.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/petsc/install-3.2-greenplanet.sh \\ Export determination: 6. \\Rationale: Better MPI for greenplanet +M /issm/trunk-jpl/src/c/objects/KML/KML\_File.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_File.h M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.h KML: Removed object dataset in KML\_File in favor of that in KML\_Object. \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11383-11384.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/KML/KML\_File.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_File.h M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.cpp M /issm/trunk-jpl/src/c/objects/KML/KML\_Object.h \\ Export determination: 6. \\Rationale: KML: Removed object dataset in KML\_File in favor of that in KML\_Object. \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11384-11385.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7 A /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch A /issm/trunk-jpl/externalpackages/metis/install-4.0-win7.sh \\ Export determination: 6. \\Rationale: Windows 7 compile of metis package \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11385-11386.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7 A /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch A /issm/trunk-jpl/externalpackages/metis/install-4.0-win7.sh \\ Export determination: 6. \\Rationale: Windows 7 compile of metis package +A /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win7.sh A /issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh Windows 7 compile of PETSC package \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11386-11387.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win7.sh A /issm/trunk-jpl/externalpackages/petsc/install-3.1-win7.sh \\ Export determination: 6. \\Rationale: Windows 7 compile of PETSC package +D /issm/trunk-jpl/externalpackages/win7/intel-windows7.sh A /issm/trunk-jpl/externalpackages/win7/vs10.0.sh Visual studio with sdk 7.1 environment variables \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11387-11388.diff: \\ Function name: \\D /issm/trunk-jpl/externalpackages/win7/intel-windows7.sh A /issm/trunk-jpl/externalpackages/win7/vs10.0.sh \\ Export determination: 6. \\Rationale: Visual studio with sdk 7.1 environment variables +M /issm/trunk-jpl/src/m/classes/solver.m No more Enums in solver, convert enum to string so that old models still work \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11388-11389.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/solver.m \\ Export determination: 6. \\Rationale: No more Enums in solver, convert enum to string so that old models still work +M /issm/trunk-jpl/src/m/classes/solver.m added check for old models \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11389-11390.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/solver.m \\ Export determination: 6. \\Rationale: added check for old models +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp minor \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11390-11391.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp minor cleaning \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11391-11392.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: minor cleaning +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp minor \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11392-11393.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp minor enthalpy \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11393-11394.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: minor enthalpy +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp better artificial diffusivity \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11394-11395.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: better artificial diffusivity +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp minor \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11395-11396.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl/test/Archives/Archive139.mat M /issm/trunk-jpl/test/Archives/Archive140.mat M /issm/trunk-jpl/test/Archives/Archive141.mat M /issm/trunk-jpl/test/Archives/Archive142.mat M /issm/trunk-jpl/test/Archives/Archive349.mat M /issm/trunk-jpl/test/Archives/Archive350.mat M /issm/trunk-jpl/test/Archives/Archive351.mat M /issm/trunk-jpl/test/Archives/Archive352.mat M /issm/trunk-jpl/test/Archives/Archive353.mat M /issm/trunk-jpl/test/Archives/Archive354.mat updated archives for new artificial diffusivity in enthalpy \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11396-11397.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive139.mat M /issm/trunk-jpl/test/Archives/Archive140.mat M /issm/trunk-jpl/test/Archives/Archive141.mat M /issm/trunk-jpl/test/Archives/Archive142.mat M /issm/trunk-jpl/test/Archives/Archive349.mat M /issm/trunk-jpl/test/Archives/Archive350.mat M /issm/trunk-jpl/test/Archives/Archive351.mat M /issm/trunk-jpl/test/Archives/Archive352.mat M /issm/trunk-jpl/test/Archives/Archive353.mat M /issm/trunk-jpl/test/Archives/Archive354.mat \\ Export determination: 6. \\Rationale: updated archives for new artificial diffusivity in enthalpy +M /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch A /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch M /issm/trunk-jpl/externalpackages/metis/install-4.0-win7.sh Adapted patches to metis install for windows 7 installation \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11397-11398.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch A /issm/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch M /issm/trunk-jpl/externalpackages/metis/install-4.0-win7.sh \\ Export determination: 6. \\Rationale: Adapted patches to metis install for windows 7 installation +A /issm/trunk-jpl/externalpackages/triangle/configs/win7 A /issm/trunk-jpl/externalpackages/triangle/configs/win7/configure.make A /issm/trunk-jpl/externalpackages/triangle/configs/win7/makefile A /issm/trunk-jpl/externalpackages/triangle/install-win7.sh Adapted Triangle compilation to win7 platform \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11398-11399.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/triangle/configs/win7 A /issm/trunk-jpl/externalpackages/triangle/configs/win7/configure.make A /issm/trunk-jpl/externalpackages/triangle/configs/win7/makefile A /issm/trunk-jpl/externalpackages/triangle/install-win7.sh \\ Export determination: 6. \\Rationale: Adapted Triangle compilation to win7 platform +M /issm/trunk-jpl/src/c/objects/Patch.cpp Missing math header file for Patch object \\\\ +\noindent \textbf{Change \#19} with diff file ISSM-11399-11400.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Patch.cpp \\ Export determination: 6. \\Rationale: Missing math header file for Patch object +M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp Had to split the embedded statements so that compilers such a Visual Studio can compile. \\\\ Index: /issm/oecreview/Archive/11381-11400/r1.tex =================================================================== --- /issm/oecreview/Archive/11381-11400/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11381-11400/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11381 Index: /issm/oecreview/Archive/11381-11400/r2.tex =================================================================== --- /issm/oecreview/Archive/11381-11400/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11381-11400/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11400 Index: /issm/oecreview/Archive/11401-11425/Date.tex =================================================================== --- /issm/oecreview/Archive/11401-11425/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11401-11425/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11401-11425/ISSM-11401-11402.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11401-11402.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11401-11402.diff (revision 11515) @@ -0,0 +1,12 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/Synchronize.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 11401) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 11402) +@@ -164,6 +164,7 @@ + level=mxGetScalar(output); + + verbositylevel = (int)level; ++ return verbositylevel; + + #else + Index: /issm/oecreview/Archive/11401-11425/ISSM-11402-11403.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11402-11403.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11402-11403.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11402) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11403) +@@ -386,7 +386,7 @@ + else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; + else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; + else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; +- else stage==3; ++ else stage=3; + } + if(stage==3){ + if (strcmp(name,"J")==0) return JEnum; Index: /issm/oecreview/Archive/11401-11425/ISSM-11403-11404.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11403-11404.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11403-11404.diff (revision 11515) @@ -0,0 +1,49 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 11403) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 11404) +@@ -94,13 +94,31 @@ + + int StringToEnumx(const char* name){ + ++ int stage=1; ++ + END ++ + #core +-cat temp | awk '{print "\t" ((NR==1)?"if":"else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp +-#Footer ++#number of enums: ++numenums=`wc -l temp | awk '{printf("%s\n",$1);}'` ++i1=1; ++i2=120; ++for (( i=1 ; i<=100 ; i++ )); do ++ echo " if(stage==$i){" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp ++ awk -vi1=$i1 -vi2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp > "temp_batch$i" ++ ++ cat "temp_batch$i" | awk '{print "\t" ((NR==1)?" if":" else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp ++ echo " else stage=$(($i+1));" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp ++ echo " }" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp ++ ++ ++ if [ $i2 -ge $numenums ]; then break; fi ++ i1=$(($i1+120)); ++ i2=$(($i2+120)); ++done ++ + cat <> $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp +- else _error_("Enum %s not found",name); +- ++ else _error_("Enum %s not found",name); + } + END + #}}} +@@ -154,7 +172,7 @@ + + + #clean up{{{ +-rm temp ++rm temp temp_batch* + #}}} + #print info {{{ + printf "\r " Index: /issm/oecreview/Archive/11401-11425/ISSM-11404-11405.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11404-11405.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11404-11405.diff (revision 11515) @@ -0,0 +1,897 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11404) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11405) +@@ -13,450 +13,447 @@ + + int StringToEnumx(const char* name){ + +- int stage=0; ++ int stage=1; + +- if(stage==0){ +- +- if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum; +- else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum; +- else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum; +- else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum; +- else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum; +- else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum; +- else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; +- else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum; +- else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum; +- else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum; +- else if (strcmp(name,"Bed")==0) return BedEnum; +- else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum; +- else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; +- else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum; +- else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum; +- else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum; +- else if (strcmp(name,"DiagnosticIsnewton")==0) return DiagnosticIsnewtonEnum; +- else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum; +- else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum; +- else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum; +- else if (strcmp(name,"DiagnosticReferential")==0) return DiagnosticReferentialEnum; +- else if (strcmp(name,"DiagnosticReltol")==0) return DiagnosticReltolEnum; +- else if (strcmp(name,"DiagnosticRequestedOutputs")==0) return DiagnosticRequestedOutputsEnum; +- else if (strcmp(name,"DiagnosticRestol")==0) return DiagnosticRestolEnum; +- else if (strcmp(name,"DiagnosticRiftPenaltyLock")==0) return DiagnosticRiftPenaltyLockEnum; +- else if (strcmp(name,"DiagnosticRiftPenaltyThreshold")==0) return DiagnosticRiftPenaltyThresholdEnum; +- else if (strcmp(name,"DiagnosticShelfDampening")==0) return DiagnosticShelfDampeningEnum; +- else if (strcmp(name,"DiagnosticSpcvx")==0) return DiagnosticSpcvxEnum; +- else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum; +- else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum; +- else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum; +- else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum; +- else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum; +- else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum; +- else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum; +- else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum; +- else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum; +- else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum; +- else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum; +- else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum; +- else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum; +- else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum; +- else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; +- else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; +- else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; +- else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum; +- else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum; +- else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum; +- else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum; +- else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum; +- else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum; +- else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum; +- else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; +- else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum; +- else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum; +- else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; +- else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; +- else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum; +- else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; +- else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; +- else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; +- else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; +- else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; +- else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; +- else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum; +- else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum; +- else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum; +- else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum; +- else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; +- else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; +- else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; +- else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; +- else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum; +- else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum; +- else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum; +- else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum; +- else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum; +- else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum; +- else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum; +- else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; +- else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; +- else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; +- else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; +- else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; +- else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; +- else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; +- else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; +- else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; +- else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; +- else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; +- else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; +- else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; +- else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; +- else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; +- else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum; +- else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum; +- else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum; +- else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; +- else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; +- else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum; +- else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; +- else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum; +- else if (strcmp(name,"MeshNumberofedges")==0) return MeshNumberofedgesEnum; +- else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum; +- else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum; +- else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum; +- else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum; +- else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum; +- else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum; +- else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum; +- else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; +- else if (strcmp(name,"MeshX")==0) return MeshXEnum; +- else if (strcmp(name,"MeshY")==0) return MeshYEnum; +- else if (strcmp(name,"MeshZ")==0) return MeshZEnum; +- else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum; +- else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum; +- else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum; +- else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum; +- else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum; +- else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; +- else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum; +- else stage=1; +- } +- +- if(stage==1){ +- +- if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum; +- else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum; +- else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum; +- else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum; +- else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum; +- else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum; +- else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum; +- else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum; +- else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum; +- else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; +- else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum; +- else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; +- else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; +- else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; +- else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; +- else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; +- else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; +- else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; +- else if (strcmp(name,"Surface")==0) return SurfaceEnum; +- else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum; +- else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum; +- else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; +- else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; +- else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; +- else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum; +- else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; +- else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; +- else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; +- else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; +- else if (strcmp(name,"Thickness")==0) return ThicknessEnum; +- else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; +- else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; +- else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; +- else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; +- else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum; +- else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum; +- else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum; +- else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; +- else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; +- else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; +- else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum; +- else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum; +- else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum; +- else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum; +- else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; +- else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum; +- else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; +- else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; +- else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; +- else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum; +- else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; +- else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum; +- else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum; +- else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum; +- else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum; +- else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum; +- else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; +- else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; +- else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; +- else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; +- else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum; +- else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum; +- else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; +- else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; +- else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; +- else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum; +- else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum; +- else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; +- else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum; +- else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; +- else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum; +- else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum; +- else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; +- else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; +- else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; +- else if (strcmp(name,"Approximation")==0) return ApproximationEnum; +- else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum; +- else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum; +- else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum; +- else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum; +- else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; +- else if (strcmp(name,"PattynApproximation")==0) return PattynApproximationEnum; +- else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum; +- else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum; +- else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; +- else if (strcmp(name,"Loads")==0) return LoadsEnum; +- else if (strcmp(name,"Materials")==0) return MaterialsEnum; +- else if (strcmp(name,"Nodes")==0) return NodesEnum; +- else if (strcmp(name,"Parameters")==0) return ParametersEnum; +- else if (strcmp(name,"Vertices")==0) return VerticesEnum; +- else if (strcmp(name,"Results")==0) return ResultsEnum; +- else if (strcmp(name,"BoolInput")==0) return BoolInputEnum; +- else if (strcmp(name,"BoolParam")==0) return BoolParamEnum; +- else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; +- else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; +- else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum; +- else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; +- else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum; +- else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum; +- else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; +- else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; +- else if (strcmp(name,"Element")==0) return ElementEnum; +- else if (strcmp(name,"ElementResult")==0) return ElementResultEnum; +- else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; +- else if (strcmp(name,"FileParam")==0) return FileParamEnum; +- else if (strcmp(name,"Hook")==0) return HookEnum; +- else if (strcmp(name,"Icefront")==0) return IcefrontEnum; +- else if (strcmp(name,"Input")==0) return InputEnum; +- else if (strcmp(name,"IntInput")==0) return IntInputEnum; +- else if (strcmp(name,"IntParam")==0) return IntParamEnum; +- else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; +- else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; +- else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; +- else if (strcmp(name,"Matice")==0) return MaticeEnum; +- else if (strcmp(name,"Matpar")==0) return MatparEnum; +- else if (strcmp(name,"Node")==0) return NodeEnum; +- else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; +- else if (strcmp(name,"Param")==0) return ParamEnum; +- else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; +- else if (strcmp(name,"Pengrid")==0) return PengridEnum; +- else stage=2; +- } +- if(stage==2){ +- if (strcmp(name,"Penpair")==0) return PenpairEnum; +- else if (strcmp(name,"Penta")==0) return PentaEnum; +- else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum; +- else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum; +- else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum; +- else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; +- else if (strcmp(name,"Segment")==0) return SegmentEnum; +- else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; +- else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; +- else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; +- else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; +- else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum; +- else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; +- else if (strcmp(name,"StringParam")==0) return StringParamEnum; +- else if (strcmp(name,"Tria")==0) return TriaEnum; +- else if (strcmp(name,"TriaP1Input")==0) return TriaP1InputEnum; +- else if (strcmp(name,"Vertex")==0) return VertexEnum; +- else if (strcmp(name,"Air")==0) return AirEnum; +- else if (strcmp(name,"Ice")==0) return IceEnum; +- else if (strcmp(name,"Melange")==0) return MelangeEnum; +- else if (strcmp(name,"Water")==0) return WaterEnum; +- else if (strcmp(name,"Closed")==0) return ClosedEnum; +- else if (strcmp(name,"Free")==0) return FreeEnum; +- else if (strcmp(name,"Open")==0) return OpenEnum; +- else if (strcmp(name,"Adjointp")==0) return AdjointpEnum; +- else if (strcmp(name,"Adjointx")==0) return AdjointxEnum; +- else if (strcmp(name,"Adjointy")==0) return AdjointyEnum; +- else if (strcmp(name,"Adjointz")==0) return AdjointzEnum; +- else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum; +- else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum; +- else if (strcmp(name,"Boundary")==0) return BoundaryEnum; +- else if (strcmp(name,"Constant")==0) return ConstantEnum; +- else if (strcmp(name,"Converged")==0) return ConvergedEnum; +- else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum; +- else if (strcmp(name,"Fill")==0) return FillEnum; +- else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; +- else if (strcmp(name,"Friction")==0) return FrictionEnum; +- else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum; +- else if (strcmp(name,"Internal")==0) return InternalEnum; +- else if (strcmp(name,"IuToExt")==0) return IuToExtEnum; +- else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; +- else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; +- else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; +- else if (strcmp(name,"Misfit")==0) return MisfitEnum; +- else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; +- else if (strcmp(name,"Pressure")==0) return PressureEnum; +- else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; +- else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; +- else if (strcmp(name,"QmuVx")==0) return QmuVxEnum; +- else if (strcmp(name,"QmuVy")==0) return QmuVyEnum; +- else if (strcmp(name,"QmuVz")==0) return QmuVzEnum; +- else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum; +- else if (strcmp(name,"QmuBed")==0) return QmuBedEnum; +- else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum; +- else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum; +- else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum; +- else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum; +- else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum; +- else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum; +- else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum; +- else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; +- else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; +- else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; +- else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; +- else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; +- else if (strcmp(name,"Temperature")==0) return TemperatureEnum; +- else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum; +- else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; +- else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; +- else if (strcmp(name,"Type")==0) return TypeEnum; +- else if (strcmp(name,"Vel")==0) return VelEnum; +- else if (strcmp(name,"Velocity")==0) return VelocityEnum; +- else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; +- else if (strcmp(name,"Vx")==0) return VxEnum; +- else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; +- else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; +- else if (strcmp(name,"Vy")==0) return VyEnum; +- else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; +- else if (strcmp(name,"Vz")==0) return VzEnum; +- else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum; +- else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum; +- else if (strcmp(name,"VzPicard")==0) return VzPicardEnum; +- else if (strcmp(name,"VzStokes")==0) return VzStokesEnum; +- else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; +- else if (strcmp(name,"VyMesh")==0) return VyMeshEnum; +- else if (strcmp(name,"VzMesh")==0) return VzMeshEnum; +- else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; +- else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; +- else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum; +- else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum; +- else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum; +- else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum; +- else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum; +- else if (strcmp(name,"TransientInput")==0) return TransientInputEnum; +- else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum; +- else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum; +- else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; +- else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; +- else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; +- else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; +- else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; +- else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; +- else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; +- else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; +- else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; +- else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum; +- else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; +- else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; +- else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; +- else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; +- else if (strcmp(name,"P0")==0) return P0Enum; +- else if (strcmp(name,"P1")==0) return P1Enum; +- else if (strcmp(name,"P1DG")==0) return P1DGEnum; +- else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum; +- else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; +- else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; +- else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; +- else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; +- else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; +- else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; +- else stage=3; +- } +- if(stage==3){ +- if (strcmp(name,"J")==0) return JEnum; +- else if (strcmp(name,"Patch")==0) return PatchEnum; +- else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; +- else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; +- else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; +- else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum; +- else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; +- else if (strcmp(name,"Time")==0) return TimeEnum; +- else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; +- else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; +- else if (strcmp(name,"MinVel")==0) return MinVelEnum; +- else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; +- else if (strcmp(name,"MinVx")==0) return MinVxEnum; +- else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; +- else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; +- else if (strcmp(name,"MinVy")==0) return MinVyEnum; +- else if (strcmp(name,"MaxVy")==0) return MaxVyEnum; +- else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; +- else if (strcmp(name,"MinVz")==0) return MinVzEnum; +- else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; +- else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; +- else if (strcmp(name,"Relative")==0) return RelativeEnum; +- else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; +- else if (strcmp(name,"Incremental")==0) return IncrementalEnum; +- else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; +- else if (strcmp(name,"None")==0) return NoneEnum; +- else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; +- else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum; +- else if (strcmp(name,"Adjoint")==0) return AdjointEnum; +- else if (strcmp(name,"Colinear")==0) return ColinearEnum; +- else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum; +- else if (strcmp(name,"Fset")==0) return FsetEnum; +- else if (strcmp(name,"Gradient1")==0) return Gradient1Enum; +- else if (strcmp(name,"Gradient2")==0) return Gradient2Enum; +- else if (strcmp(name,"Gradient3")==0) return Gradient3Enum; +- else if (strcmp(name,"Gradient")==0) return GradientEnum; +- else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; +- else if (strcmp(name,"Gset")==0) return GsetEnum; +- else if (strcmp(name,"Index")==0) return IndexEnum; +- else if (strcmp(name,"Indexed")==0) return IndexedEnum; +- else if (strcmp(name,"Intersect")==0) return IntersectEnum; +- else if (strcmp(name,"Nodal")==0) return NodalEnum; +- else if (strcmp(name,"OldGradient")==0) return OldGradientEnum; +- else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum; +- else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum; +- else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum; +- else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum; +- else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum; +- else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; +- else if (strcmp(name,"Regular")==0) return RegularEnum; +- else if (strcmp(name,"Scaled")==0) return ScaledEnum; +- else if (strcmp(name,"Separate")==0) return SeparateEnum; +- else if (strcmp(name,"Sset")==0) return SsetEnum; +- else if (strcmp(name,"Verbose")==0) return VerboseEnum; +- else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum; +- else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; +- else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; +- else if (strcmp(name,"XY")==0) return XYEnum; +- else if (strcmp(name,"XYZP")==0) return XYZPEnum; +- else if (strcmp(name,"Option")==0) return OptionEnum; +- else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; +- else if (strcmp(name,"OptionChar")==0) return OptionCharEnum; +- else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; +- else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum; +- else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum; +- else if (strcmp(name,"Paterson")==0) return PatersonEnum; +- else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; +- else _error_("Enum %s not found",name); +- } +- ++ if(stage==1){ ++ if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum; ++ else if (strcmp(name,"AutodiffIsautodiff")==0) return AutodiffIsautodiffEnum; ++ else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum; ++ else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum; ++ else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum; ++ else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum; ++ else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum; ++ else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum; ++ else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum; ++ else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum; ++ else if (strcmp(name,"Bed")==0) return BedEnum; ++ else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum; ++ else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; ++ else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum; ++ else if (strcmp(name,"DiagnosticAbstol")==0) return DiagnosticAbstolEnum; ++ else if (strcmp(name,"DiagnosticIcefront")==0) return DiagnosticIcefrontEnum; ++ else if (strcmp(name,"DiagnosticIsnewton")==0) return DiagnosticIsnewtonEnum; ++ else if (strcmp(name,"DiagnosticMaxiter")==0) return DiagnosticMaxiterEnum; ++ else if (strcmp(name,"DiagnosticNumRequestedOutputs")==0) return DiagnosticNumRequestedOutputsEnum; ++ else if (strcmp(name,"DiagnosticPenaltyFactor")==0) return DiagnosticPenaltyFactorEnum; ++ else if (strcmp(name,"DiagnosticReferential")==0) return DiagnosticReferentialEnum; ++ else if (strcmp(name,"DiagnosticReltol")==0) return DiagnosticReltolEnum; ++ else if (strcmp(name,"DiagnosticRequestedOutputs")==0) return DiagnosticRequestedOutputsEnum; ++ else if (strcmp(name,"DiagnosticRestol")==0) return DiagnosticRestolEnum; ++ else if (strcmp(name,"DiagnosticRiftPenaltyLock")==0) return DiagnosticRiftPenaltyLockEnum; ++ else if (strcmp(name,"DiagnosticRiftPenaltyThreshold")==0) return DiagnosticRiftPenaltyThresholdEnum; ++ else if (strcmp(name,"DiagnosticShelfDampening")==0) return DiagnosticShelfDampeningEnum; ++ else if (strcmp(name,"DiagnosticSpcvx")==0) return DiagnosticSpcvxEnum; ++ else if (strcmp(name,"DiagnosticSpcvy")==0) return DiagnosticSpcvyEnum; ++ else if (strcmp(name,"DiagnosticSpcvz")==0) return DiagnosticSpcvzEnum; ++ else if (strcmp(name,"DiagnosticStokesreconditioning")==0) return DiagnosticStokesreconditioningEnum; ++ else if (strcmp(name,"DiagnosticVertexPairing")==0) return DiagnosticVertexPairingEnum; ++ else if (strcmp(name,"DiagnosticViscosityOvershoot")==0) return DiagnosticViscosityOvershootEnum; ++ else if (strcmp(name,"FlowequationBordermacayeal")==0) return FlowequationBordermacayealEnum; ++ else if (strcmp(name,"FlowequationBorderpattyn")==0) return FlowequationBorderpattynEnum; ++ else if (strcmp(name,"FlowequationBorderstokes")==0) return FlowequationBorderstokesEnum; ++ else if (strcmp(name,"FlowequationElementEquation")==0) return FlowequationElementEquationEnum; ++ else if (strcmp(name,"FlowequationIshutter")==0) return FlowequationIshutterEnum; ++ else if (strcmp(name,"FlowequationIsmacayealpattyn")==0) return FlowequationIsmacayealpattynEnum; ++ else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum; ++ else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum; ++ else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum; ++ else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; ++ else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; ++ else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum; ++ else if (strcmp(name,"HydrologyCR")==0) return HydrologyCREnum; ++ else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum; ++ else if (strcmp(name,"HydrologyN")==0) return HydrologyNEnum; ++ else if (strcmp(name,"HydrologyP")==0) return HydrologyPEnum; ++ else if (strcmp(name,"HydrologyQ")==0) return HydrologyQEnum; ++ else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum; ++ else if (strcmp(name,"HydrologyStabilization")==0) return HydrologyStabilizationEnum; ++ else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; ++ else if (strcmp(name,"InversionCostFunction")==0) return InversionCostFunctionEnum; ++ else if (strcmp(name,"InversionCostFunctionThreshold")==0) return InversionCostFunctionThresholdEnum; ++ else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; ++ else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; ++ else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum; ++ else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; ++ else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; ++ else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; ++ else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; ++ else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; ++ else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; ++ else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum; ++ else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum; ++ else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum; ++ else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum; ++ else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; ++ else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum; ++ else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum; ++ else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum; ++ else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum; ++ else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum; ++ else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum; ++ else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum; ++ else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum; ++ else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum; ++ else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum; ++ else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; ++ else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; ++ else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; ++ else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; ++ else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; ++ else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; ++ else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; ++ else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; ++ else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; ++ else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; ++ else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; ++ else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; ++ else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; ++ else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum; ++ else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; ++ else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum; ++ else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum; ++ else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum; ++ else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; ++ else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; ++ else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum; ++ else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; ++ else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum; ++ else if (strcmp(name,"MeshNumberofedges")==0) return MeshNumberofedgesEnum; ++ else if (strcmp(name,"MeshNumberofelements2d")==0) return MeshNumberofelements2dEnum; ++ else if (strcmp(name,"MeshNumberofelements")==0) return MeshNumberofelementsEnum; ++ else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum; ++ else if (strcmp(name,"MeshNumberofvertices2d")==0) return MeshNumberofvertices2dEnum; ++ else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum; ++ else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum; ++ else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum; ++ else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; ++ else if (strcmp(name,"MeshX")==0) return MeshXEnum; ++ else if (strcmp(name,"MeshY")==0) return MeshYEnum; ++ else if (strcmp(name,"MeshZ")==0) return MeshZEnum; ++ else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum; ++ else if (strcmp(name,"PrognosticHydrostaticAdjustment")==0) return PrognosticHydrostaticAdjustmentEnum; ++ else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum; ++ else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum; ++ else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum; ++ else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; ++ else stage=2; ++ } ++ if(stage==2){ ++ if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum; ++ else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum; ++ else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum; ++ else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum; ++ else if (strcmp(name,"QmuNumberofresponses")==0) return QmuNumberofresponsesEnum; ++ else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum; ++ else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum; ++ else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum; ++ else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum; ++ else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum; ++ else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; ++ else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum; ++ else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; ++ else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; ++ else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; ++ else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; ++ else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; ++ else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; ++ else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; ++ else if (strcmp(name,"Surface")==0) return SurfaceEnum; ++ else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum; ++ else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum; ++ else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; ++ else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; ++ else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; ++ else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum; ++ else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; ++ else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; ++ else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; ++ else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum; ++ else if (strcmp(name,"Thickness")==0) return ThicknessEnum; ++ else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; ++ else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; ++ else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; ++ else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; ++ else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum; ++ else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum; ++ else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum; ++ else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; ++ else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; ++ else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; ++ else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum; ++ else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum; ++ else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum; ++ else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum; ++ else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; ++ else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum; ++ else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; ++ else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; ++ else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; ++ else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum; ++ else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; ++ else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum; ++ else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum; ++ else if (strcmp(name,"DiagnosticHorizAnalysis")==0) return DiagnosticHorizAnalysisEnum; ++ else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum; ++ else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum; ++ else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; ++ else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; ++ else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; ++ else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; ++ else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum; ++ else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum; ++ else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; ++ else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; ++ else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; ++ else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum; ++ else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum; ++ else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; ++ else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum; ++ else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; ++ else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum; ++ else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum; ++ else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; ++ else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; ++ else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; ++ else if (strcmp(name,"Approximation")==0) return ApproximationEnum; ++ else if (strcmp(name,"HutterApproximation")==0) return HutterApproximationEnum; ++ else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum; ++ else if (strcmp(name,"MacAyealPattynApproximation")==0) return MacAyealPattynApproximationEnum; ++ else if (strcmp(name,"MacAyealStokesApproximation")==0) return MacAyealStokesApproximationEnum; ++ else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; ++ else if (strcmp(name,"PattynApproximation")==0) return PattynApproximationEnum; ++ else if (strcmp(name,"PattynStokesApproximation")==0) return PattynStokesApproximationEnum; ++ else if (strcmp(name,"StokesApproximation")==0) return StokesApproximationEnum; ++ else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; ++ else if (strcmp(name,"Loads")==0) return LoadsEnum; ++ else if (strcmp(name,"Materials")==0) return MaterialsEnum; ++ else if (strcmp(name,"Nodes")==0) return NodesEnum; ++ else if (strcmp(name,"Parameters")==0) return ParametersEnum; ++ else if (strcmp(name,"Vertices")==0) return VerticesEnum; ++ else if (strcmp(name,"Results")==0) return ResultsEnum; ++ else if (strcmp(name,"BoolInput")==0) return BoolInputEnum; ++ else if (strcmp(name,"BoolParam")==0) return BoolParamEnum; ++ else if (strcmp(name,"ControlInput")==0) return ControlInputEnum; ++ else if (strcmp(name,"DatasetInput")==0) return DatasetInputEnum; ++ else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum; ++ else if (strcmp(name,"DoubleInput")==0) return DoubleInputEnum; ++ else if (strcmp(name,"DoubleMatArrayParam")==0) return DoubleMatArrayParamEnum; ++ else if (strcmp(name,"DoubleMatParam")==0) return DoubleMatParamEnum; ++ else if (strcmp(name,"DoubleParam")==0) return DoubleParamEnum; ++ else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; ++ else if (strcmp(name,"Element")==0) return ElementEnum; ++ else if (strcmp(name,"ElementResult")==0) return ElementResultEnum; ++ else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; ++ else if (strcmp(name,"FileParam")==0) return FileParamEnum; ++ else if (strcmp(name,"Hook")==0) return HookEnum; ++ else if (strcmp(name,"Icefront")==0) return IcefrontEnum; ++ else if (strcmp(name,"Input")==0) return InputEnum; ++ else if (strcmp(name,"IntInput")==0) return IntInputEnum; ++ else if (strcmp(name,"IntParam")==0) return IntParamEnum; ++ else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; ++ else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; ++ else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; ++ else if (strcmp(name,"Matice")==0) return MaticeEnum; ++ else if (strcmp(name,"Matpar")==0) return MatparEnum; ++ else if (strcmp(name,"Node")==0) return NodeEnum; ++ else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; ++ else if (strcmp(name,"Param")==0) return ParamEnum; ++ else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; ++ else stage=3; ++ } ++ if(stage==3){ ++ if (strcmp(name,"Pengrid")==0) return PengridEnum; ++ else if (strcmp(name,"Penpair")==0) return PenpairEnum; ++ else if (strcmp(name,"Penta")==0) return PentaEnum; ++ else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum; ++ else if (strcmp(name,"PetscMatParam")==0) return PetscMatParamEnum; ++ else if (strcmp(name,"PetscVecParam")==0) return PetscVecParamEnum; ++ else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; ++ else if (strcmp(name,"Segment")==0) return SegmentEnum; ++ else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; ++ else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; ++ else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; ++ else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; ++ else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum; ++ else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; ++ else if (strcmp(name,"StringParam")==0) return StringParamEnum; ++ else if (strcmp(name,"Tria")==0) return TriaEnum; ++ else if (strcmp(name,"TriaP1Input")==0) return TriaP1InputEnum; ++ else if (strcmp(name,"Vertex")==0) return VertexEnum; ++ else if (strcmp(name,"Air")==0) return AirEnum; ++ else if (strcmp(name,"Ice")==0) return IceEnum; ++ else if (strcmp(name,"Melange")==0) return MelangeEnum; ++ else if (strcmp(name,"Water")==0) return WaterEnum; ++ else if (strcmp(name,"Closed")==0) return ClosedEnum; ++ else if (strcmp(name,"Free")==0) return FreeEnum; ++ else if (strcmp(name,"Open")==0) return OpenEnum; ++ else if (strcmp(name,"Adjointp")==0) return AdjointpEnum; ++ else if (strcmp(name,"Adjointx")==0) return AdjointxEnum; ++ else if (strcmp(name,"Adjointy")==0) return AdjointyEnum; ++ else if (strcmp(name,"Adjointz")==0) return AdjointzEnum; ++ else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum; ++ else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum; ++ else if (strcmp(name,"Boundary")==0) return BoundaryEnum; ++ else if (strcmp(name,"Constant")==0) return ConstantEnum; ++ else if (strcmp(name,"Converged")==0) return ConvergedEnum; ++ else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum; ++ else if (strcmp(name,"Fill")==0) return FillEnum; ++ else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; ++ else if (strcmp(name,"Friction")==0) return FrictionEnum; ++ else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum; ++ else if (strcmp(name,"Internal")==0) return InternalEnum; ++ else if (strcmp(name,"IuToExt")==0) return IuToExtEnum; ++ else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; ++ else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; ++ else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; ++ else if (strcmp(name,"Misfit")==0) return MisfitEnum; ++ else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; ++ else if (strcmp(name,"Pressure")==0) return PressureEnum; ++ else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; ++ else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; ++ else if (strcmp(name,"QmuVx")==0) return QmuVxEnum; ++ else if (strcmp(name,"QmuVy")==0) return QmuVyEnum; ++ else if (strcmp(name,"QmuVz")==0) return QmuVzEnum; ++ else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum; ++ else if (strcmp(name,"QmuBed")==0) return QmuBedEnum; ++ else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum; ++ else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum; ++ else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum; ++ else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum; ++ else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum; ++ else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum; ++ else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum; ++ else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; ++ else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; ++ else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; ++ else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; ++ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; ++ else if (strcmp(name,"Temperature")==0) return TemperatureEnum; ++ else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum; ++ else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; ++ else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; ++ else if (strcmp(name,"Type")==0) return TypeEnum; ++ else if (strcmp(name,"Vel")==0) return VelEnum; ++ else if (strcmp(name,"Velocity")==0) return VelocityEnum; ++ else if (strcmp(name,"VxAverage")==0) return VxAverageEnum; ++ else if (strcmp(name,"Vx")==0) return VxEnum; ++ else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; ++ else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; ++ else if (strcmp(name,"Vy")==0) return VyEnum; ++ else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; ++ else if (strcmp(name,"Vz")==0) return VzEnum; ++ else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum; ++ else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum; ++ else if (strcmp(name,"VzPicard")==0) return VzPicardEnum; ++ else if (strcmp(name,"VzStokes")==0) return VzStokesEnum; ++ else if (strcmp(name,"VxMesh")==0) return VxMeshEnum; ++ else if (strcmp(name,"VyMesh")==0) return VyMeshEnum; ++ else if (strcmp(name,"VzMesh")==0) return VzMeshEnum; ++ else if (strcmp(name,"Enthalpy")==0) return EnthalpyEnum; ++ else if (strcmp(name,"EnthalpyPicard")==0) return EnthalpyPicardEnum; ++ else if (strcmp(name,"ThicknessAbsGradient")==0) return ThicknessAbsGradientEnum; ++ else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum; ++ else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum; ++ else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum; ++ else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum; ++ else if (strcmp(name,"TransientInput")==0) return TransientInputEnum; ++ else if (strcmp(name,"Outputfilename")==0) return OutputfilenameEnum; ++ else if (strcmp(name,"Waterfraction")==0) return WaterfractionEnum; ++ else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; ++ else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; ++ else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; ++ else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; ++ else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; ++ else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; ++ else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; ++ else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; ++ else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; ++ else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum; ++ else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; ++ else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; ++ else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; ++ else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; ++ else if (strcmp(name,"P0")==0) return P0Enum; ++ else if (strcmp(name,"P1")==0) return P1Enum; ++ else if (strcmp(name,"P1DG")==0) return P1DGEnum; ++ else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum; ++ else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; ++ else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; ++ else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; ++ else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; ++ else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; ++ else stage=4; ++ } ++ if(stage==4){ ++ if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; ++ else if (strcmp(name,"J")==0) return JEnum; ++ else if (strcmp(name,"Patch")==0) return PatchEnum; ++ else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; ++ else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum; ++ else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; ++ else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum; ++ else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; ++ else if (strcmp(name,"Time")==0) return TimeEnum; ++ else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; ++ else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; ++ else if (strcmp(name,"MinVel")==0) return MinVelEnum; ++ else if (strcmp(name,"MaxVel")==0) return MaxVelEnum; ++ else if (strcmp(name,"MinVx")==0) return MinVxEnum; ++ else if (strcmp(name,"MaxVx")==0) return MaxVxEnum; ++ else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum; ++ else if (strcmp(name,"MinVy")==0) return MinVyEnum; ++ else if (strcmp(name,"MaxVy")==0) return MaxVyEnum; ++ else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum; ++ else if (strcmp(name,"MinVz")==0) return MinVzEnum; ++ else if (strcmp(name,"MaxVz")==0) return MaxVzEnum; ++ else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum; ++ else if (strcmp(name,"Relative")==0) return RelativeEnum; ++ else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; ++ else if (strcmp(name,"Incremental")==0) return IncrementalEnum; ++ else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; ++ else if (strcmp(name,"None")==0) return NoneEnum; ++ else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; ++ else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum; ++ else if (strcmp(name,"Adjoint")==0) return AdjointEnum; ++ else if (strcmp(name,"Colinear")==0) return ColinearEnum; ++ else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum; ++ else if (strcmp(name,"Fset")==0) return FsetEnum; ++ else if (strcmp(name,"Gradient1")==0) return Gradient1Enum; ++ else if (strcmp(name,"Gradient2")==0) return Gradient2Enum; ++ else if (strcmp(name,"Gradient3")==0) return Gradient3Enum; ++ else if (strcmp(name,"Gradient")==0) return GradientEnum; ++ else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; ++ else if (strcmp(name,"Gset")==0) return GsetEnum; ++ else if (strcmp(name,"Index")==0) return IndexEnum; ++ else if (strcmp(name,"Indexed")==0) return IndexedEnum; ++ else if (strcmp(name,"Intersect")==0) return IntersectEnum; ++ else if (strcmp(name,"Nodal")==0) return NodalEnum; ++ else if (strcmp(name,"OldGradient")==0) return OldGradientEnum; ++ else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum; ++ else if (strcmp(name,"PetscOptionsAnalyses")==0) return PetscOptionsAnalysesEnum; ++ else if (strcmp(name,"PetscOptionsStrings")==0) return PetscOptionsStringsEnum; ++ else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum; ++ else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum; ++ else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; ++ else if (strcmp(name,"Regular")==0) return RegularEnum; ++ else if (strcmp(name,"Scaled")==0) return ScaledEnum; ++ else if (strcmp(name,"Separate")==0) return SeparateEnum; ++ else if (strcmp(name,"Sset")==0) return SsetEnum; ++ else if (strcmp(name,"Verbose")==0) return VerboseEnum; ++ else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum; ++ else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; ++ else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; ++ else if (strcmp(name,"XY")==0) return XYEnum; ++ else if (strcmp(name,"XYZP")==0) return XYZPEnum; ++ else if (strcmp(name,"Option")==0) return OptionEnum; ++ else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; ++ else if (strcmp(name,"OptionChar")==0) return OptionCharEnum; ++ else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; ++ else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum; ++ else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum; ++ else if (strcmp(name,"Paterson")==0) return PatersonEnum; ++ else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; ++ else stage=5; ++ } ++ else _error_("Enum %s not found",name); + } Index: /issm/oecreview/Archive/11401-11425/ISSM-11405-11406.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11405-11406.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11405-11406.diff (revision 11515) @@ -0,0 +1,92 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 11405) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 11406) +@@ -67,13 +67,27 @@ + /*FUNCTION KML_Unknown::DeepEcho {{{1*/ + void KML_Unknown::DeepEcho(const char* indent){ + +- bool flag=true; ++ char* valuei; ++ char* vtoken; ++ char nl[]={'\n','\0'}; ++ bool flag=true; + + _printf_(flag,"%sKML_Unknown %s:\n",indent,name); + KML_Object::DeepEcho(indent); + +- if (value ) +- _printf_(flag,"%s value: \"%s\"\n" ,indent,value); ++ if (value ) { ++ valuei=(char *) xmalloc((strlen(value)+1)*sizeof(char)); ++ memcpy(valuei,value,(strlen(value)+1)*sizeof(char)); ++ ++ vtoken=strtok(valuei,nl); ++ _printf_(flag,"%s value: \"%s" ,indent,vtoken); ++ ++ while (vtoken=strtok(NULL,nl)) ++ _printf_(flag,"\n%s %s" ,indent,vtoken); ++ _printf_(flag,"\"\n"); ++ ++ xfree((void**)&valuei); ++ } + else + _printf_(flag,"%s value: [none]\n" ,indent); + +@@ -83,14 +97,28 @@ + /*FUNCTION KML_Unknown::Write {{{1*/ + void KML_Unknown::Write(FILE* filout,const char* indent){ + ++ char* valuei; ++ char* vtoken; ++ char nl[]={'\n','\0'}; ++ + fprintf(filout,"%s<%s",indent,name); + WriteAttrib(filout," "); + fprintf(filout,">\n"); + WriteCommnt(filout,indent); + +- if (value ) +- fprintf(filout,"%s %s\n",indent,value); ++ if (value ) { ++ valuei=(char *) xmalloc((strlen(value)+1)*sizeof(char)); ++ memcpy(valuei,value,(strlen(value)+1)*sizeof(char)); ++ ++ vtoken=strtok(valuei,nl); ++ fprintf(filout,"%s %s\n",indent,vtoken); ++ ++ while (vtoken=strtok(NULL,nl)) ++ fprintf(filout,"%s %s\n",indent,vtoken); + ++ xfree((void**)&valuei); ++ } ++ + KML_Object::Write(filout,indent); + + fprintf(filout,"%s\n",indent,name); +@@ -104,6 +132,7 @@ + char* kstri; + int ncom=0; + char** pcom=NULL; ++ char nl[]={'\n','\0'}; + + /* get object name */ + +@@ -132,8 +161,15 @@ + _error_("KML_Unknown::Read -- Unexpected closing tag %s.\n",kstri); + + else if (strncmp(kstri,"<",1)) { +- value=(char *) xmalloc((strlen(kstri)+1)*sizeof(char)); +- memcpy(value,kstri,(strlen(kstri)+1)*sizeof(char)); ++ if (value) { ++ value=(char *) xrealloc(value,(strlen(value)+1+strlen(kstri)+1)*sizeof(char)); ++ strcat(value,nl); ++ strcat(value,kstri); ++ } ++ else { ++ value=(char *) xmalloc((strlen(kstri)+1)*sizeof(char)); ++ memcpy(value,kstri,(strlen(kstri)+1)*sizeof(char)); ++ } + } + + else if (!strncmp(kstri,"<",1)) Index: /issm/oecreview/Archive/11401-11425/ISSM-11406-11407.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11406-11407.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11406-11407.diff (revision 11515) @@ -0,0 +1,101 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 11406) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 11407) +@@ -9,6 +9,9 @@ + rm $ISSM_TIER/src/c/modules/EnumToStringx/EnumToStringx.cpp + rm $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp + ++#Get number of enums ++NUMENUMS=$(wc -l temp | awk '{printf("%s",$1);}'); ++ + #Take care of EnumToModelField.m first (easy) + #Build EnumToModelField.m {{{1 + cat < $ISSM_TIER/src/m/enum/EnumToModelField.m +@@ -99,35 +102,30 @@ + END + + #core +-#number of enums: +-numenums=`wc -l temp | awk '{printf("%s\n",$1);}'` + i1=1; + i2=120; + for (( i=1 ; i<=100 ; i++ )); do + echo " if(stage==$i){" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp +- awk -vi1=$i1 -vi2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp > "temp_batch$i" +- +- cat "temp_batch$i" | awk '{print "\t" ((NR==1)?" if":" else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp ++ awk -v i1=$i1 -v i2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp | ++ awk '{print "\t" ((NR==1)?" if":" else if") " (strcmp(name,\"" substr($2,1,length($2)-4) "\")==0) return " $2 ";"}' >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp + echo " else stage=$(($i+1));" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp + echo " }" >> $ISSM_TIER//src/c/modules/StringToEnumx/StringToEnumx.cpp + +- +- if [ $i2 -ge $numenums ]; then break; fi +- i1=$(($i1+120)); +- i2=$(($i2+120)); ++ if [ $i2 -ge $NUMENUMS ]; then break; fi ++ let i1=$i1+120 ++ let i2=$i2+120 + done + ++#footer + cat <> $ISSM_TIER/src/c/modules/StringToEnumx/StringToEnumx.cpp +- else _error_("Enum %s not found",name); ++ /*If we reach this point, the string provided has not been found*/ ++ _error_("Enum %s not found",name); + } + END + #}}} + +-#get number of lines in temp +-NUMBEROFLINES=$(wc -l temp | awk '{printf("%s",$1);}'); +- + # go through the lines of temp +-for (( i=1 ; i<=$NUMBEROFLINES ; i++ )); do ++for (( i=1 ; i<=$NUMENUMS ; i++ )); do + + #Get name and enum of the line i + NAMEENUM=$(cat temp | grep "^[ ]*$i " | awk '{printf("%s",$2);}'); +@@ -140,15 +138,15 @@ + if [ $i -lt 10 ] + then + printf "\r " +- printf "\r $i/$NUMBEROFLINES Adding "$NAME"..." ++ printf "\r $i/$NUMENUMS Adding "$NAME"..." + else + if [ $i -lt 100 ] + then + printf "\r " +- printf "\r $i/$NUMBEROFLINES Adding "$NAME"..." ++ printf "\r $i/$NUMENUMS Adding "$NAME"..." + else + printf "\r " +- printf "\r$i/$NUMBEROFLINES Adding "$NAME"..." ++ printf "\r$i/$NUMENUMS Adding "$NAME"..." + fi + fi + #}}} +@@ -170,9 +168,8 @@ + + done + +- + #clean up{{{ +-rm temp temp_batch* ++rm temp + #}}} + #print info {{{ + printf "\r " +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11406) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11407) +@@ -455,5 +455,6 @@ + else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; + else stage=5; + } +- else _error_("Enum %s not found",name); ++ /*If we reach this point, the string provided has not been found*/ ++ _error_("Enum %s not found",name); + } Index: /issm/oecreview/Archive/11401-11425/ISSM-11407-11408.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11407-11408.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11407-11408.diff (revision 11515) @@ -0,0 +1,61 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/collapse.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/collapse.m (revision 11407) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/collapse.m (revision 11408) +@@ -28,6 +28,9 @@ + if ~isnan(md.inversion.vx_obs), md.inversion.vx_obs=project2d(md,md.inversion.vx_obs,md.mesh.numberoflayers); end; + if ~isnan(md.inversion.vy_obs), md.inversion.vy_obs=project2d(md,md.inversion.vy_obs,md.mesh.numberoflayers); end; + if ~isnan(md.inversion.vel_obs), md.inversion.vel_obs=project2d(md,md.inversion.vel_obs,md.mesh.numberoflayers); end; ++if ~isnan(md.inversion.cost_functions_coefficients), md.inversion.cost_functions_coefficients=project2d(md,md.inversion.cost_functions_coefficients,md.mesh.numberoflayers); end; ++if ~isnan(md.inversion.min_parameters), md.inversion.min_parameters=project2d(md,md.inversion.min_parameters,md.mesh.numberoflayers); end; ++if ~isnan(md.inversion.max_parameters), md.inversion.max_parameters=project2d(md,md.inversion.max_parameters,md.mesh.numberoflayers); end; + if ~isnan(md.surfaceforcings.mass_balance), + md.surfaceforcings.mass_balance=project2d(md,md.surfaceforcings.mass_balance,md.mesh.numberoflayers); + end; +@@ -48,18 +51,23 @@ + %elementstype + if ~isnan(md.flowequation.element_equation) + md.flowequation.element_equation=project2d(md,md.flowequation.element_equation,1); ++ md.flowequation.vertex_equation=project2d(md,md.flowequation.vertex_equation,1); ++ md.flowequation.bordermacayeal=project2d(md,md.flowequation.bordermacayeal,1); ++ md.flowequation.borderpattyn=project2d(md,md.flowequation.borderpattyn,1); ++ md.flowequation.borderstokes=project2d(md,md.flowequation.borderstokes,1); + end + + %boundary conditions + md.diagnostic.spcvx=project2d(md,md.diagnostic.spcvx,md.mesh.numberoflayers); + md.diagnostic.spcvy=project2d(md,md.diagnostic.spcvy,md.mesh.numberoflayers); + md.diagnostic.spcvz=project2d(md,md.diagnostic.spcvz,md.mesh.numberoflayers); ++md.diagnostic.referential=project2d(md,md.diagnostic.referential,md.mesh.numberoflayers); + md.prognostic.spcthickness=project2d(md,md.prognostic.spcthickness,md.mesh.numberoflayers); + md.thermal.spctemperature=project2d(md,md.thermal.spctemperature,md.mesh.numberoflayers); + + %Extrusion of Neumann BC + if ~isnan(md.diagnostic.icefront), +- numberofneumann2d=size(md.diagnostic.icefront,1)/md.mesh.numberoflayers; ++ numberofneumann2d=size(md.diagnostic.icefront,1)/(md.mesh.numberoflayers-1); + md.diagnostic.icefront=[md.diagnostic.icefront(1:numberofneumann2d,1:2) md.diagnostic.icefront(1:numberofneumann2d,5:6)]; %Add two columns on the first layer + end + +@@ -87,6 +95,8 @@ + md.mask.vertexonfloatingice=project2d(md,md.mask.vertexonfloatingice,1); + md.mask.elementongroundedice=project2d(md,md.mask.elementongroundedice,1); + md.mask.vertexongroundedice=project2d(md,md.mask.vertexongroundedice,1); ++md.mask.elementonwater=project2d(md,md.mask.elementonwater,1); ++md.mask.vertexonwater=project2d(md,md.mask.vertexonwater,1); + + %Initialize with the 2d mesh + md.mesh.x=md.mesh.x2d; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/radarpower.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/radarpower.m (revision 11407) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/radarpower.m (revision 11408) +@@ -10,7 +10,7 @@ + % md=radarpower(md) + + %If gdal does not work, uncomment the following line +-setenv('LD_LIBRARY_PATH','/proj/ice/larour/issm/trunk/externalpackages/gdal/install/lib/'); ++%setenv('LD_LIBRARY_PATH','/proj/ice/larour/issm/trunk/externalpackages/gdal/install/lib/'); + %Parse inputs + if nargin==1, + options=pairoptions; Index: /issm/oecreview/Archive/11401-11425/ISSM-11419-11420.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11419-11420.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11419-11420.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m (revision 11419) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m (revision 11420) +@@ -10,7 +10,7 @@ + + %Fields and tolerances to track changes + field_names ={'Enthalpy','Waterfraction','Temperature'}; +-field_tolerances={1e-13,1e-13,1e-13}; ++field_tolerances={1e-13,1e-11,1e-13}; + field_values={... + (md.results.EnthalpySolution.Enthalpy),... + (md.results.EnthalpySolution.Waterfraction),... Index: /issm/oecreview/Archive/11401-11425/ISSM-11420-11421.diff =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-11420-11421.diff (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-11420-11421.diff (revision 11515) @@ -0,0 +1,26 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test142.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test142.m (revision 11420) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test142.m (revision 11421) +@@ -12,7 +12,7 @@ + field_names ={'Enthalpy1','Waterfraction1','Temperature1',... + 'Enthalpy2','Waterfraction2','Temperature2',... + 'Enthalpy3','Waterfraction3','Temperature3'}; +-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; ++field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13}; + field_values={... + (md.results.EnthalpySolution(1).Enthalpy),... + (md.results.EnthalpySolution(1).Waterfraction),... +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m (revision 11420) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/test139.m (revision 11421) +@@ -10,7 +10,7 @@ + + %Fields and tolerances to track changes + field_names ={'Enthalpy','Waterfraction','Temperature'}; +-field_tolerances={1e-13,1e-11,1e-13}; ++field_tolerances={1e-13,1e-10,1e-13}; + field_values={... + (md.results.EnthalpySolution.Enthalpy),... + (md.results.EnthalpySolution.Waterfraction),... Index: /issm/oecreview/Archive/11401-11425/ISSM-DocReview-11401-11425.tex =================================================================== --- /issm/oecreview/Archive/11401-11425/ISSM-DocReview-11401-11425.tex (revision 11515) +++ /issm/oecreview/Archive/11401-11425/ISSM-DocReview-11401-11425.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11401-11425/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11401-11425/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11401-11425/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11401-11425 Index: /issm/oecreview/Archive/11401-11425/Makefile =================================================================== --- /issm/oecreview/Archive/11401-11425/Makefile (revision 11515) +++ /issm/oecreview/Archive/11401-11425/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11401-11425 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11401-11425/log.tex =================================================================== --- /issm/oecreview/Archive/11401-11425/log.tex (revision 11515) +++ /issm/oecreview/Archive/11401-11425/log.tex (revision 11515) @@ -0,0 +1,19 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11401-11402.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/BamgTriangulatex/BamgTriangulatex.cpp M /issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp M /issm/trunk-jpl/src/c/modules/Chacox/input\_parse.cpp M /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp M /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp M /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp M /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp M /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp M /issm/trunk-jpl/src/c/modules/Scotchx/Scotchx.cpp M /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp M /issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp M /issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp M /issm/trunk-jpl/src/c/shared/TriMesh/trimesh.h \\ Export determination: 6. \\Rationale: Missing return statements! This only got caught by the Microsoft Visual Studio compiler! The world is officially upside down! +M /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh Fixed Synchronize.sh instead of cpp (as mentioned in the comments) \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11402-11403.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh \\ Export determination: 6. \\Rationale: Fixed Synchronize.sh instead of cpp (as mentioned in the comments) +M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp Typo fix \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11403-11404.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp \\ Export determination: 6. \\Rationale: Typo fix +M /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh New Synchronize script to handle Visual Studio 120 embedding limit of if then else statements \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11404-11405.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh \\ Export determination: 6. \\Rationale: New Synchronize script to handle Visual Studio 120 embedding limit of if then else statements +M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp testing new Synchronize.sh \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11405-11406.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp \\ Export determination: 6. \\Rationale: testing new Synchronize.sh +M /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.cpp KML: Fix unknown values to concatenate rather than overwrite. \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11406-11407.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/KML/KML\_Unknown.cpp \\ Export determination: 6. \\Rationale: KML: Fix unknown values to concatenate rather than overwrite. +M /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp minor changes to Synchronize.sh so that it errors out when string not found \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11407-11408.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp \\ Export determination: 6. \\Rationale: minor changes to Synchronize.sh so that it errors out when string not found +M /issm/trunk-jpl/src/m/model/collapse.m M /issm/trunk-jpl/src/m/model/radarpower.m Fixed collapse with new fields, very useful for MacAyeal CM \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11408-11409.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/collapse.m M /issm/trunk-jpl/src/m/model/radarpower.m \\ Export determination: 6. \\Rationale: Fixed collapse with new fields, very useful for MacAyeal CM \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11419-11420.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test139.m \\ Export determination: 6. \\Rationale: Up tolerance \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11420-11421.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test139.m \\ Export determination: 6. \\Rationale: Up tolerance +M /issm/trunk-jpl/test/NightlyRun/test139.m M /issm/trunk-jpl/test/NightlyRun/test142.m fix tolerances for waterfraction \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11421-11422.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test139.m M /issm/trunk-jpl/test/NightlyRun/test142.m \\ Export determination: 6. \\Rationale: fix tolerances for waterfraction \\\\ Index: /issm/oecreview/Archive/11401-11425/r1.tex =================================================================== --- /issm/oecreview/Archive/11401-11425/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11401-11425/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11401 Index: /issm/oecreview/Archive/11401-11425/r2.tex =================================================================== --- /issm/oecreview/Archive/11401-11425/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11401-11425/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11425 Index: /issm/oecreview/Archive/11426-11431/Date.tex =================================================================== --- /issm/oecreview/Archive/11426-11431/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11426-11431/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11426-11431/ISSM-11427-11428.diff =================================================================== --- /issm/oecreview/Archive/11426-11431/ISSM-11427-11428.diff (revision 11515) +++ /issm/oecreview/Archive/11426-11431/ISSM-11427-11428.diff (revision 11515) @@ -0,0 +1,168 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.exrc +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.exrc (revision 11427) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.exrc (revision 11428) +@@ -1,55 +0,0 @@ +-set noic +-set autoindent +-set wrapmargin=0 +-set tabstop=4 +-set shiftwidth=4 +-set nomesg +-map #5 o$.......2.......3.......4.......5.......6.......7.......8.......9.......0....... +-map #6 !}fmt -w 80 +- +-map #7 o$........1.........2.........3.........4.........5.........6.........7.. +-map #9 i/*50a- +-map #10 2i 50a-a*/ +-ab bc /* +-ab ec */ +-ab IOMS IMOS +-ab TF THISFUNCTION +-ab PS PetscSynchronizedPrintf(MPI_COMM_WORLD,""); +-PetscSynchronizedFlush(MPI_COMM_WORLD); +-ab As /*Assign output pointers:*/ +-ab Fe /*Free ressources:*/ +-ab p1 printf("ok1\n"); +-ab p2 printf("ok2\n"); +-ab p3 printf("ok3\n"); +-ab p4 printf("ok4\n"); +-ab p5 printf("ok5\n"); +-ab p6 printf("ok6\n"); +-ab p7 printf("ok7\n"); +-ab p8 printf("ok8\n"); +-ab p9 printf("ok9\n"); +- +-ab cit \textit{temp} [2001] \cite{temp2001} +-ab xf xfree((void**)&); +- +-:function! ReverseBackground() +-: let Mysyn=&syntax +-: if &bg=="light" +-: se bg=dark +-: highlight Normal guibg=black guifg=white +-: else +-: se bg=light +-: highlight Normal guibg=white guifg=black +-: endif +-: syn on +-: exe "set syntax=" . Mysyn +-: echo "now syntax is "&syntax +-:endfunction +-:command! Invbg call ReverseBackground() +-:noremap :Invbg +- +- +-" Abbreviations {{{1 +-" ---------------------------------------------------------------------- +-au BufRead,BufNewFile *.c* iab des "printf(\"file: ".expand('%')." line: %i\\n\",__LINE__);" +-au BufRead,BufNewFile *.c* iab dep "PetscSynchronizedPrintf(MPI_COMM_WORLD,\"file: ".expand('%:p')." line: ".line(".")."\\n\");\nPetscSynchronizedFlush(MPI_COMM_WORLD);" +-"}}} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.bashrc +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.bashrc (revision 11427) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.bashrc (revision 11428) +@@ -1 +0,0 @@ +-link .bash_profile +\ No newline at end of file +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.vimrc +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.vimrc (revision 11427) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/intel/.vimrc (revision 11428) +@@ -1,96 +0,0 @@ +- +-" Use Vim settings, rather then Vi settings (much better!). +-" This must be first, because it changes other options as a side effect. +-set nocompatible +-set foldmethod=marker +- +-" allow backspacing over everything in insert mode +-set backspace=indent,eol,start +- +-set autoindent " always set autoindenting on +-set history=50 " keep 50 lines of command line history +-set ruler " show the cursor position all the time +-set showcmd " display incomplete commands +-set incsearch " do incremental searching +-set softtabstop=3 +-set uc=0 " disable swap files +-set shell=/bin/bash +-set nobackup +- +-" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries +-" let &guioptions = substitute(&guioptions, "t", "", "g") +- +-" Don't use Ex mode, use Q for formatting +-map Q gq +- +-" Make p in Visual mode replace the selected text with the "" register. +-vnoremap p :let current_reg = @"gvs=current_reg +- +-" This is an alternative that also works in block mode, but the deleted +-" text is lost and it only works for putting the current register. +-"vnoremap p "_dp +- +-" Switch syntax highlighting on, when the terminal has colors +-" Also switch on highlighting the last used search pattern. +-syntax on +-set hlsearch +- +-" Only do this part when compiled with support for autocommands. +-if has("autocmd") +- +- " Enable file type detection. +- " Use the default filetype settings, so that mail gets 'tw' set to 72, +- " 'cindent' is on in C files, etc. +- " Also load indent files, to automatically do language-dependent indenting. +- filetype plugin indent on +- +- " For all text files set 'textwidth' to 78 characters. +- autocmd FileType text setlocal textwidth=0 +- +- " When editing a file, always jump to the last known cursor position. +- " Don't do it when the position is invalid or when inside an event handler +- " (happens when dropping a file on gvim). +- autocmd BufReadPost * +- \ if line("'\"") > 0 && line("'\"") <= line("$") | +- \ exe "normal g`\"" | +- \ endif | +- \ if foldlevel('.') > 0 | +- \ exe ":foldopen!" | +- \ endif +- +- +- +-endif " has("autocmd") +-colo default +- +- +-"execute "source ~/.vim/plugin/FeralToggleCommentify.vim" +-"map : call ToggleCommentify()j +-"imap :call ToggleCommentify()j +- +- +- +-function! InsertTabWrapper(direction) +-let col = col('.') - 1 +-if !col || getline('.')[col - 1] !~ '\k' +- return "\" +-elseif "backward" == a:direction +- return "\" +-else +- return "\" +-endif +-endfunction +- +-inoremap =InsertTabWrapper ("forward") +-inoremap =InsertTabWrapper ("backward") +- +-source ~/.exrc +-set wildmenu +-set background=dark +- +-"Do local Makefile +-map :!/home/larour/bin/cs +-"Compile server code +-map :!/home/larour/bin/c +-"Change to directory of current file automatically +-autocmd BufEnter * lcd %:p:h Index: /issm/oecreview/Archive/11426-11431/ISSM-11428-11429.diff =================================================================== --- /issm/oecreview/Archive/11426-11431/ISSM-11428-11429.diff (revision 11515) +++ /issm/oecreview/Archive/11426-11431/ISSM-11428-11429.diff (revision 11515) @@ -0,0 +1,164 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.orig.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.orig.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.orig.sh (revision 11429) +@@ -0,0 +1,20 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf src install cccl-0.03 ++mkdir install src ++ ++#Untar ++tar -zxvf cccl-0.03.tar.gz ++ ++#Move cccl into install directory ++mv cccl-0.03/* src ++rm -rf cccl-0.03 ++ ++cd src ++ ++#Compile ++./configure --prefix="$ISSM_TIER/externalpackages/cccl/install" ++ ++make ++make install + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.orig.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.sh (revision 11429) +@@ -0,0 +1,9 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src cccl-0.03 ++mkdir install ++mkdir install/bin ++ ++#Move cccl into install directory ++cp issm/cccl install/bin + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/install-win7.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/cccl-0.03.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/x-gzip + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/cccl-0.03.tar.gz +___________________________________________________________________ +Added: svn:mime-type + + application/x-gzip +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/issm/cccl +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/issm/cccl (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/issm/cccl (revision 11429) +@@ -0,0 +1,90 @@ ++#!/bin/sh ++ ++# cccl ++# Wrapper around MS's cl.exe and link.exe to make them act more like ++# Unix cc and ld ++# ++# Copyright (C) 2000-2003 Geoffrey Wossum (gwossum@acm.org) ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your optsion) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++ ++usage() ++{ ++ cat <. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2, or (at your option) ++# any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . ++ ++ ++# func_error message ++func_error () ++{ ++ echo "$me: $1" 1>&2 ++ exit 1 ++} ++ ++file_conv= ++ ++# func_file_conv build_file ++# Convert a $build file to $host form and store it in $file ++# Currently only supports Windows hosts. ++func_file_conv () ++{ ++ file=$1 ++ case $file in ++ / | /[!/]*) # absolute file, and not a UNC file ++ if test -z "$file_conv"; then ++ # lazily determine how to convert abs files ++ case `uname -s` in ++ MINGW*) ++ file_conv=mingw ++ ;; ++ CYGWIN*) ++ file_conv=cygwin ++ ;; ++ *) ++ file_conv=wine ++ ;; ++ esac ++ fi ++ case $file_conv in ++ mingw) ++ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ++ ;; ++ cygwin) ++ file=`cygpath -m "$file" || echo "$file"` ++ ;; ++ wine) ++ file=`winepath -w "$file" || echo "$file"` ++ ;; ++ esac ++ ;; ++ esac ++} ++ ++# func_at_file at_file operation archive ++# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE ++# for each of them. ++# When interpreting the content of the @FILE, do NOT use func_file_conv, ++# since the user would need to supply preconverted file names to ++# binutils ar, at least for MinGW. ++func_at_file () ++{ ++ operation=$2 ++ archive=$3 ++ at_file_contents=`cat "$1"` ++ eval set x "$at_file_contents" ++ shift ++ ++ for member ++ do ++ $AR -NOLOGO $operation:"$member" "$archive" || exit $? ++ done ++} ++ ++case $1 in ++ '') ++ func_error "no command. Try '$0 --help' for more information." ++ ;; ++ -h | --h*) ++ cat <=',1); + checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0); +@@ -106,6 +112,7 @@ + end % }}} + function disp(obj) % {{{ + fielddisplay(obj,'iscontrol','is inversion activated?'); ++ fielddisplay(obj,'incomplete_adjoint','do we assume linear viscosity?'); + fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'); + fielddisplay(obj,'nsteps','number of optimization searches'); + fielddisplay(obj,'cost_functions','indicate the type of response for each optimization steps'); +@@ -136,6 +143,7 @@ + + WriteData(fid,'object',obj,'fieldname','iscontrol','format','Boolean'); + WriteData(fid,'object',obj,'fieldname','tao','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','incomplete_adjoint','format','Boolean'); + if ~obj.iscontrol, return; end + WriteData(fid,'object',obj,'fieldname','nsteps','format','Integer'); + WriteData(fid,'object',obj,'fieldname','maxiter_per_step','format','DoubleMat','mattype',3); Index: /issm/oecreview/Archive/11431-11450/ISSM-11446-11447.diff =================================================================== --- /issm/oecreview/Archive/11431-11450/ISSM-11446-11447.diff (revision 11515) +++ /issm/oecreview/Archive/11431-11450/ISSM-11446-11447.diff (revision 11515) @@ -0,0 +1,106 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11446) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11447) +@@ -72,6 +72,7 @@ + InversionGradientScalingEnum, + InversionIscontrolEnum, + InversionTaoEnum, ++ InversionIncompleteAdjointEnum, + InversionMaxParametersEnum, + InversionMaxiterPerStepEnum, + InversionMinParametersEnum, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11446) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11447) +@@ -77,6 +77,7 @@ + else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; + else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; + else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum; ++ else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum; + else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; + else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum; + else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; +@@ -135,11 +136,11 @@ + else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum; + else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum; + else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum; +- else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; + else stage=2; + } + if(stage==2){ +- if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum; ++ if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; ++ else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum; + else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum; + else if (strcmp(name,"QmuMassFluxSegments")==0) return QmuMassFluxSegmentsEnum; + else if (strcmp(name,"QmuNumberofpartitions")==0) return QmuNumberofpartitionsEnum; +@@ -258,11 +259,11 @@ + else if (strcmp(name,"Node")==0) return NodeEnum; + else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; + else if (strcmp(name,"Param")==0) return ParamEnum; +- else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; + else stage=3; + } + if(stage==3){ +- if (strcmp(name,"Pengrid")==0) return PengridEnum; ++ if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; ++ else if (strcmp(name,"Pengrid")==0) return PengridEnum; + else if (strcmp(name,"Penpair")==0) return PenpairEnum; + else if (strcmp(name,"Penta")==0) return PentaEnum; + else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum; +@@ -381,11 +382,11 @@ + else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; + else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; + else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; +- else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; + else stage=4; + } + if(stage==4){ +- if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; ++ if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; ++ else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; + else if (strcmp(name,"J")==0) return JEnum; + else if (strcmp(name,"Patch")==0) return PatchEnum; + else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11446) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11447) +@@ -76,6 +76,7 @@ + case InversionGradientScalingEnum : return "InversionGradientScaling"; + case InversionIscontrolEnum : return "InversionIscontrol"; + case InversionTaoEnum : return "InversionTao"; ++ case InversionIncompleteAdjointEnum : return "InversionIncompleteAdjoint"; + case InversionMaxParametersEnum : return "InversionMaxParameters"; + case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep"; + case InversionMinParametersEnum : return "InversionMinParameters"; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 11446) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 11447) +@@ -39,6 +39,7 @@ + parameters->AddObject(iomodel->CopyConstantObject(InversionNstepsEnum)); + parameters->AddObject(iomodel->CopyConstantObject(InversionCostFunctionThresholdEnum)); + parameters->AddObject(iomodel->CopyConstantObject(InversionGradientOnlyEnum)); ++ parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum)); + + /*What solution type?*/ + if (solution_type==SteadystateSolutionEnum){ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/InversionIncompleteAdjointEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/InversionIncompleteAdjointEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/InversionIncompleteAdjointEnum.m (revision 11447) +@@ -0,0 +1,11 @@ ++function macro=InversionIncompleteAdjointEnum() ++%INVERSIONINCOMPLETEADJOINTENUM - Enum of InversionIncompleteAdjoint ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=InversionIncompleteAdjointEnum() ++ ++macro=StringToEnum('InversionIncompleteAdjoint'); Index: /issm/oecreview/Archive/11431-11450/ISSM-11447-11448.diff =================================================================== --- /issm/oecreview/Archive/11431-11450/ISSM-11447-11448.diff (revision 11515) +++ /issm/oecreview/Archive/11431-11450/ISSM-11447-11448.diff (revision 11515) @@ -0,0 +1,371 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11447) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11448) +@@ -335,9 +335,12 @@ + /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ + switch(analysis_type){ + #ifdef _HAVE_DIAGNOSTIC_ +- case DiagnosticHorizAnalysisEnum: case AdjointHorizAnalysisEnum: ++ case DiagnosticHorizAnalysisEnum: + Ke=CreateKMatrixDiagnosticMacAyeal(); + break; ++ case AdjointHorizAnalysisEnum: ++ Ke=CreateKMatrixAdjointMacAyeal(); ++ break; + case DiagnosticHutterAnalysisEnum: + Ke=CreateKMatrixDiagnosticHutter(); + break; +@@ -3062,7 +3065,7 @@ + return pe; + } + /*}}}*/ +-/*FUNCTION Tria::CreateJacobianDiagnosticPattyn{{{1*/ ++/*FUNCTION Tria::CreateJacobianDiagnosticMacayeal{{{1*/ + ElementMatrix* Tria::CreateJacobianDiagnosticMacayeal(void){ + + /*Constants*/ +@@ -3863,7 +3866,7 @@ + rheologyb_input->GetInputDerivativeValue(&dp[0],&xyz_list[0][0],gauss); + + /*Tikhonov regularization: J = 1/2 ((dp/dx)^2 + (dp/dy)^2) */ +- //Jelem+=weight*1/2*(pow(dp[0],2.)+pow(dp[1],2.))*Jdet*gauss->weight; ++ Jelem+=weight*1/2*(pow(dp[0],2.)+pow(dp[1],2.))*Jdet*gauss->weight; + } + + /*Clean up and return*/ +@@ -4735,7 +4738,7 @@ + drag_input->GetInputDerivativeValue(&dp[0],&xyz_list[0][0],gauss); + + /*Tikhonov regularization: J = 1/2 ((dp/dx)^2 + (dp/dy)^2) */ +- //Jelem+=weight*1/2*(pow(dp[0],2.)+pow(dp[1],2.))*Jdet*gauss->weight; ++ Jelem+=weight*1/2*(pow(dp[0],2.)+pow(dp[1],2.))*Jdet*gauss->weight; + } + + /*Clean up and return*/ +@@ -4765,6 +4768,76 @@ + return Ke; + } + /*}}}*/ ++/*FUNCTION Tria::CreateKMatrixAdjointMacAyeal{{{1*/ ++ElementMatrix* Tria::CreateKMatrixAdjointMacAyeal(void){ ++ ++ /*Constants*/ ++ const int numdof=NDOF2*NUMVERTICES; ++ ++ /*Intermediaries */ ++ int i,j,ig; ++ bool incomplete_adjoint; ++ double xyz_list[NUMVERTICES][3]; ++ double Jdet,thickness; ++ double eps1dotdphii,eps1dotdphij; ++ double eps2dotdphii,eps2dotdphij; ++ double mu_prime; ++ double epsilon[3];/* epsilon=[exx,eyy,exy];*/ ++ double eps1[2],eps2[2]; ++ double phi[NUMVERTICES]; ++ double dphi[2][NUMVERTICES]; ++ GaussTria *gauss=NULL; ++ ++ /*Initialize Jacobian with regular MacAyeal (first part of the Gateau derivative)*/ ++ parameters->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); ++ ElementMatrix* Ke=CreateKMatrixDiagnosticMacAyeal(); ++ if(incomplete_adjoint) return Ke; ++ ++ /*Retrieve all inputs and parameters*/ ++ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); ++ ++ /* Start looping on the number of gaussian points: */ ++ gauss=new GaussTria(2); ++ for (ig=gauss->begin();igend();ig++){ ++ ++ gauss->GaussPoint(ig); ++ ++ GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss); ++ GetNodalFunctionsDerivatives(&dphi[0][0],&xyz_list[0][0],gauss); ++ ++ thickness_input->GetInputValue(&thickness, gauss); ++ this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); ++ matice->GetViscosity2dDerivativeEpsSquare(&mu_prime,&epsilon[0]); ++ eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; ++ eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; ++ ++ for(i=0;i<3;i++){ ++ for(j=0;j<3;j++){ ++ eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]; ++ eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]; ++ eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]; ++ eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]; ++ ++ Ke->values[6*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps1dotdphii; ++ Ke->values[6*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps1dotdphii; ++ Ke->values[6*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*thickness*eps1dotdphij*eps2dotdphii; ++ Ke->values[6*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*thickness*eps2dotdphij*eps2dotdphii; ++ } ++ } ++ } ++ ++ /*Transform Coordinate System*/ ++ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); ++ ++ /*Clean up and return*/ ++ delete gauss; ++ //Ke->Transpose(); ++ return Ke; ++} ++/*}}}*/ + /*FUNCTION Tria::InputUpdateFromSolutionAdjointHoriz {{{1*/ + void Tria::InputUpdateFromSolutionAdjointHoriz(double* solution){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11447) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11448) +@@ -216,6 +216,7 @@ + + #ifdef _HAVE_CONTROL_ + ElementMatrix* CreateKMatrixAdjointBalancethickness(void); ++ ElementMatrix* CreateKMatrixAdjointMacAyeal(void); + ElementVector* CreatePVectorAdjointHoriz(void); + ElementVector* CreatePVectorAdjointStokes(void); + ElementVector* CreatePVectorAdjointBalancethickness(void); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11447) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11448) +@@ -584,9 +584,12 @@ + /*Just branch to the correct element stiffness matrix generator, according to the type of analysis we are carrying out: */ + switch(analysis_type){ + #ifdef _HAVE_DIAGNOSTIC_ +- case DiagnosticHorizAnalysisEnum: case AdjointHorizAnalysisEnum: ++ case DiagnosticHorizAnalysisEnum: + Ke=CreateKMatrixDiagnosticHoriz(); De=CreateDVectorDiagnosticHoriz(); + break; ++ case AdjointHorizAnalysisEnum: ++ Ke=CreateKMatrixAdjointHoriz(); ++ break; + case DiagnosticHutterAnalysisEnum: + Ke=CreateKMatrixDiagnosticHutter(); + break; +@@ -4442,6 +4445,196 @@ + ((ControlInput*)input)->SetGradient(grad_input); + + }/*}}}*/ ++/*FUNCTION Penta::CreateKMatrixAdjointHoriz{{{1*/ ++ElementMatrix* Penta::CreateKMatrixAdjointHoriz(void){ ++ ++ int approximation; ++ inputs->GetInputValue(&approximation,ApproximationEnum); ++ ++ switch(approximation){ ++ case MacAyealApproximationEnum: ++ return CreateKMatrixAdjointMacAyeal2d(); ++ case PattynApproximationEnum: ++ return CreateKMatrixAdjointPattyn(); ++ case StokesApproximationEnum: ++ return CreateKMatrixAdjointStokes(); ++ case NoneApproximationEnum: ++ return NULL; ++ default: ++ _error_("Approximation %s not supported yet",EnumToStringx(approximation)); ++ } ++} ++/*}}}*/ ++/*FUNCTION Penta::CreateKMatrixAdjointMacAyeal2d{{{1*/ ++ElementMatrix* Penta::CreateKMatrixAdjointMacAyeal2d(void){ ++ ++ /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the ++ bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build ++ the stiffness matrix. */ ++ if (!IsOnBed()) return NULL; ++ ++ /*Depth Averaging B*/ ++ this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum,MaterialsEnum); ++ ++ /*Call Tria function*/ ++ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. ++ ElementMatrix* Ke=tria->CreateKMatrixAdjointMacAyeal(); ++ delete tria->matice; delete tria; ++ ++ /*Delete B averaged*/ ++ this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum); ++ ++ /*clean up and return*/ ++ return Ke; ++} ++/*}}}*/ ++/*FUNCTION Penta::CreateKMatrixAdjointPattyn{{{1*/ ++ElementMatrix* Penta::CreateKMatrixAdjointPattyn(void){ ++ ++ /*Constants*/ ++ const int numdof=NDOF2*NUMVERTICES; ++ ++ /*Intermediaries */ ++ int i,j,ig; ++ bool incomplete_adjoint; ++ double xyz_list[NUMVERTICES][3]; ++ double Jdet; ++ double eps1dotdphii,eps1dotdphij; ++ double eps2dotdphii,eps2dotdphij; ++ double mu_prime; ++ double epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ ++ double eps1[3],eps2[3]; ++ double phi[NUMVERTICES]; ++ double dphi[3][NUMVERTICES]; ++ GaussPenta *gauss=NULL; ++ ++ /*Initialize Jacobian with regular Pattyn (first part of the Gateau derivative)*/ ++ parameters->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); ++ ElementMatrix* Ke=CreateKMatrixDiagnosticPattyn(); ++ if(incomplete_adjoint) return Ke; ++ ++ /*Retrieve all inputs and parameters*/ ++ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ ++ /* Start looping on the number of gaussian points: */ ++ gauss=new GaussPenta(5,5); ++ for (ig=gauss->begin();igend();ig++){ ++ ++ gauss->GaussPoint(ig); ++ ++ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); ++ GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); ++ ++ this->GetStrainRate3dPattyn(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); ++ matice->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); ++ eps1[0]=2*epsilon[0]+epsilon[1]; eps2[0]=epsilon[2]; ++ eps1[1]=epsilon[2]; eps2[1]=epsilon[0]+2*epsilon[1]; ++ eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; ++ ++ for(i=0;i<6;i++){ ++ for(j=0;j<6;j++){ ++ eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; ++ eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; ++ eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; ++ eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; ++ ++ Ke->values[12*(2*i+0)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+0)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; ++ Ke->values[12*(2*i+1)+2*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; ++ Ke->values[12*(2*i+1)+2*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; ++ } ++ } ++ } ++ ++ /*Transform Coordinate System*/ ++ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYEnum); ++ ++ /*Clean up and return*/ ++ delete gauss; ++ return Ke; ++} ++/*}}}*/ ++/*FUNCTION Penta::CreateKMatrixAdjointStokes{{{1*/ ++ElementMatrix* Penta::CreateKMatrixAdjointStokes(void){ ++ ++ /*Constants*/ ++ const int numdof=NDOF4*NUMVERTICES; ++ ++ /*Intermediaries */ ++ int i,j,ig; ++ bool incomplete_adjoint; ++ double xyz_list[NUMVERTICES][3]; ++ double Jdet; ++ double eps1dotdphii,eps1dotdphij; ++ double eps2dotdphii,eps2dotdphij; ++ double eps3dotdphii,eps3dotdphij; ++ double mu_prime; ++ double epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ ++ double eps1[3],eps2[3],eps3[3]; ++ double phi[NUMVERTICES]; ++ double dphi[3][NUMVERTICES]; ++ GaussPenta *gauss=NULL; ++ ++ /*Initialize Jacobian with regular Stokes (first part of the Gateau derivative)*/ ++ parameters->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); ++ ElementMatrix* Ke=CreateKMatrixDiagnosticStokes(); ++ if(incomplete_adjoint) return Ke; ++ ++ /*Retrieve all inputs and parameters*/ ++ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); ++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); ++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); ++ Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); ++ ++ /* Start looping on the number of gaussian points: */ ++ gauss=new GaussPenta(5,5); ++ for (ig=gauss->begin();igend();ig++){ ++ ++ gauss->GaussPoint(ig); ++ ++ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); ++ GetNodalFunctionsP1Derivatives(&dphi[0][0],&xyz_list[0][0],gauss); ++ ++ this->GetStrainRate3dPattyn(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); ++ matice->GetViscosityDerivativeEpsSquare(&mu_prime,&epsilon[0]); ++ eps1[0]=epsilon[0]; eps2[0]=epsilon[2]; eps3[0]=epsilon[3]; ++ eps1[1]=epsilon[2]; eps2[1]=epsilon[1]; eps3[1]=epsilon[4]; ++ eps1[2]=epsilon[3]; eps2[2]=epsilon[4]; eps3[2]= -epsilon[0] -epsilon[1]; ++ ++ for(i=0;i<6;i++){ ++ for(j=0;j<6;j++){ ++ eps1dotdphii=eps1[0]*dphi[0][i]+eps1[1]*dphi[1][i]+eps1[2]*dphi[2][i]; ++ eps1dotdphij=eps1[0]*dphi[0][j]+eps1[1]*dphi[1][j]+eps1[2]*dphi[2][j]; ++ eps2dotdphii=eps2[0]*dphi[0][i]+eps2[1]*dphi[1][i]+eps2[2]*dphi[2][i]; ++ eps2dotdphij=eps2[0]*dphi[0][j]+eps2[1]*dphi[1][j]+eps2[2]*dphi[2][j]; ++ eps3dotdphii=eps3[0]*dphi[0][i]+eps3[1]*dphi[1][i]+eps3[2]*dphi[2][i]; ++ eps3dotdphij=eps3[0]*dphi[0][j]+eps3[1]*dphi[1][j]+eps3[2]*dphi[2][j]; ++ ++ Ke->values[numdof*(4*i+0)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps1dotdphii; ++ Ke->values[numdof*(4*i+0)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps1dotdphii; ++ Ke->values[numdof*(4*i+0)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps1dotdphii; ++ ++ Ke->values[numdof*(4*i+1)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps2dotdphii; ++ Ke->values[numdof*(4*i+1)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps2dotdphii; ++ Ke->values[numdof*(4*i+1)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps2dotdphii; ++ ++ Ke->values[numdof*(4*i+2)+4*j+0]+=gauss->weight*Jdet*2*mu_prime*eps1dotdphij*eps3dotdphii; ++ Ke->values[numdof*(4*i+2)+4*j+1]+=gauss->weight*Jdet*2*mu_prime*eps2dotdphij*eps3dotdphii; ++ Ke->values[numdof*(4*i+2)+4*j+2]+=gauss->weight*Jdet*2*mu_prime*eps3dotdphij*eps3dotdphii; ++ } ++ } ++ } ++ ++ /*Transform Coordinate System*/ ++ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYZPEnum); ++ ++ /*Clean up and return*/ ++ delete gauss; ++ return Ke; ++} ++/*}}}*/ + /*FUNCTION Penta::CreatePVectorAdjointHoriz{{{1*/ + ElementVector* Penta::CreatePVectorAdjointHoriz(void){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11447) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11448) +@@ -215,6 +215,7 @@ + ElementMatrix* CreateKMatrixCouplingMacAyealStokesFriction(void); + ElementMatrix* CreateKMatrixCouplingPattynStokes(void); + ElementMatrix* CreateKMatrixDiagnosticHoriz(void); ++ ElementMatrix* CreateKMatrixAdjointHoriz(void); + ElementVector* CreateDVectorDiagnosticHoriz(void); + ElementVector* CreateDVectorDiagnosticStokes(void); + ElementMatrix* CreateKMatrixDiagnosticHutter(void); +@@ -274,6 +275,9 @@ + + #ifdef _HAVE_CONTROL_ + ElementVector* CreatePVectorAdjointHoriz(void); ++ ElementMatrix* CreateKMatrixAdjointMacAyeal2d(void); ++ ElementMatrix* CreateKMatrixAdjointPattyn(void); ++ ElementMatrix* CreateKMatrixAdjointStokes(void); + ElementVector* CreatePVectorAdjointMacAyeal(void); + ElementVector* CreatePVectorAdjointPattyn(void); + ElementVector* CreatePVectorAdjointStokes(void); Index: /issm/oecreview/Archive/11431-11450/ISSM-11448-11449.diff =================================================================== --- /issm/oecreview/Archive/11431-11450/ISSM-11448-11449.diff (revision 11515) +++ /issm/oecreview/Archive/11431-11450/ISSM-11448-11449.diff (revision 11515) @@ -0,0 +1,36 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive525.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive526.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive338.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive523.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive339.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive340.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive429.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive430.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive524.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11431-11450/ISSM-11449-11450.diff =================================================================== --- /issm/oecreview/Archive/11431-11450/ISSM-11449-11450.diff (revision 11515) +++ /issm/oecreview/Archive/11431-11450/ISSM-11449-11450.diff (revision 11515) @@ -0,0 +1,36 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive525.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive526.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive338.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive523.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive339.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive340.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive429.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive430.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/Archives/Archive524.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: /issm/oecreview/Archive/11431-11450/ISSM-DocReview-11431-11450.tex =================================================================== --- /issm/oecreview/Archive/11431-11450/ISSM-DocReview-11431-11450.tex (revision 11515) +++ /issm/oecreview/Archive/11431-11450/ISSM-DocReview-11431-11450.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11431-11450/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11431-11450/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11431-11450/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11431-11450 Index: /issm/oecreview/Archive/11431-11450/Makefile =================================================================== --- /issm/oecreview/Archive/11431-11450/Makefile (revision 11515) +++ /issm/oecreview/Archive/11431-11450/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11431-11450 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11431-11450/log.tex =================================================================== --- /issm/oecreview/Archive/11431-11450/log.tex (revision 11515) +++ /issm/oecreview/Archive/11431-11450/log.tex (revision 11515) @@ -0,0 +1,38 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11431-11432.diff: \\ Function name: \\A /issm/trunk-jpl/ar-lib M /issm/trunk-jpl/configure.ac A /issm/trunk-jpl/m4/ar-lib.m4 \\ Export determination: 6. \\Rationale: Added ar-lib macro in configure.ac + added new cl and cccl compiler. The new ar-lib macro is useful to compile on win7 using cygwin, to make sure automake does not use ar and ranlib to create a library, but rather lib.exe +D /issm/trunk-jpl/ar-lib Deleteing symlink, to replace it later \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11432-11433.diff: \\ Function name: \\D /issm/trunk-jpl/ar-lib \\ Export determination: 6. \\Rationale: Deleteing symlink, to replace it later +A /issm/trunk-jpl/ar-lib Coming from automake 1.11.3 \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11433-11434.diff: \\ Function name: \\A /issm/trunk-jpl/ar-lib \\ Export determination: 6. \\Rationale: Coming from automake 1.11.3 +M /issm/trunk-jpl/externalpackages/cccl Ignore install directory \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11434-11435.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/cccl \\ Export determination: 6. \\Rationale: Ignore install directory +M /issm/trunk-jpl/src/mex M /issm/trunk-jpl/src/mex/Makefile.am Missing MEXLIB for compile on Windows machines + changed some properties to ignore byproducts of windows compile \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11435-11436.diff: \\ Function name: \\M /issm/trunk-jpl/src/mex M /issm/trunk-jpl/src/mex/Makefile.am \\ Export determination: 6. \\Rationale: Missing MEXLIB for compile on Windows machines + changed some properties to ignore byproducts of windows compile +M /issm/trunk-jpl/src/c/intel-compile.sh Some update on intel compilation file. Probably obsolete. Will move it to scripts section \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11436-11437.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/intel-compile.sh \\ Export determination: 6. \\Rationale: Some update on intel compilation file. Probably obsolete. Will move it to scripts section +A /issm/trunk-jpl/scripts/intel-compile.sh (from /issm/trunk-jpl/src/c/intel-compile.sh:11436) D /issm/trunk-jpl/src/c/intel-compile.sh Obsolete \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11437-11438.diff: \\ Function name: \\A /issm/trunk-jpl/scripts/intel-compile.sh (from /issm/trunk-jpl/src/c/intel-compile.sh:11436) D /issm/trunk-jpl/src/c/intel-compile.sh \\ Export determination: 6. \\Rationale: Obsolete +M /issm/trunk-jpl/bin Ignore .mexw64 windows mex files. \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11438-11439.diff: \\ Function name: \\M /issm/trunk-jpl/bin \\ Export determination: 6. \\Rationale: Ignore .mexw64 windows mex files. +A /issm/trunk-jpl/configs/config-win7.sh New configuration file for win7 platform \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11439-11440.diff: \\ Function name: \\A /issm/trunk-jpl/configs/config-win7.sh \\ Export determination: 6. \\Rationale: New configuration file for win7 platform +M /issm/trunk-jpl/etc/environment.sh M /issm/trunk-jpl/etc/environment\_variables.sh Added cccl compiler wrapper to Microsoft Visual Studio cl.exe compiler. \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11440-11441.diff: \\ Function name: \\M /issm/trunk-jpl/etc/environment.sh M /issm/trunk-jpl/etc/environment\_variables.sh \\ Export determination: 6. \\Rationale: Added cccl compiler wrapper to Microsoft Visual Studio cl.exe compiler. +M /issm/trunk-jpl/configure.ac Changed location of AM\_PROG\_AR macro, so that it can pick up on the intel vendor settings, specifically the values of AR and RANLIB variables \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11441-11442.diff: \\ Function name: \\M /issm/trunk-jpl/configure.ac \\ Export determination: 6. \\Rationale: Changed location of AM\_PROG\_AR macro, so that it can pick up on the intel vendor settings, specifically the values of AR and RANLIB variables +M /issm/trunk-jpl/src/c/Makefile.am Missing CXXFLAGS and CFLAGS from Makefile.am \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11442-11443.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Makefile.am \\ Export determination: 6. \\Rationale: Missing CXXFLAGS and CFLAGS from Makefile.am +M /issm/trunk-jpl/m4/issm\_options.m4 New settings, macros and paths for Win7 compile. \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11443-11444.diff: \\ Function name: \\M /issm/trunk-jpl/m4/issm\_options.m4 \\ Export determination: 6. \\Rationale: New settings, macros and paths for Win7 compile. +M /issm/trunk-jpl/src/c Ignore compile files for win7 build \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11444-11445.diff: \\ Function name: \\M /issm/trunk-jpl/src/c \\ Export determination: 6. \\Rationale: Ignore compile files for win7 build +M /issm/trunk-jpl/src/c/include/typedefs.h NAN and INFINITY for Visual Studio win7 compile \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11445-11446.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/include/typedefs.h \\ Export determination: 6. \\Rationale: NAN and INFINITY for Visual Studio win7 compile +M /issm/trunk-jpl/src/m/classes/inversion.m Added incomplete\_adjoint field \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11446-11447.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/inversion.m \\ Export determination: 6. \\Rationale: Added incomplete\_adjoint field +M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp A /issm/trunk-jpl/src/m/enum/InversionIncompleteAdjointEnum.m Added incomplete\_adjoint flag (1 default for now) \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11447-11448.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp A /issm/trunk-jpl/src/m/enum/InversionIncompleteAdjointEnum.m \\ Export determination: 6. \\Rationale: Added incomplete\_adjoint flag (1 default for now) +M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h Added complete adjoint \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11448-11449.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h \\ Export determination: 6. \\Rationale: Added complete adjoint +M /issm/trunk-jpl/test/Archives/Archive338.mat M /issm/trunk-jpl/test/Archives/Archive339.mat M /issm/trunk-jpl/test/Archives/Archive340.mat M /issm/trunk-jpl/test/Archives/Archive429.mat M /issm/trunk-jpl/test/Archives/Archive430.mat M /issm/trunk-jpl/test/Archives/Archive523.mat M /issm/trunk-jpl/test/Archives/Archive524.mat M /issm/trunk-jpl/test/Archives/Archive525.mat M /issm/trunk-jpl/test/Archives/Archive526.mat CM archive update \\\\ +\noindent \textbf{Change \#19} with diff file ISSM-11449-11450.diff: \\ Function name: \\M /issm/trunk-jpl/test/Archives/Archive338.mat M /issm/trunk-jpl/test/Archives/Archive339.mat M /issm/trunk-jpl/test/Archives/Archive340.mat M /issm/trunk-jpl/test/Archives/Archive429.mat M /issm/trunk-jpl/test/Archives/Archive430.mat M /issm/trunk-jpl/test/Archives/Archive523.mat M /issm/trunk-jpl/test/Archives/Archive524.mat M /issm/trunk-jpl/test/Archives/Archive525.mat M /issm/trunk-jpl/test/Archives/Archive526.mat \\ Export determination: 6. \\Rationale: CM archive update +M /issm/trunk-jpl/test/Archives/Archive338.mat M /issm/trunk-jpl/test/Archives/Archive339.mat M /issm/trunk-jpl/test/Archives/Archive340.mat M /issm/trunk-jpl/test/Archives/Archive429.mat M /issm/trunk-jpl/test/Archives/Archive430.mat M /issm/trunk-jpl/test/Archives/Archive523.mat M /issm/trunk-jpl/test/Archives/Archive524.mat M /issm/trunk-jpl/test/Archives/Archive525.mat M /issm/trunk-jpl/test/Archives/Archive526.mat Try again: CM Archives (updated branch) \\\\ Index: /issm/oecreview/Archive/11431-11450/r1.tex =================================================================== --- /issm/oecreview/Archive/11431-11450/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11431-11450/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11431 Index: /issm/oecreview/Archive/11431-11450/r2.tex =================================================================== --- /issm/oecreview/Archive/11431-11450/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11431-11450/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11450 Index: /issm/oecreview/Archive/11451-11470/Date.tex =================================================================== --- /issm/oecreview/Archive/11451-11470/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11451-11470/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11451-11470/ISSM-11452-11453.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11452-11453.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11452-11453.diff (revision 11515) @@ -0,0 +1,34 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmdir.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmdir.m (revision 11452) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmdir.m (revision 11453) +@@ -4,7 +4,11 @@ + % Usage: + % ISSM_DIR=issmdir() + +-ISSM_DIR =getenv('ISSM_DIR'); ++if ~ispc, ++ ISSM_DIR =getenv('ISSM_DIR'); ++else ++ ISSM_DIR =getenv('ISSM_DIR_WIN'); ++end + + if (isempty(ISSM_DIR)), + error('issmdir error message: ''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmtier.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmtier.m (revision 11452) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmtier.m (revision 11453) +@@ -4,7 +4,11 @@ + % Usage: + % ISSM_TIER=issmtier() + +-ISSM_TIER =getenv('ISSM_TIER'); ++if ~ispc, ++ ISSM_TIER =getenv('ISSM_TIER'); ++else ++ ISSM_TIER =getenv('ISSM_TIER_WIN'); ++end + + if (isempty(ISSM_TIER)), + error('issmdir error message: ''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!'); Index: /issm/oecreview/Archive/11451-11470/ISSM-11453-11454.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11453-11454.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11453-11454.diff (revision 11515) @@ -0,0 +1,19 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.m (revision 11453) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.m (revision 11454) +@@ -10,8 +10,12 @@ + % clear the last warning to focus on the warnings of the ISSM path + lastwarn(''); + +-%Recover ISSM_TIER +-ISSM_TIER=getenv('ISSM_TIER'); ++%Recover ISSM_TIER , or if on a Windows machine, ISSM_TIER_WIN ++if ~ispc, ++ ISSM_TIER=getenv('ISSM_TIER'); ++else ++ ISSM_TIER=getenv('ISSM_TIER_WIN'); ++end + if (isempty(ISSM_TIER)), + error('issmdir error message: ''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!'); + end Index: /issm/oecreview/Archive/11451-11470/ISSM-11454-11455.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11454-11455.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11454-11455.diff (revision 11515) @@ -0,0 +1,15 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11454) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11455) +@@ -130,6 +130,10 @@ + largearrays=yes + fi + ;; ++ *cygwin*) ++ largearrays=yes ++ ;; ++ + *darwin*) + if test $MATLAB_MAJOR -ge 7; then + if test $MATLAB_MINOR -ge 10; then Index: /issm/oecreview/Archive/11451-11470/ISSM-11455-11456.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11455-11456.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11455-11456.diff (revision 11515) @@ -0,0 +1,74 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/autoconf/autoconf-2.63.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/autoconf/install.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/autoconf/install.sh (revision 11455) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/autoconf/install.sh (revision 11456) +@@ -1,16 +1,16 @@ + #!/bin/bash + + #Some cleanup +-rm -rf install autoconf-2.63 src ++rm -rf install autoconf-2.68 src + + #Create install directories + mkdir install + + #Untar +-tar -zxvf autoconf-2.63.tar.gz ++tar -zxvf autoconf-2.68.tar.gz + + #Move autoconf into src directory +-mv autoconf-2.63 src ++mv autoconf-2.68 src + + #Compile autoconf + cd src +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/autoconf/autoconf-2.68.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/autoconf/autoconf-2.68.tar.gz +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/automake/automake-1.10.2.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/automake/install.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/automake/install.sh (revision 11455) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/automake/install.sh (revision 11456) +@@ -1,14 +1,14 @@ + #!/bin/bash + + #Some cleanup +-rm -rf install automake-1.10.2 src ++rm -rf install automake-1.11.3 src + + #Create install directories + mkdir install + + #Untar +-tar -zxvf automake-1.10.2.tar.gz +-mv automake-1.10.2 src ++tar -zxvf automake-1.11.3.tar.gz ++mv automake-1.11.3 src + + #Compile automake + cd src +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/automake/automake-1.11.3.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/automake/automake-1.11.3.tar.gz +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + Index: /issm/oecreview/Archive/11451-11470/ISSM-11456-11457.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11456-11457.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11456-11457.diff (revision 11515) @@ -0,0 +1,20 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11456) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11457) +@@ -75,13 +75,14 @@ + dnl mex -v gives all the flags for compilation of mex files + dnl if matlab version is 7.10 or more, we must use mexmaci64 (64 bits) + MEXLINK="-O -Wl,-flat_namespace -undefined suppress -arch i386 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map" ++ MEXLIB=" mexversion.o -L$MATLAB_ROOT/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims" + if test $MATLAB_MAJOR -ge 7; then + if test $MATLAB_MINOR -ge 10; then + MEXLINK="-O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci64/mexFunction.map" ++ MEXLIB=" -L$MATLAB_ROOT/bin/maci64/ -lmx -lmex -lmat -lstdc++" + fi + fi + +- MEXLIB=" mexversion.o -L$MATLAB_ROOT/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims" + MEXEXT=`$MATLAB_ROOT/bin/mexext` + MEXEXT=".$MEXEXT" + Index: /issm/oecreview/Archive/11451-11470/ISSM-11457-11458.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11457-11458.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11457-11458.diff (revision 11515) @@ -0,0 +1,20 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11457) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11458) +@@ -859,6 +859,7 @@ + export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc" + export AR=lib + export RANLIB=true ++ OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + elif test $VENDOR = intel-linux; then + export CC=icc + export CXX=icpc +@@ -873,6 +874,7 @@ + AC_MSG_ERROR([unknow compiler vendor!]) + fi + fi ++ AC_SUBST([OSLIBS]) + AC_MSG_RESULT(done) + dnl }}} + dnl with-steadystate{{{1 Index: /issm/oecreview/Archive/11451-11470/ISSM-11458-11459.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11458-11459.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11458-11459.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-win7.sh (revision 11458) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-win7.sh (revision 11459) +@@ -1,6 +1,5 @@ + #!/bin/sh + + +-#get configure.sh to pick up the intel compiler +- +-./configure --prefix=$ISSM_TIER --with-parallel=no --with-vendor=intel-win7 --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER_WIN/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER_WIN/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER_WIN/externalpackages/petsc/install --with-petsc-arch=$ISSM_ARCH --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/ ++#get configure.sh to pick up the win7 Visual Studio compiler ++./configure --prefix=$ISSM_TIER --with-vendor=intel-win7 --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER_WIN/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER_WIN/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER_WIN/externalpackages/petsc/install --with-petsc-arch=$ISSM_ARCH --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/ --with-mpi-lib=$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib --with-mpi-include=$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni Index: /issm/oecreview/Archive/11451-11470/ISSM-11459-11460.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11459-11460.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11459-11460.diff (revision 11515) @@ -0,0 +1,42 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11459) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11460) +@@ -184,6 +184,8 @@ + ./shared/Numerics/GaussPoints.h\ + ./shared/Numerics/GaussPoints.cpp\ + ./shared/Numerics/cross.cpp\ ++ ./shared/Numerics/isnan.h\ ++ ./shared/Numerics/isnan.cpp\ + ./shared/Numerics/extrema.cpp\ + ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\ + ./shared/Numerics/UnitConversion.cpp\ +@@ -742,8 +744,6 @@ + ./shared/Threads/issm_threads.h\ + ./shared/Threads/LaunchThread.cpp\ + ./shared/Threads/PartitionRange.cpp\ +- ./shared/Numerics/isnan.h\ +- ./shared/Numerics/isnan.cpp\ + ./shared/Exp/exp.h\ + ./shared/Exp/IsInPoly.cpp\ + ./shared/Exp/IsInPolySerial.cpp\ +@@ -914,15 +914,15 @@ + if NOPARALLEL + bin_PROGRAMS = + else +-bin_PROGRAMS = issm.exe ++bin_PROGRAMS = issm + endif + + #Standard libraries + LDADD = ./libpISSM.a ./libOverload.a + + #External packages +-LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADIC2LIB) ++LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADIC2LIB) $(OSLIBS) + +-issm_exe_SOURCES = solutions/issm.cpp +-issm_exe_CXXFLAGS= -fPIC -D_PARALLEL_ $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) ++issm_SOURCES = solutions/issm.cpp ++issm_CXXFLAGS= -fPIC -D_PARALLEL_ $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) + #}}} Index: /issm/oecreview/Archive/11451-11470/ISSM-11460-11461.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11460-11461.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11460-11461.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/issm/cccl +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/issm/cccl (revision 11460) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/cccl/issm/cccl (revision 11461) +@@ -83,7 +83,7 @@ + shift + done + +-echo "salope $prog $opts" ++echo "$prog $opts" + exec $prog $opts + exit 0 + Index: /issm/oecreview/Archive/11451-11470/ISSM-11462-11463.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11462-11463.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11462-11463.diff (revision 11515) @@ -0,0 +1,10 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11462) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11463) +@@ -1,4 +1,5 @@ + INCLUDES = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@ ++EXEEXT=$(ISSMEXT) + + #Library declaration {{{1 + #Compile serial library, and then try and compile parallel library Index: /issm/oecreview/Archive/11451-11470/ISSM-11463-11464.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11463-11464.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11463-11464.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11463) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/m4/issm_options.m4 (revision 11464) +@@ -28,6 +28,8 @@ + AC_MSG_CHECKING(for parallel compilation) + AM_CONDITIONAL([NOPARALLEL], [test $PARALLEL_VALUE = no]) + AC_MSG_RESULT($PARALLEL_VALUE) ++ ISSMEXT=".exe" ++ AC_SUBST([ISSMEXT]) + dnl }}} + dnl Serial or Parallel check {{{1 + dnl Check that at least serial or parallel builds have been requested! Index: /issm/oecreview/Archive/11451-11470/ISSM-11464-11465.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11464-11465.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11464-11465.diff (revision 11515) @@ -0,0 +1,22 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 11464) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 11465) +@@ -112,7 +112,7 @@ + KSPSetOperators(ksp,Kff,Kff,DIFFERENT_NONZERO_PATTERN); + KSPSetFromOptions(ksp); + +- #if defined(_SERIAL_) && _PETSC_VERSION_==3 ++ #if defined(_SERIAL_) && _PETSC_MAJOR_==3 + /*Specific solver?: */ + KSPGetPC(ksp,&pc); + if (solver_type==MUMPSPACKAGE_LU){ +@@ -120,7 +120,7 @@ + } + #endif + +- #if defined(_PARALLEL_) && _PETSC_VERSION_==3 ++ #if defined(_PARALLEL_) && _PETSC_MAJOR_==3 + /*Stokes: */ + if (solver_type==StokesSolverEnum){ + /*Make indices out of doftypes: */ Index: /issm/oecreview/Archive/11451-11470/ISSM-11465-11466.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11465-11466.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11465-11466.diff (revision 11515) @@ -0,0 +1,116 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 11465) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 11466) +@@ -107,6 +107,16 @@ + #endif + #endif + /*}}}*/ ++ /*Check the solver is available: {{{1*/ ++ if(solver_type==MUMPSPACKAGE_LU || solver_type==MUMPSPACKAGE_CHOL){ ++ #if _PETSC_MAJOR_ >=3 ++ #ifndef _HAVE_MUMPS_ ++ _error_("requested MUMPS solver, which was not compiled into ISSM!\n"); ++ #endif ++ ++ #endif ++ } ++ /*}}}*/ + /*Prepare solver:{{{1*/ + KSPCreate(MPI_COMM_WORLD,&ksp); + KSPSetOperators(ksp,Kff,Kff,DIFFERENT_NONZERO_PATTERN); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp (revision 11465) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp (revision 11466) +@@ -48,6 +48,18 @@ + if (strcmp(option,"superlu_dist")==0){ + solver_type=SUPERLUDISTPACKAGE; + } ++ if (strcmp(option,"")==0){ ++ solver_type=SUPERLUDISTPACKAGE; ++ } ++ ++ ++ #if _PETSC_MAJOR_ >= 3 ++ PetscOptionsGetString(PETSC_NULL,"-pc_factor_mat_solver_package",&option[0],100,&flag); ++ if (strcmp(option,"mumps")==0){ ++ solver_type=MUMPSPACKAGE_LU; ++ } ++ #endif ++ + + PetscOptionsGetString(PETSC_NULL,"-issm_option_solver",&option[0],100,&flag); + if (strcmp(option,"stokes")==0){ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/ismumps.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/ismumps.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/ismumps.m (revision 11466) +@@ -0,0 +1,33 @@ ++function flag=ismumps() ++%ISMUMPS - figure out if MUMPS package was compiled with ISSM ++% ++% Usage: ++% flag=ismumps(); ++ ++ ++configfile=[issmtier() '/config.h']; ++if ~exist(configfile,'file'), ++ error(['File ' configfile ' not found. ISSM has not been configured yet!']); ++end ++ ++%go through the file, and recover the line we want ++flag=2; ++fid=fopen(configfile,'r'); ++if(fid==-1), error(['could not open file: ' configfile]); end ++ ++while(true), ++ tline=fgets(fid); ++ if ~ischar(tline), break, end ++ if strncmp(tline,'/* #undef _HAVE_MUMPS_ */',25), ++ flag=0; ++ break; ++ end ++ if strncmp(tline,'#define _HAVE_MUMPS_',20), ++ flag=1; ++ break; ++ end ++end ++fclose(fid); ++if flag==2, ++ error('could not determine whether MUMPS was or was not compiled'); ++end +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/model.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/model.m (revision 11465) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/model.m (revision 11466) +@@ -403,7 +403,11 @@ + md.verbose = verbose('solution',true,'qmu',true,'control',true); + md.settings = settings(); + md.solver = solver(); +- md.solver = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions); ++ if ismumps, ++ md.solver = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions); ++ else ++ md.solver = addoptions(md.solver,DiagnosticVertAnalysisEnum,iluasmoptions); ++ end + md.cluster = none(); + md.balancethickness = balancethickness(); + md.diagnostic = diagnostic(); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m (revision 11465) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/solver.m (revision 11466) +@@ -26,7 +26,11 @@ + function obj = setdefaultparameters(obj) % {{{ + + %MUMPS is the default solver +- obj.options={'NoneAnalysis',mumpsoptions}; ++ if ismumps, ++ obj.options={'NoneAnalysis',mumpsoptions}; ++ else ++ obj.options={'NoneAnalysis',iluasmoptions}; ++ end + + end % }}} + function obj = addoptions(obj,analysis,solveroptions) % {{{1 Index: /issm/oecreview/Archive/11451-11470/ISSM-11468-11469.diff =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-11468-11469.diff (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-11468-11469.diff (revision 11515) @@ -0,0 +1,30 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 11468) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 11469) +@@ -126,7 +126,11 @@ + /*Specific solver?: */ + KSPGetPC(ksp,&pc); + if (solver_type==MUMPSPACKAGE_LU){ ++ #if _PETSC_MINOR_==1 + PCFactorSetMatSolverPackage(pc,MAT_SOLVER_MUMPS); ++ #else ++ PCFactorSetMatSolverPackage(pc,MATSOLVERMUMPS); ++ #endif + } + #endif + +@@ -139,8 +143,13 @@ + + /*Set field splits: */ + KSPGetPC(ksp,&pc); ++ #if _PETSC_MINOR_==1 + PCFieldSplitSetIS(pc,isv); + PCFieldSplitSetIS(pc,isp); ++ #else ++ PCFieldSplitSetIS(pc,PETSC_NULL,isv); ++ PCFieldSplitSetIS(pc,PETSC_NULL,isp); ++ #endif + + } + #endif Index: /issm/oecreview/Archive/11451-11470/ISSM-DocReview-11451-11470.tex =================================================================== --- /issm/oecreview/Archive/11451-11470/ISSM-DocReview-11451-11470.tex (revision 11515) +++ /issm/oecreview/Archive/11451-11470/ISSM-DocReview-11451-11470.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11451-11470/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11451-11470/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11451-11470/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11451-11470 Index: /issm/oecreview/Archive/11451-11470/Makefile =================================================================== --- /issm/oecreview/Archive/11451-11470/Makefile (revision 11515) +++ /issm/oecreview/Archive/11451-11470/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11451-11470 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11451-11470/log.tex =================================================================== --- /issm/oecreview/Archive/11451-11470/log.tex (revision 11515) +++ /issm/oecreview/Archive/11451-11470/log.tex (revision 11515) @@ -0,0 +1,30 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11451-11452.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/test430.m \\ Export determination: 6. \\Rationale: update tolerance \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11452-11453.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/utils/Shell/issmdir.m M /issm/trunk-jpl/src/m/utils/Shell/issmtier.m \\ Export determination: 6. \\Rationale: Rely on Windows style paths for these shell dependent routines \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11453-11454.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/utils/Shell/issmdir.m M /issm/trunk-jpl/src/m/utils/Shell/issmtier.m \\ Export determination: 6. \\Rationale: Rely on Windows style paths for these shell dependent routines +M /issm/trunk-jpl/startup.m Rely on Windows style paths for these shell dependent routines \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11454-11455.diff: \\ Function name: \\M /issm/trunk-jpl/startup.m \\ Export determination: 6. \\Rationale: Rely on Windows style paths for these shell dependent routines +M /issm/trunk-jpl/m4/issm\_options.m4 Large array compile for Win7 platforms: assumes 64 bits \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11455-11456.diff: \\ Function name: \\M /issm/trunk-jpl/m4/issm\_options.m4 \\ Export determination: 6. \\Rationale: Large array compile for Win7 platforms: assumes 64 bits +D /issm/trunk-jpl/externalpackages/autoconf/autoconf-2.63.tar.gz A /issm/trunk-jpl/externalpackages/autoconf/autoconf-2.68.tar.gz M /issm/trunk-jpl/externalpackages/autoconf/install.sh D /issm/trunk-jpl/externalpackages/automake/automake-1.10.2.tar.gz A /issm/trunk-jpl/externalpackages/automake/automake-1.11.3.tar.gz M /issm/trunk-jpl/externalpackages/automake/install.sh updateing automake and autoconf to avoid error messages on some machine and potentially use the new enable-silent-rulesoption (Cmake like compilation) \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11456-11457.diff: \\ Function name: \\D /issm/trunk-jpl/externalpackages/autoconf/autoconf-2.63.tar.gz A /issm/trunk-jpl/externalpackages/autoconf/autoconf-2.68.tar.gz M /issm/trunk-jpl/externalpackages/autoconf/install.sh D /issm/trunk-jpl/externalpackages/automake/automake-1.10.2.tar.gz A /issm/trunk-jpl/externalpackages/automake/automake-1.11.3.tar.gz M /issm/trunk-jpl/externalpackages/automake/install.sh \\ Export determination: 6. \\Rationale: updateing automake and autoconf to avoid error messages on some machine and potentially use the new enable-silent-rulesoption (Cmake like compilation) +M /issm/trunk-jpl/m4/issm\_options.m4 FIxing compilation for mac mexmaci64 (wrong path and mexversion.o undefined) \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11457-11458.diff: \\ Function name: \\M /issm/trunk-jpl/m4/issm\_options.m4 \\ Export determination: 6. \\Rationale: FIxing compilation for mac mexmaci64 (wrong path and mexversion.o undefined) +M /issm/trunk-jpl/m4/issm\_options.m4 Added parallel compile for windows + kernel libraries for win7 compile \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11458-11459.diff: \\ Function name: \\M /issm/trunk-jpl/m4/issm\_options.m4 \\ Export determination: 6. \\Rationale: Added parallel compile for windows + kernel libraries for win7 compile +M /issm/trunk-jpl/configs/config-win7.sh Configuration changes for parallel compile of issm on Windows platforms with 1 cpu \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11459-11460.diff: \\ Function name: \\M /issm/trunk-jpl/configs/config-win7.sh \\ Export determination: 6. \\Rationale: Configuration changes for parallel compile of issm on Windows platforms with 1 cpu +M /issm/trunk-jpl/src/c/Makefile.am Renamed executable in Makefile.am form issm.exe to issm, because autotools should pick up the extension. Also added isnan function from serial to core routines \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11460-11461.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Makefile.am \\ Export determination: 6. \\Rationale: Renamed executable in Makefile.am form issm.exe to issm, because autotools should pick up the extension. Also added isnan function from serial to core routines +M /issm/trunk-jpl/externalpackages/cccl/issm/cccl Minor \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11461-11462.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/cccl/issm/cccl \\ Export determination: 6. \\Rationale: Minor \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11462-11463.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Makefile.am \\ Export determination: 6. \\Rationale: Added ISSMEXT for the nightly runs tonight \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11463-11464.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Makefile.am \\ Export determination: 6. \\Rationale: Added ISSMEXT for the nightly runs tonight +M /issm/trunk-jpl/m4/issm\_options.m4 Added ISSMEXT for the nightly runs tonight \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11464-11465.diff: \\ Function name: \\M /issm/trunk-jpl/m4/issm\_options.m4 \\ Export determination: 6. \\Rationale: Added ISSMEXT for the nightly runs tonight +M /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp Fixed bug in use of PETSC\_VERSION (which does not exist) and PETSC\_MAJOR macros. Hard to believe this was never caught. \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11465-11466.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp \\ Export determination: 6. \\Rationale: Fixed bug in use of PETSC\_VERSION (which does not exist) and PETSC\_MAJOR macros. Hard to believe this was never caught. +M /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp M /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp M /issm/trunk-jpl/src/m/classes/model/model.m M /issm/trunk-jpl/src/m/classes/solver.m A /issm/trunk-jpl/src/m/utils/OS/ismumps.m Fixed issues with the MUMPS solver. Up to now, we never checked that the MUMPS solver had been compiled. Now added this check in Solverx.cpp. Also worked on the default solvers if MUMPS is not available -> solver.m and model.m and ismumps.m \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11466-11467.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp M /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp M /issm/trunk-jpl/src/m/classes/model/model.m M /issm/trunk-jpl/src/m/classes/solver.m A /issm/trunk-jpl/src/m/utils/OS/ismumps.m \\ Export determination: 6. \\Rationale: Fixed issues with the MUMPS solver. Up to now, we never checked that the MUMPS solver had been compiled. Now added this check in Solverx.cpp. Also worked on the default solvers if MUMPS is not available -> solver.m and model.m and ismumps.m \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11468-11469.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp \\ Export determination: 6. \\Rationale: Fixed compilation for PETSc 3.2 (MATSOLVERMUMPS + PCFieldSplit) \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11469-11470.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp \\ Export determination: 6. \\Rationale: Fixed compilation for PETSc 3.2 (MATSOLVERMUMPS + PCFieldSplit) +D /issm/trunk-jpl/src/m/utils/Enum Not needed anymore \\\\ Index: /issm/oecreview/Archive/11451-11470/r1.tex =================================================================== --- /issm/oecreview/Archive/11451-11470/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11451-11470/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11451 Index: /issm/oecreview/Archive/11451-11470/r2.tex =================================================================== --- /issm/oecreview/Archive/11451-11470/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11451-11470/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11470 Index: /issm/oecreview/Archive/11471-11490/Date.tex =================================================================== --- /issm/oecreview/Archive/11471-11490/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11471-11490/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11471-11490/ISSM-11471-11472.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11471-11472.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11471-11472.diff (revision 11515) @@ -0,0 +1,16043 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/solutions/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/solutions ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/solutions ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/solutions ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/solutions/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/solutions/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/model/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/model ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/model ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/model ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/model/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/model/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Basins/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Basins ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Basins ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Basins ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Basins/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Basins/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/ImageProcessing/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/ImageProcessing ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/ImageProcessing ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/ImageProcessing ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/ImageProcessing/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/ImageProcessing/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/OS/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/OS ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/OS ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/OS ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/OS/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/OS/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Cluster/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Cluster ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Cluster ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Cluster ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Cluster/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Cluster/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Analysis/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Analysis ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Analysis ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Analysis ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Analysis/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Analysis/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Kml/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Kml ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Kml ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Kml ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Kml/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Kml/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/BC/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/BC ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/BC ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/BC ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/BC/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/BC/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Numerics/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Numerics ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Numerics ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Numerics ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Numerics/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Numerics/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Math/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Math ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Math ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Math ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Math/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Math/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Geometry/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Geometry ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Geometry ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Geometry ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Geometry/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Geometry/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Mesh/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Mesh ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Mesh ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Mesh ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Mesh/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Mesh/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Ecco3/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Ecco3 ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Ecco3 ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Ecco3 ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Ecco3/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Ecco3/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Exp/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Exp ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Exp ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Exp ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Exp/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Exp/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Model/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Model ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Model ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Model ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Model/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Model/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/LatLong/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/LatLong ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/LatLong ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/LatLong ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/LatLong/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/LatLong/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Interp/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Interp ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Interp ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Interp ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Interp/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Interp/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/consistency/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/consistency ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/consistency ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/consistency ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/consistency/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/consistency/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/qmu/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/qmu ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/qmu ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/qmu ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/qmu/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/qmu/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Miscellaneous/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Miscellaneous ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Miscellaneous ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Miscellaneous ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Miscellaneous/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Miscellaneous/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Meca/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Meca ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Meca ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Meca ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Meca/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Meca/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/DataProcessing/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/DataProcessing ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/DataProcessing ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/DataProcessing ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/DataProcessing/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/DataProcessing/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/String/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/String ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/String ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/String ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/String/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/String/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Shell/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Shell ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Shell ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Shell ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Shell/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Shell/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile.am (revision 11472) +@@ -0,0 +1,2 @@ ++SUBDIRS = Analysis Array BC Basins Cluster DataProcessing Ecco3 Exp Geometry ImageProcessing Interp Kml LatLong Math Meca Mesh Miscellaneous Model Numerics OS Plot Shell String consistency qmu ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile (revision 11472) +@@ -0,0 +1,558 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++SUBDIRS = Analysis Array BC Basins Cluster DataProcessing Ecco3 Exp Geometry ImageProcessing Interp Kml LatLong Math Meca Mesh Miscellaneous Model Numerics OS Plot Shell String consistency qmu ++bin_SCRIPTS = *.m ++all: all-recursive ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-recursive ++all-am: Makefile $(SCRIPTS) ++installdirs: installdirs-recursive ++installdirs-am: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-recursive ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-recursive ++ ++install-info: install-info-recursive ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic ctags \ ++ ctags-recursive distclean distclean-generic distclean-tags \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-binSCRIPTS install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ++ uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Array/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Array ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Array ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Array ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Array/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Array/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/utils/Plot/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/utils/Plot ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Plot ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Plot ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Plot/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/utils/Plot/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/qmu/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/qmu ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/qmu ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/qmu ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/qmu/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/qmu/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/kml/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/kml ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/kml ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/kml ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/kml/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/kml/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/planet/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/planet ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/planet ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/planet ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/planet/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/planet/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/enum/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/enum ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/enum ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/enum ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/enum/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/enum/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/shared/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/shared ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/shared ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/shared ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/shared/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/shared/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++SUBDIRS = classes enum kml model planet qmu shared solutions solvers utils +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile (revision 11472) +@@ -0,0 +1,530 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../ ++top_builddir = ../.. ++top_srcdir = ../.. ++SUBDIRS = classes enum kml model planet qmu shared solutions solvers utils ++all: all-recursive ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-recursive ++all-am: Makefile ++installdirs: installdirs-recursive ++installdirs-am: ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-recursive ++ ++install-exec-am: ++ ++install-html: install-html-recursive ++ ++install-info: install-info-recursive ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic ctags \ ++ ctags-recursive distclean distclean-generic distclean-tags \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ ++ tags-recursive uninstall uninstall-am ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile (revision 11472) +@@ -0,0 +1,558 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/classes/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/classes ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/classes ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/classes ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++SUBDIRS = @pairoptions @modellist ++bin_SCRIPTS = *.m ++all: all-recursive ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/classes/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/classes/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++ ++# This directory's subdirectories are mostly independent; you can cd ++# into them and run `make' without going through this Makefile. ++# To change the values of `make' variables: instead of editing Makefiles, ++# (1) if the variable is set in `config.status', edit `config.status' ++# (which will cause the Makefiles to be regenerated when you run `make'); ++# (2) otherwise, pass the desired values on the `make' command line. ++$(RECURSIVE_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ dot_seen=yes; \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done; \ ++ if test "$$dot_seen" = "no"; then \ ++ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ++ fi; test -z "$$fail" ++ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ ++ dot_seen=no; \ ++ case "$@" in \ ++ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ++ *) list='$(SUBDIRS)' ;; \ ++ esac; \ ++ rev=''; for subdir in $$list; do \ ++ if test "$$subdir" = "."; then :; else \ ++ rev="$$subdir $$rev"; \ ++ fi; \ ++ done; \ ++ rev="$$rev ."; \ ++ target=`echo $@ | sed s/-recursive//`; \ ++ for subdir in $$rev; do \ ++ echo "Making $$target in $$subdir"; \ ++ if test "$$subdir" = "."; then \ ++ local_target="$$target-am"; \ ++ else \ ++ local_target="$$target"; \ ++ fi; \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ || eval $$failcom; \ ++ done && test -z "$$fail" ++tags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ done ++ctags-recursive: ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ++ include_option=--etags-include; \ ++ empty_fix=.; \ ++ else \ ++ include_option=--include; \ ++ empty_fix=; \ ++ fi; \ ++ list='$(SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test ! -f $$subdir/TAGS || \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ fi; \ ++ done; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ ++ || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ ++ distdir) \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-recursive ++all-am: Makefile $(SCRIPTS) ++installdirs: installdirs-recursive ++installdirs-am: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-recursive ++install-exec: install-exec-recursive ++install-data: install-data-recursive ++uninstall: uninstall-recursive ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-recursive ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-recursive ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-recursive ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic distclean-tags ++ ++dvi: dvi-recursive ++ ++dvi-am: ++ ++html: html-recursive ++ ++info: info-recursive ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-recursive ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-recursive ++ ++install-info: install-info-recursive ++ ++install-man: ++ ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-recursive ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-recursive ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-recursive ++ ++pdf-am: ++ ++ps: ps-recursive ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip ++ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic ctags \ ++ ctags-recursive distclean distclean-generic distclean-tags \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-binSCRIPTS install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ++ uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile.am (revision 11472) +@@ -0,0 +1,2 @@ ++classesdir=$(bindir)/@modellist ++classes_DATA=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile (revision 11472) +@@ -0,0 +1,404 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/classes/@modellist/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/classes/@modellist ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(classesdir)" ++classesDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(classes_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@modellist ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@modellist ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++classesdir = $(bindir)/@modellist ++classes_DATA = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/classes/@modellist/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/classes/@modellist/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-classesDATA: $(classes_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(classesdir)" || $(MKDIR_P) "$(DESTDIR)$(classesdir)" ++ @list='$(classes_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(classesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(classesdir)/$$f'"; \ ++ $(classesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(classesdir)/$$f"; \ ++ done ++ ++uninstall-classesDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(classes_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(classesdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(classesdir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(classesdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-classesDATA ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-classesDATA ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-classesDATA install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-classesDATA ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile.am (revision 11472) +@@ -0,0 +1,2 @@ ++classesdir=$(bindir)/@pairoptions ++classes_DATA=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile (revision 11472) +@@ -0,0 +1,404 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/classes/@pairoptions/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/classes/@pairoptions ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(classesdir)" ++classesDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(classes_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@pairoptions ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@pairoptions ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../../ ++top_builddir = ../../../.. ++top_srcdir = ../../../.. ++classesdir = $(bindir)/@pairoptions ++classes_DATA = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/classes/@pairoptions/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/classes/@pairoptions/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-classesDATA: $(classes_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(classesdir)" || $(MKDIR_P) "$(DESTDIR)$(classesdir)" ++ @list='$(classes_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(classesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(classesdir)/$$f'"; \ ++ $(classesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(classesdir)/$$f"; \ ++ done ++ ++uninstall-classesDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(classes_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(classesdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(classesdir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(classesdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-classesDATA ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-classesDATA ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-classesDATA install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-classesDATA ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile.am (revision 11472) +@@ -0,0 +1,2 @@ ++SUBDIRS = @pairoptions @modellist ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile.am (revision 11472) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile (revision 11472) +@@ -0,0 +1,399 @@ ++# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# src/m/solvers/Makefile. Generated from Makefile.in by configure. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++ ++pkgdatadir = $(datadir)/issm ++pkglibdir = $(libdir)/issm ++pkgincludedir = $(includedir)/issm ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = i386-apple-darwin11.2.0 ++host_triplet = i386-apple-darwin11.2.0 ++target_triplet = i386-apple-darwin11.2.0 ++subdir = src/m/solvers ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ ++ $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__installdirs = "$(DESTDIR)$(bindir)" ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 ++ADIC2INCL = ++ADIC2LIB = ++AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar ++AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf ++AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader ++AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 ++AWK = awk ++BLACSINCL = ++BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs ++BLASLAPACKINCL = ++BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas ++CC = gcc ++CCDEPMODE = depmode=gcc3 ++CFLAGS = -g -O2 ++CHACOINCL = ++CHACOLIB = ++CPP = gcc -E ++CPPFLAGS = ++CXX = g++ ++CXXDEPMODE = depmode=gcc3 ++CXXFLAGS = -g -O2 ++CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w ++CYGPATH_W = echo ++DAKOTAINCL = ++DAKOTALIB = ++DEFS = -DHAVE_CONFIG_H ++DEPDIR = .deps ++ECHO_C = ++ECHO_N = -n ++ECHO_T = ++EXEEXT = ++F77 = gfortran ++FFLAGS = -g -O2 ++FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm ++FORTRANLIB = /usr/local/lib/libgfortran.a ++GRAPHICSLIB = /usr/X11/lib/libX11.dylib ++HYPREINCL = ++HYPRELIB = ++INSTALL = /usr/bin/install -c ++INSTALL_DATA = ${INSTALL} -m 644 ++INSTALL_PROGRAM = ${INSTALL} ++INSTALL_SCRIPT = ${INSTALL} ++INSTALL_STRIP_PROGRAM = $(install_sh) -c -s ++LDFLAGS = ++LIBOBJS = ++LIBS = ++LTLIBOBJS = ++MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo ++MATHLIB = /usr/lib/libm.dylib ++MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install ++MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include ++MATLAB_MAJOR = 7 ++MATLAB_MINOR = 10 ++MATLAB_VERSION = R2010a ++METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib ++METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis ++MEX = ++MEXEXT = .mexmaci64 ++MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims ++MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map ++MKDIR_P = ../../.././install-sh -c -d ++MKLINCL = ++MKLLIB = ++MLINCL = ++MLLIB = ++MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ ++MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a ++MULTITHREADINGLIB = -lpthread ++MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include ++MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis ++OBJEXT = o ++PACKAGE = issm ++PACKAGE_BUGREPORT = issm@jpl.nasa.gov ++PACKAGE_NAME = ISSM ++PACKAGE_STRING = ISSM 4.0 ++PACKAGE_TARNAME = issm ++PACKAGE_VERSION = 4.0 ++PATH_SEPARATOR = : ++PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ ++PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc ++PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ ++PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK ++RANLIB = ranlib ++ROSEINCL = ++ROSELIB = ++SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack ++SCOTCHINCL = ++SCOTCHLIB = ++SET_MAKE = ++SHAPELIBINCL = ++SHAPELIBLIB = ++SHELL = /bin/sh ++SLEPCINCL = ++SLEPCLIB = ++STRIP = ++TAOINCL = ++TAOLIB = ++TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ ++TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a ++VERSION = 4.0 ++XMKMF = ++X_CFLAGS = ++X_EXTRA_LIBS = ++X_LIBS = -L/usr/X11/lib -R/usr/X11/lib ++X_PRE_LIBS = -lSM -lICE ++abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/solvers ++abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/solvers ++abs_top_builddir = /Users/larour/issm-uci/trunk-jpl ++abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl ++ac_ct_CC = gcc ++ac_ct_CXX = g++ ++ac_ct_F77 = gfortran ++am__include = include ++am__leading_dot = . ++am__quote = ++am__tar = ${AMTAR} chof - "$$tardir" ++am__untar = ${AMTAR} xf - ++bindir = ${exec_prefix}/bin ++build = i386-apple-darwin11.2.0 ++build_alias = ++build_cpu = i386 ++build_os = darwin11.2.0 ++build_vendor = apple ++builddir = . ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} ++dvidir = ${docdir} ++exec_prefix = ${prefix} ++host = i386-apple-darwin11.2.0 ++host_alias = ++host_cpu = i386 ++host_os = darwin11.2.0 ++host_vendor = apple ++htmldir = ${docdir} ++includedir = ${prefix}/include ++infodir = ${datarootdir}/info ++install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh ++libdir = ${exec_prefix}/lib ++libexecdir = ${exec_prefix}/libexec ++localedir = ${datarootdir}/locale ++localstatedir = ${prefix}/var ++mandir = ${datarootdir}/man ++mkdir_p = $(top_builddir)/./install-sh -c -d ++oldincludedir = /usr/include ++pdfdir = ${docdir} ++prefix = /Users/larour/issm-uci//trunk-jpl ++program_transform_name = s,x,x, ++psdir = ${docdir} ++sbindir = ${exec_prefix}/sbin ++sharedstatedir = ${prefix}/com ++srcdir = . ++sysconfdir = ${prefix}/etc ++target = i386-apple-darwin11.2.0 ++target_alias = ++target_cpu = i386 ++target_os = darwin11.2.0 ++target_vendor = apple ++top_build_prefix = ../../../ ++top_builddir = ../../.. ++top_srcdir = ../../.. ++bin_SCRIPTS = *.m ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/solvers/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/m/solvers/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binSCRIPTS: $(bin_SCRIPTS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f $$d$$p; then \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-binSCRIPTS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_SCRIPTS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(SCRIPTS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-dvi: install-dvi-am ++ ++install-exec-am: install-binSCRIPTS ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-binSCRIPTS ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic distclean \ ++ distclean-generic distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binSCRIPTS install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: Index: /issm/oecreview/Archive/11471-11490/ISSM-11472-11473.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11472-11473.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11472-11473.diff (revision 11515) @@ -0,0 +1,91 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/Makefile.am (revision 11472) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/Makefile.am (revision 11473) +@@ -1,5 +1,5 @@ +-EXTRA_DIST = m perl pro +-SUBDIRS = c mex ++EXTRA_DIST = perl pro ++SUBDIRS = c mex m + + if ADIC2 + SUBDIRS += ad +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 11472) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 11473) +@@ -19,6 +19,45 @@ + src/c/Makefile + src/ad/Makefile + src/mex/Makefile ++ src/m/Makefile ++ src/m/classes/Makefile ++ src/m/classes/@modellist/Makefile ++ src/m/classes/@pairoptions/Makefile ++ src/m/enum/Makefile ++ src/m/kml/Makefile ++ src/m/model/Makefile ++ src/m/planet/Makefile ++ src/m/qmu/Makefile ++ src/m/shared/Makefile ++ src/m/solutions/Makefile ++ src/m/solvers/Makefile ++ src/m/utils/Makefile ++ src/m/utils/Analysis/Makefile ++ src/m/utils/Array/Makefile ++ src/m/utils/BC/Makefile ++ src/m/utils/Basins/Makefile ++ src/m/utils/Cluster/Makefile ++ src/m/utils/DataProcessing/Makefile ++ src/m/utils/Ecco3/Makefile ++ src/m/utils/Exp/Makefile ++ src/m/utils/Geometry/Makefile ++ src/m/utils/ImageProcessing/Makefile ++ src/m/utils/Interp/Makefile ++ src/m/utils/Kml/Makefile ++ src/m/utils/LatLong/Makefile ++ src/m/utils/Math/Makefile ++ src/m/utils/Meca/Makefile ++ src/m/utils/Mesh/Makefile ++ src/m/utils/Miscellaneous/Makefile ++ src/m/utils/Model/Makefile ++ src/m/utils/Numerics/Makefile ++ src/m/utils/OS/Makefile ++ src/m/utils/Plot/Makefile ++ src/m/utils/Shell/Makefile ++ src/m/utils/String/Makefile ++ src/m/utils/consistency/Makefile ++ src/m/utils/qmu/Makefile + bin/Makefile]) + AC_OUTPUT + ++ + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/bin +___________________________________________________________________ +Modified: svn:ignore + - *.mexa64 +*.mexw64 +Makefile +Makefile.in +issm.exe + + + *.mexa64 +*.mexw64 +Makefile +Makefile.in +issm.exe +*.m +*.h +@pairoptions +@modellist + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/Makefile.am (revision 11472) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/Makefile.am (revision 11473) +@@ -1,2 +1,3 @@ + EXTRA_DIST = reconf scripts test INSTALLICE LICENSE m4 examples cron etc doc packages ChangeLogCielo ChangeLogIce contributors.txt run READMEICE startup.m startup.m startup.m startup.m todo MakefileIce + SUBDIRS = src bin ++bin_SCRIPTS=config.h startup.m Index: /issm/oecreview/Archive/11471-11490/ISSM-11473-11474.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11473-11474.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11473-11474.diff (revision 11515) @@ -0,0 +1,15824 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/Makefile (revision 11474) +@@ -1,530 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../ +-top_builddir = ../.. +-top_srcdir = ../.. +-SUBDIRS = classes enum kml model planet qmu shared solutions solvers utils +-all: all-recursive +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-# This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- dot_seen=yes; \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done; \ +- if test "$$dot_seen" = "no"; then \ +- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +- fi; test -z "$$fail" +- +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- rev="$$rev ."; \ +- target=`echo $@ | sed s/-recursive//`; \ +- for subdir in $$rev; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done && test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done +- +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +- include_option=--etags-include; \ +- empty_fix=.; \ +- else \ +- include_option=--include; \ +- empty_fix=; \ +- fi; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ +- fi; \ +- done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-recursive +-all-am: Makefile +-installdirs: installdirs-recursive +-installdirs-am: +-install: install-recursive +-install-exec: install-exec-recursive +-install-data: install-data-recursive +-uninstall: uninstall-recursive +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-recursive +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-recursive +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-recursive +- -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-tags +- +-dvi: dvi-recursive +- +-dvi-am: +- +-html: html-recursive +- +-info: info-recursive +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-recursive +- +-install-exec-am: +- +-install-html: install-html-recursive +- +-install-info: install-info-recursive +- +-install-man: +- +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-recursive +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-recursive +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-recursive +- +-pdf-am: +- +-ps: ps-recursive +- +-ps-am: +- +-uninstall-am: +- +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip +- +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am check check-am clean clean-generic ctags \ +- ctags-recursive distclean distclean-generic distclean-tags \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-dvi \ +- install-dvi-am install-exec install-exec-am install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ +- tags-recursive uninstall uninstall-am +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/solutions/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/solutions +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/solutions +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/solutions +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/solutions/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/solutions/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/model/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/model +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/model +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/model +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/model/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/model/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Makefile (revision 11474) +@@ -1,558 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-SUBDIRS = Analysis Array BC Basins Cluster DataProcessing Ecco3 Exp Geometry ImageProcessing Interp Kml LatLong Math Meca Mesh Miscellaneous Model Numerics OS Plot Shell String consistency qmu +-bin_SCRIPTS = *.m +-all: all-recursive +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +- +-# This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- dot_seen=yes; \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done; \ +- if test "$$dot_seen" = "no"; then \ +- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +- fi; test -z "$$fail" +- +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- rev="$$rev ."; \ +- target=`echo $@ | sed s/-recursive//`; \ +- for subdir in $$rev; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done && test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done +- +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +- include_option=--etags-include; \ +- empty_fix=.; \ +- else \ +- include_option=--include; \ +- empty_fix=; \ +- fi; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ +- fi; \ +- done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-recursive +-all-am: Makefile $(SCRIPTS) +-installdirs: installdirs-recursive +-installdirs-am: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-recursive +-install-exec: install-exec-recursive +-install-data: install-data-recursive +-uninstall: uninstall-recursive +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-recursive +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-recursive +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-recursive +- -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-tags +- +-dvi: dvi-recursive +- +-dvi-am: +- +-html: html-recursive +- +-info: info-recursive +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-recursive +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-recursive +- +-install-info: install-info-recursive +- +-install-man: +- +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-recursive +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-recursive +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-recursive +- +-pdf-am: +- +-ps: ps-recursive +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip +- +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am check check-am clean clean-generic ctags \ +- ctags-recursive distclean distclean-generic distclean-tags \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-binSCRIPTS install-data install-data-am \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Basins/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Basins +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Basins +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Basins +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Basins/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Basins/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/ImageProcessing/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/ImageProcessing +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/ImageProcessing +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/ImageProcessing +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/ImageProcessing/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/ImageProcessing/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/OS/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/OS +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/OS +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/OS +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/OS/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/OS/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Cluster/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Cluster +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Cluster +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Cluster +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Cluster/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Cluster/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Analysis/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Analysis +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Analysis +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Analysis +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Analysis/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Analysis/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Kml/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Kml +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Kml +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Kml +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Kml/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Kml/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/BC/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/BC +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/BC +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/BC +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/BC/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/BC/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Numerics/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Numerics +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Numerics +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Numerics +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Numerics/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Numerics/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Math/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Math +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Math +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Math +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Math/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Math/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Geometry/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Geometry +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Geometry +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Geometry +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Geometry/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Geometry/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Mesh/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Mesh +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Mesh +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Mesh +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Mesh/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Mesh/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Ecco3/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Ecco3 +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Ecco3 +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Ecco3 +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Ecco3/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Ecco3/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Exp/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Exp +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Exp +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Exp +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Exp/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Exp/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Model/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Model +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Model +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Model +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Model/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Model/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/LatLong/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/LatLong +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/LatLong +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/LatLong +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/LatLong/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/LatLong/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Interp/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Interp +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Interp +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Interp +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Interp/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Interp/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/consistency/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/consistency +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/consistency +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/consistency +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/consistency/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/consistency/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/qmu/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/qmu +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/qmu +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/qmu +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/qmu/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/qmu/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Miscellaneous/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Miscellaneous +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Miscellaneous +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Miscellaneous +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Miscellaneous/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Miscellaneous/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Meca/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Meca +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Meca +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Meca +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Meca/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Meca/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/DataProcessing/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/DataProcessing +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/DataProcessing +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/DataProcessing +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/DataProcessing/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/DataProcessing/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/String/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/String +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/String +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/String +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/String/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/String/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Shell/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Shell +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Shell +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Shell +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Shell/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Shell/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Array/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Array +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Array +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Array +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Array/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Array/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/utils/Plot/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/utils/Plot +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Plot +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/utils/Plot +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/utils/Plot/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/utils/Plot/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/qmu/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/qmu +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/qmu +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/qmu +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/qmu/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/qmu/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/kml/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/kml +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/kml +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/kml +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/kml/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/kml/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/planet/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/planet +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/planet +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/planet +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/planet/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/planet/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/enum/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/enum +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/enum +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/enum +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/enum/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/enum/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/shared/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/shared +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/shared +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/shared +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/shared/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/shared/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile (revision 11474) +@@ -1,558 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/classes/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/classes +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +- html-recursive info-recursive install-data-recursive \ +- install-dvi-recursive install-exec-recursive \ +- install-html-recursive install-info-recursive \ +- install-pdf-recursive install-ps-recursive install-recursive \ +- installcheck-recursive installdirs-recursive pdf-recursive \ +- ps-recursive uninstall-recursive +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/classes +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/classes +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-SUBDIRS = @pairoptions @modellist +-bin_SCRIPTS = *.m +-all: all-recursive +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/classes/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/classes/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +- +-# This directory's subdirectories are mostly independent; you can cd +-# into them and run `make' without going through this Makefile. +-# To change the values of `make' variables: instead of editing Makefiles, +-# (1) if the variable is set in `config.status', edit `config.status' +-# (which will cause the Makefiles to be regenerated when you run `make'); +-# (2) otherwise, pass the desired values on the `make' command line. +-$(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- target=`echo $@ | sed s/-recursive//`; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- dot_seen=yes; \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done; \ +- if test "$$dot_seen" = "no"; then \ +- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +- fi; test -z "$$fail" +- +-$(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ +- for f in x $$MAKEFLAGS; do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) failcom='fail=yes';; \ +- esac; \ +- done; \ +- dot_seen=no; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- rev=''; for subdir in $$list; do \ +- if test "$$subdir" = "."; then :; else \ +- rev="$$subdir $$rev"; \ +- fi; \ +- done; \ +- rev="$$rev ."; \ +- target=`echo $@ | sed s/-recursive//`; \ +- for subdir in $$rev; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done && test -z "$$fail" +-tags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ +- done +-ctags-recursive: +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ +- done +- +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +- include_option=--etags-include; \ +- empty_fix=.; \ +- else \ +- include_option=--include; \ +- empty_fix=; \ +- fi; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ +- fi; \ +- done; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi +-ctags: CTAGS +-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-recursive +-all-am: Makefile $(SCRIPTS) +-installdirs: installdirs-recursive +-installdirs-am: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-recursive +-install-exec: install-exec-recursive +-install-data: install-data-recursive +-uninstall: uninstall-recursive +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-recursive +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-recursive +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-recursive +- -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-tags +- +-dvi: dvi-recursive +- +-dvi-am: +- +-html: html-recursive +- +-info: info-recursive +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-recursive +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-recursive +- +-install-info: install-info-recursive +- +-install-man: +- +-install-pdf: install-pdf-recursive +- +-install-ps: install-ps-recursive +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-recursive +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-recursive +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-recursive +- +-pdf-am: +- +-ps: ps-recursive +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip +- +-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ +- all all-am check check-am clean clean-generic ctags \ +- ctags-recursive distclean distclean-generic distclean-tags \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-binSCRIPTS install-data install-data-am \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist/Makefile (revision 11474) +@@ -1,404 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/classes/@modellist/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/classes/@modellist +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(classesdir)" +-classesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(classes_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@modellist +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@modellist +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-classesdir = $(bindir)/@modellist +-classes_DATA = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/classes/@modellist/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/classes/@modellist/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-classesDATA: $(classes_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(classesdir)" || $(MKDIR_P) "$(DESTDIR)$(classesdir)" +- @list='$(classes_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(classesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(classesdir)/$$f'"; \ +- $(classesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(classesdir)/$$f"; \ +- done +- +-uninstall-classesDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(classes_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(classesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(classesdir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(DATA) +-installdirs: +- for dir in "$(DESTDIR)$(classesdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: install-classesDATA +- +-install-dvi: install-dvi-am +- +-install-exec-am: +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-classesDATA +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-classesDATA install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-classesDATA +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 11474) +@@ -94,7 +94,7 @@ + fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); + + fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,md.private.runtimename); +- fprintf(fid,'/sopt/mpi/mvapich-1.1/intel/bin/mpiexec -mpich-p4-no-shmem -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); ++ fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); + + if ~md.settings.io_gather, + %concatenate the output files: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions/Makefile (revision 11474) +@@ -1,404 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/classes/@pairoptions/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/classes/@pairoptions +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-SOURCES = +-DIST_SOURCES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(classesdir)" +-classesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(classes_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@pairoptions +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/classes/@pairoptions +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../../ +-top_builddir = ../../../.. +-top_srcdir = ../../../.. +-classesdir = $(bindir)/@pairoptions +-classes_DATA = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/classes/@pairoptions/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/classes/@pairoptions/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-classesDATA: $(classes_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(classesdir)" || $(MKDIR_P) "$(DESTDIR)$(classesdir)" +- @list='$(classes_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(classesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(classesdir)/$$f'"; \ +- $(classesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(classesdir)/$$f"; \ +- done +- +-uninstall-classesDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(classes_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(classesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(classesdir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(DATA) +-installdirs: +- for dir in "$(DESTDIR)$(classesdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: install-classesDATA +- +-install-dvi: install-dvi-am +- +-install-exec-am: +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-classesDATA +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-classesDATA install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-classesDATA +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile (revision 11473) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers/Makefile (revision 11474) +@@ -1,399 +0,0 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. +-# src/m/solvers/Makefile. Generated from Makefile.in by configure. +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +- +- +- +-pkgdatadir = $(datadir)/issm +-pkglibdir = $(libdir)/issm +-pkgincludedir = $(includedir)/issm +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = i386-apple-darwin11.2.0 +-host_triplet = i386-apple-darwin11.2.0 +-target_triplet = i386-apple-darwin11.2.0 +-subdir = src/m/solvers +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/issm_options.m4 \ +- $(top_srcdir)/m4/matlab.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__installdirs = "$(DESTDIR)$(bindir)" +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +-SCRIPTS = $(bin_SCRIPTS) +-SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-ACLOCAL = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run aclocal-1.10 +-ADIC2INCL = +-ADIC2LIB = +-AMTAR = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run tar +-AUTOCONF = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoconf +-AUTOHEADER = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run autoheader +-AUTOMAKE = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run automake-1.10 +-AWK = awk +-BLACSINCL = +-BLACSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lblacs +-BLASLAPACKINCL = +-BLASLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install -lflapack -lfblas +-CC = gcc +-CCDEPMODE = depmode=gcc3 +-CFLAGS = -g -O2 +-CHACOINCL = +-CHACOLIB = +-CPP = gcc -E +-CPPFLAGS = +-CXX = g++ +-CXXDEPMODE = depmode=gcc3 +-CXXFLAGS = -g -O2 +-CXXOPTFLAGS = -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w +-CYGPATH_W = echo +-DAKOTAINCL = +-DAKOTALIB = +-DEFS = -DHAVE_CONFIG_H +-DEPDIR = .deps +-ECHO_C = +-ECHO_N = -n +-ECHO_T = +-EXEEXT = +-F77 = gfortran +-FFLAGS = -g -O2 +-FLIBS = -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2 -L/usr/local/gfortran/lib/gcc/x86_64-apple-darwin11/4.6.2/../../.. -lgfortran -lquadmath -lm +-FORTRANLIB = /usr/local/lib/libgfortran.a +-GRAPHICSLIB = /usr/X11/lib/libX11.dylib +-HYPREINCL = +-HYPRELIB = +-INSTALL = /usr/bin/install -c +-INSTALL_DATA = ${INSTALL} -m 644 +-INSTALL_PROGRAM = ${INSTALL} +-INSTALL_SCRIPT = ${INSTALL} +-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +-LDFLAGS = +-LIBOBJS = +-LIBS = +-LTLIBOBJS = +-MAKEINFO = ${SHELL} /Users/larour/issm-uci/trunk-jpl/missing --run makeinfo +-MATHLIB = /usr/lib/libm.dylib +-MATLAB = /Users/larour/issm-uci/trunk-jpl/externalpackages/matlab/install +-MATLABINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/include +-MATLAB_MAJOR = 7 +-MATLAB_MINOR = 10 +-MATLAB_VERSION = R2010a +-METISINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/Lib +-METISLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/metis/install/ -lmetis +-MEX = +-MEXEXT = .mexmaci64 +-MEXLIB = mexversion.o -L/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims +-MEXLINK = -O -Wl,-flat_namespace -undefined suppress -bundle -Wl,-exported_symbols_list,/Users/larour/issm-uci//trunk-jpl/externalpackages/matlab/install/extern/lib/maci64/mexFunction.map +-MKDIR_P = ../../.././install-sh -c -d +-MKLINCL = +-MKLLIB = +-MLINCL = +-MLLIB = +-MPIINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/include/ +-MPILIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libpmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpich.a /Users/larour/issm-uci//trunk-jpl/externalpackages/mpich2/install/lib/libmpl.a +-MULTITHREADINGLIB = -lpthread +-MUMPSINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//include +-MUMPSLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install//lib -ldmumps -lcmumps -lmumps_common -lpord -lparmetis +-OBJEXT = o +-PACKAGE = issm +-PACKAGE_BUGREPORT = issm@jpl.nasa.gov +-PACKAGE_NAME = ISSM +-PACKAGE_STRING = ISSM 4.0 +-PACKAGE_TARNAME = issm +-PACKAGE_VERSION = 4.0 +-PATH_SEPARATOR = : +-PETSCINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/macosx-gnu/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/bmake/macosx-gnu -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/src/mat/impls/dense/mpi/plapack/ +-PETSCLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/macosx-gnu/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu/ -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/lib/macosx-gnu -lpetsc +-PLAPACKINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/include/ +-PLAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install/ -lPLAPACK +-RANLIB = ranlib +-ROSEINCL = +-ROSELIB = +-SCALAPACKLIB = -L/Users/larour/issm-uci//trunk-jpl/externalpackages/petsc/install// -lscalapack +-SCOTCHINCL = +-SCOTCHLIB = +-SET_MAKE = +-SHAPELIBINCL = +-SHAPELIBLIB = +-SHELL = /bin/sh +-SLEPCINCL = +-SLEPCLIB = +-STRIP = +-TAOINCL = +-TAOLIB = +-TRIANGLEINCL = -I/Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/ +-TRIANGLELIB = /Users/larour/issm-uci//trunk-jpl/externalpackages/triangle/install/triangle.a +-VERSION = 4.0 +-XMKMF = +-X_CFLAGS = +-X_EXTRA_LIBS = +-X_LIBS = -L/usr/X11/lib -R/usr/X11/lib +-X_PRE_LIBS = -lSM -lICE +-abs_builddir = /Users/larour/issm-uci/trunk-jpl/src/m/solvers +-abs_srcdir = /Users/larour/issm-uci/trunk-jpl/src/m/solvers +-abs_top_builddir = /Users/larour/issm-uci/trunk-jpl +-abs_top_srcdir = /Users/larour/issm-uci/trunk-jpl +-ac_ct_CC = gcc +-ac_ct_CXX = g++ +-ac_ct_F77 = gfortran +-am__include = include +-am__leading_dot = . +-am__quote = +-am__tar = ${AMTAR} chof - "$$tardir" +-am__untar = ${AMTAR} xf - +-bindir = ${exec_prefix}/bin +-build = i386-apple-darwin11.2.0 +-build_alias = +-build_cpu = i386 +-build_os = darwin11.2.0 +-build_vendor = apple +-builddir = . +-datadir = ${datarootdir} +-datarootdir = ${prefix}/share +-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +-dvidir = ${docdir} +-exec_prefix = ${prefix} +-host = i386-apple-darwin11.2.0 +-host_alias = +-host_cpu = i386 +-host_os = darwin11.2.0 +-host_vendor = apple +-htmldir = ${docdir} +-includedir = ${prefix}/include +-infodir = ${datarootdir}/info +-install_sh = $(SHELL) /Users/larour/issm-uci/trunk-jpl/install-sh +-libdir = ${exec_prefix}/lib +-libexecdir = ${exec_prefix}/libexec +-localedir = ${datarootdir}/locale +-localstatedir = ${prefix}/var +-mandir = ${datarootdir}/man +-mkdir_p = $(top_builddir)/./install-sh -c -d +-oldincludedir = /usr/include +-pdfdir = ${docdir} +-prefix = /Users/larour/issm-uci//trunk-jpl +-program_transform_name = s,x,x, +-psdir = ${docdir} +-sbindir = ${exec_prefix}/sbin +-sharedstatedir = ${prefix}/com +-srcdir = . +-sysconfdir = ${prefix}/etc +-target = i386-apple-darwin11.2.0 +-target_alias = +-target_cpu = i386 +-target_os = darwin11.2.0 +-target_vendor = apple +-top_build_prefix = ../../../ +-top_builddir = ../../.. +-top_srcdir = ../../.. +-bin_SCRIPTS = *.m +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/m/solvers/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/m/solvers/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-binSCRIPTS: $(bin_SCRIPTS) +- @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f $$d$$p; then \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-binSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(bin_SCRIPTS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done +-tags: TAGS +-TAGS: +- +-ctags: CTAGS +-CTAGS: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(SCRIPTS) +-installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-exec-am: install-binSCRIPTS +- +-install-html: install-html-am +- +-install-info: install-info-am +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-ps: install-ps-am +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-binSCRIPTS +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic distclean \ +- distclean-generic distdir dvi dvi-am html html-am info info-am \ +- install install-am install-binSCRIPTS install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: Index: /issm/oecreview/Archive/11471-11490/ISSM-11474-11475.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11474-11475.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11474-11475.diff (revision 11515) @@ -0,0 +1,1067 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSMlogo.ico +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = image/x-icon + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSMlogo.ico +___________________________________________________________________ +Added: svn:mime-type + + image/x-icon +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/aic.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/aic.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/aic.sh (revision 11475) +@@ -0,0 +1,38 @@ ++#!/bin/bash ++ ++#get brand new project: ++rm -rf ISSM.aip ISSM-SetupFiles ISSM.msi ++cp ISSM.initial.aip ISSM.aip ++ ++#build list of files to put into the installer: ++rm -rf ISSM.aic ++cat << END > ISSM.aic ++;aic ++SetVersion "1.0" ++SetPackageName "ISSM.msi" ++END ++ ++ls $ISSM_TIER_WIN/bin/*.m $ISSM_TIER_WIN/bin/*.mexw64 $ISSM_TIER_WIN/bin/*.h $ISSM_TIER_WIN/bin/*.exe | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic ++ ++ ++cat << END >> ISSM.aic ++AddFolder PersonalFolder $ISSM_TIER_WIN\test ++AddFolder APPDIR $ISSM_TIER_WIN\bin\@modellist ++AddFolder APPDIR $ISSM_TIER_WIN\bin\@pairoptions ++SetPackageType x64 ++DelEnvironment ISSM_TESTS ++NewEnvironment -name ISSM_TESTS -value [test_Dir] ++DelEnvironment ISSM_TIER ++NewEnvironment -name ISSM_TIER -value [APPDIR] ++DelEnvironment ISSM_TIER_WIN ++NewEnvironment -name ISSM_TIER_WIN -value [APPDIR] ++Save ++Rebuild ++END ++ ++#Run installer: ++"C:/Program Files (x86)/Caphyon/Advanced Installer 8.9/bin/x86/AdvancedInstaller.com" /execute ./ISSM.aip ./ISSM.aic ++ ++#Get rid of temporary files: ++cp ISSM-SetupFiles/ISSM.msi ./ ++rm -rf ISSM.aip ISSM-SetupFiles + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/aic.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.aic +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.aic (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.aic (revision 11475) +@@ -0,0 +1,989 @@ ++;aic ++SetVersion "1.0" ++SetPackageName "ISSM.msi" ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AbsoluteEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AddExternalResult.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointBalancethicknessAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointCorePointerFromSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointHorizAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointpEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AgressiveMigrationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AirEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AnalysisConfiguration.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AnalysisCounterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AnalysisTypeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AreaAverageOntoPartition.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ArrheniusEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AutodiffForwardEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AutodiffIsautodiffEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AutodiffReverseEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AverageFilter.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessSpcthicknessEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessStabilizationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessThickeningRateEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgCall.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgCallFromMetric.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgConvertMesh.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgMesher.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgTriangulate.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalFrictionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalforcingsGeothermalfluxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalforcingsMeltingRateCorrectionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalforcingsMeltingRateEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasinConstrain.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasinConstrainShelf.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BathymetryEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeXAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeXEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeYAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeYEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BilinearInterpEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolElementResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolInputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoundaryEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Chaco.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ClosedEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ColinearEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ComputeBasalStress.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ComputeHessian.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ComputeMetric.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConfigurationTypeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConfigureObjects.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantsGEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantsReferencetemperatureEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantsYtsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstraintsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstraintsState.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ContourToMesh.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ContourToNodes.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputGetGradient.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputScaleGradient.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputSetGradient.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlOptimization.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlSteadyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConvergedEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CorePointerFromSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CostFunction.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateDataBoundaries.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateDataMatrix.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateJacobianMatrix.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateNodalConstraints.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DatasetInputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DepthAverage.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticAbstolEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticHorizAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticHutterAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticIcefrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticIsnewtonEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticMaxiterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticNumRequestedOutputsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticPenaltyFactorEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticReferentialEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticReltolEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRequestedOutputsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRestolEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRiftPenaltyLockEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRiftPenaltyThresholdEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticShelfDampeningEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSpcvxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSpcvyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSpcvzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticStokesreconditioningEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticVertAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticVertexPairingEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticViscosityOvershootEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DofIndexingEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleElementResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleInputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleMatArrayParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleMatExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleMatParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleVecExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleVecParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DragCoefficientAbsGradientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Echo.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementConnectivity.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementsFromEdge.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpyAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpyPicardEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpySolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnumToModelField.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnumToString.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Exp2Kml.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ExtToIuEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FieldFindVarNames.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FileParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FillEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FillHole.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FixMesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlagElements.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlaimAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlaimSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationBordermacayealEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationBorderpattynEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationBorderstokesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationElementEquationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationIshutterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationIsmacayealpattynEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationIsstokesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationVertexEquationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FractionIncrementEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FreeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionCoefficientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionPEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionQEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FsetEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GeometryHydrostaticRatioEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetAreas.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetCharacteristicLength.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetNodalFunctionsCoeff.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetSolutionFromInputs.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetVectorFromInputs.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetVerbosityLevel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradient1Enum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradient2Enum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradient3Enum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GradientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradj.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GroundinglineMeltingRateEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GroundinglineMigration.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GroundinglineMigrationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GsetEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HoleFiller.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HookEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HutterApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyCREnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyKnEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyNEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyPEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyQEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologySolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologySpcwatercolumnEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyStabilizationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyWaterVxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyWaterVyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IceVolumeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IcefrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IncrementalEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IndexEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IndexedEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputControlUpdate.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputConvergence.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputDuplicate.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputScale.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputToResult.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputUpdateFromConstant.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputUpdateFromSolution.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputUpdateFromVector.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntInputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntMatParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntVecParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InternalEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InternalFront.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromFile.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromGridToMesh.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMesh2d.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMeshToGrid.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMeshToMesh2d.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMeshToMesh3d.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntersectEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionControlParametersEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionThresholdEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionsCoefficientsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionGradientOnlyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionGradientScalingEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionIncompleteAdjointEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionIscontrolEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionMaxParametersEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionMaxiterPerStepEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionMinParametersEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionNstepsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionNumControlParametersEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionNumCostFunctionsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionStepThresholdEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionTaoEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionThicknessObsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVelObsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVxObsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVyObsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVzObsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IuToExtEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\JEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\KMLFileRead.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\KMLMeshWrite.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\KMLOverlay.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Kml2Exp.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Ll2xy.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\LoadsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyeal2dIceFrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyeal3dIceFrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyealApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyealPattynApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyealStokesApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskElementonfloatingiceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskElementongroundediceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskElementonwaterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskVertexonfloatingiceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskVertexongroundediceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskVertexonwaterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MassFluxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MassFluxProcessProfile.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsBetaEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsHeatcapacityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsLatentheatEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsMeltingpointEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsMixedLayerCapacityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsMuWaterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyBEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyBbarEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyLawEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyNEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRhoIceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRhoWaterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsThermalExchangeVelocityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsThermalconductivityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaticeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MatlabProcessPatch.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MatparEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxAbsVxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxAbsVyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxAbsVzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxPenetrationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVelEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MelangeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeltingAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeltingGroundingLines.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeltingOffsetEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MergeMetrics.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Mergesolutionfromftog.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshAverageVertexConnectivityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshDimensionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshEdgesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementconnectivityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementonbedEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementonsurfaceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElements2dEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshLowerelementsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofedgesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofelements2dEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofelementsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberoflayersEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofvertices2dEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofverticesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshPartition.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshProfileIntersection.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshQuality.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshUpperelementsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshVertexonbedEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshVertexonsurfaceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshXEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshYEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshZEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVelEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MiscellaneousNameEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MisfitDeinterlace.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MisfitEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ModelProcessor.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ModelUpdateInputsFromVector.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NearestInterpEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NewFemModel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodalEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodeConnectivity.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodeInElement.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodesDof.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NoneAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NoneApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NoneEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NumberNodeToElementConnectivityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NumericalfluxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OldGradientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OpenEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionCellEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionCharEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionDoubleEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionLogicalEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionStructEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Orth.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OutputFilePointerEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OutputResults.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OutputfilenameEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\P0Enum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\P1DGEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\P1Enum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ParametersEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ParsePetscOptions.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchNodesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchToVec.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchVerticesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatersonEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PattynApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PattynIceFrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PattynStokesApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PengridEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PenpairEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PentaEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PentaP1ElementResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PentaP1InputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscMatParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscOptionsAnalysesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscOptionsStringsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscVecExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscVecParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PointCloudFindNeighbors.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PressureEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PressurePicardEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ProcessParams.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ProfileProjectOntoMesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticHydrostaticAdjustmentEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticMinThicknessEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticPenaltyFactorEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticSpcthicknessEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticStabilizationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticVertexPairingEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PropagateFlagsFromConnectivity.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PropagateFlagsUntilDistance.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuBedEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuErrNameEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuInNameEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuIsdakotaEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuMassFluxSegmentsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuMeltingEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuNumberofpartitionsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuNumberofresponsesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuOutNameEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuPartitionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuPressureEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuResponsedescriptorsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuSurfaceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuTemperatureEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuThicknessEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVariabledescriptorsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QueueRequirements.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Reduceload.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Reducevectorgtof.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Reducevectorgtos.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RegularEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RelativeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResetBoundaryConditions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResetCoordinateSystem.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResetPenaltiesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Response.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResultsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RheologyBbarAbsGradientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RiftfrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RiftsNumriftsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RiftsRiftstructEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ScaledEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Scotch.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SectionValues.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegIntersect.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegmentEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegmentOnIceShelfEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegmentRiftfrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SeparateEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetCurrentConfiguration.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetIceSheetBC.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetIceShelfBC.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetMarineIceSheetBC.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetVerbosityLevel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsIoGatherEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsLowmemEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsOutputFrequencyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsResultsAsPatchesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsWaitonlockEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Shp2Kml.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SoftMigrationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SolutionTypeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Solver.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SparseToVector.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpawnCore.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcDynamicEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcNodes.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcStaticEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcTransientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SsetEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateMaxiterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateNumRequestedOutputsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateReltolEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateRequestedOutputsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StepResponsesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StokesApproximationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StokesIceFrontEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StokesSolverEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorxxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorxyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorxzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensoryyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensoryzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorzzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringArrayParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringExternalResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringParamEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringToEnum.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceAbsVelMisfitEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceArea.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceAreaEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceAverageVelMisfitEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceLogVelMisfitEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceLogVxVyMisfitEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceRelVelMisfitEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeXAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeXEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeYAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeYEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceforcingsAblationRateEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceforcingsAccumulationRateEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceforcingsMassBalanceEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SystemMatrices.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TemperatureEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TemperatureOldEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TemperaturePicardEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Test.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalAnalysisEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalIsenthalpyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalMaxiterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalPenaltyFactorEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalPenaltyLockEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalPenaltyThresholdEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalSpctemperatureEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalStabilizationEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessAbsGradientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessAbsMisfitEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessCorrection.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimeAdapt.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingCflCoefficientEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingFinalTimeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingTimeAdaptEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingTimeStepEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TracksToMatrix.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientInputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsdiagnosticEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsgroundinglineEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsprognosticEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsthermalEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientNumRequestedOutputsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientRequestedOutputsEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientSolutionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMesh.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMeshNoDensity.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMeshProcessRifts.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMeshRefine.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaP1ElementResultEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaP1InputEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaSearch.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriangleInterpEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TypeEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\UpdateConstraints.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\UpdateDynamicConstraints.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\UpdateVertexPositions.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VelEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VelFindVarNames.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VelocityEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseControl.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseConvergence.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseMProcessor.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseModule.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseQmu.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseSolution.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseSolver.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VertexEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerticesDof.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerticesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ViscousHeatingEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxAverageEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxMeshEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxPicardEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyAverageEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyMeshEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyPicardEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzMacAyealEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzMeshEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzPattynEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzPicardEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzStokesEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WaterColumnOldEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WaterEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WatercolumnEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WaterfractionEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WriteData.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\XYEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\XYZPEnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Xy2ll.mexw64 ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\YamsCall.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\addnote.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\addtrack.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\adjacency.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\adjointbalancethickness_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\adjointdiagnostic_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\allempty.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\allequal.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\allnan.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\any2str.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\applyoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\argusmesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\array_numel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\array_size.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\arrow.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\asmoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\autodiff.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\averageconnectivity.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\averaging.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\balancethickness.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\balancethickness_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bamg.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bamggeom.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bamgmesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basalforcings.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basalstress.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basevert.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basinzoom.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bedslope.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bedslope_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\carter.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\castor.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\cfl_step.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\checkfield.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\checkmessage.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\checkplotoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\clicktoflowline.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\collapse.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\config.h ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\constants.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\contourenvelope.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\contourmassbalance.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\control_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\controlconvergence.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\convergence.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\cosmos.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\create_region.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_cdfs.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_data.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_params.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_parse.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_m_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_moments.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_out_parse.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_resp_uconv.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\data_processing_tool.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ddeblank.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ddewhite.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\debug.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dewhite.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\diagnostic.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\diagnostic_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\discardnum.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\divergence.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\downstreamflowlines.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\drivingstress.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ecco32issm.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\edgeadjacency.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\edgeperimeter.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\effective_value.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\effectivepressure.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\enthalpy_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\enthalpy_core_step.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\exp2kml.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expandresponses.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expandvariables.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expbox.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expboxgen.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcoarsen.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expconcatenate.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcontract.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcreatecircle.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcreatecontour.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcreateprofile.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcut.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expdisp.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expdoc.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expexcludeoutliers.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expflip.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expgen.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\explink.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expll2xy.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expmaster.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expopen.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\exporientation.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expremovestraightsegments.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expselect.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expsplit.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expsquare.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expswapxy.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\exptool.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expxy2ll.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\extrude.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\fielddisplay.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\fielddisplay2.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\find_point.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\find_string.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\findarg.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\findsegments.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\fixdec.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flagedges.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flaim.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flaim_sol.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flaimdir.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flowequation.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flowlines.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\friction.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\gemini.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\generic.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\geometry.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ginputquick.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\glen_coefficients.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\graddetection.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\gradient_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\gradient_perso.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\greenplanet.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\groundingline.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\hydrology.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\iluasmoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\im_resize.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\imagescnan.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\immerge.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\importancefactors.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\initialization.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\intersections.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\inversion.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\isbasin.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\isconnected.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ismemberi.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ismodelselfconsistent.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ismumps.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\isnans.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issm.exe ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issm.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issm2ecco3.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmbbftpin.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmbbftpout.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmdir.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmprintf.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmscpin.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmscpout.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmssh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmtier.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\item2str.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\jacobiasmoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\jacobicgoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml2exp.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml2expg.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_colorstyle.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_container.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_document.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_feature.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_file_swrite.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_file_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_folder.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_geometry.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_linearring.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_linestring.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_linestyle.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_mesh_elem.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_mesh_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_multigeometry.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_object.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_part_edges.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_part_elems.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_part_flagedges.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_partitions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_placemark.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_polygon.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_polystyle.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_style.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_styleselector.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_substyle.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_unsh_edges.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kmlgroundoverlay.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kmlimagesc.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\latlonoverlay.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\lclist_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\listfiles.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\listfilesparallel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\lithostaticpressure.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ll2xy.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadmodel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadmodellist.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadmultipleresultsfromcluster.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadresultsfromcluster.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadresultsfromdisk.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\logoutput.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\marshall.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mask.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\materials.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\matlaboptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mean_congrid.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mechanicalproperties.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mesh_refine_tri4.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshconvert.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshnodensity.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshread.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshrefine.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\miscellaneous.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\misfit.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\model.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelconsistency.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelextract.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelsextract.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelsextractfromdomains.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelsize.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modis.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mumpsoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\netcdf.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\netcdf2struct.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\nodeconnectivity.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\none.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\northarrow.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\objectivefunctionC.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\organizer.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\oshostname.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\outflow.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parallelrange.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\param_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parametercontrolB.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parametercontroldrag.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parametercontroloptimization.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parameterize.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\pargenerate.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parseresultsfromdisk.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\partitioner.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\paterson.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\petscversion.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\pfe.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\planet.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\planetmixedmesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\planettrimesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot2patch.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_BC.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_basaldrag.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_basins.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_boundaries.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_contour.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_drivingstress.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_edges.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_elementnumbering.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_elementstype.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_gridded.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_highlightelements.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_highlightvertices.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_icefront.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_importancefactors.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_manager.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_mesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_none.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_overlay.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_parthist.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_parthistn.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_parthistw.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_penalties.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmu_mass_flux_segments.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmuhistnorm.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmumean.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmunormplot.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmustddev.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_quiver.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_quiver3.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_referential.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftfraction.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftnumbering.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftpenetration.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftrelvel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_rifts.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftvel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_sarpwr.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_scatter.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_section.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_segments.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_streamlines.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor_components.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor_principal.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor_principalaxis.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_thermaltransient_results.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_transient_field.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_transient_movie.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_transient_results.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_unit.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_vertexnumbering.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotbasins.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotdoc.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotmodel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plugvelocities.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\pollux.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\postqmu.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\preqmu.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\printmodel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\private.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\process_qmu_options.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\process_qmu_response_data.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\process_solve_options.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\processdata.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\processgeometry.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\processmesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\prognostic.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\prognostic_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\project2d.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\project3d.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmu.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmu_correlation.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuisdistributed.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmumarshall.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuname.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuresponse.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuroot.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qpr.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qstat.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\quiver_colorbar.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\quiver_process.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\radaroverlay.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\radarpower.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rebin.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\recover_areas.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\recover_qmu_options.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\recursivepath.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\regionaltransient2d.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rifts.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rifttipsonmesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rlev_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rlist_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rotateticklabel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\round_ice.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\roundmesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\runme.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\scaleruler.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sensitivities.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setcluster.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setflowequation.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setmask.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setmask2.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\settings.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\shear2d.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\showbasins.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\showregion.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sia.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\slope.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solve.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solveparallel.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_adjoint_linear.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_linear.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_newton.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_nonlinear.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_stokescoupling_nonlinear.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_thermal_nonlinear.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\soroptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sphere_project.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sphere_tri.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\squaremesh.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\squarezoom.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\startup.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\steadystate.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\steadystate_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\steadystateconvergence.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\stokesoptions.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\str2int.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_buf.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_cell.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_dim.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_size.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_vec.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\strsplit.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\strsplit_strict.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\struc_class.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\struc_desc.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\structtoobj.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\surfaceforcings.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\surfaceslope_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thermal.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thermal_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thermal_core_step.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thicknessevolution.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\timestepping.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\transient.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\transient_core.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\transp.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\tres.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\triangle.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\utm2ll.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\vector_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\verbose.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\vlist_write.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\waitonlock.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\xy2ll.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\yams.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\zinput.m ++AddFolder PersonalFolder C:/issm-uci/trunk-jpl\test ++AddFolder APPDIR C:/issm-uci/trunk-jpl\bin\@modellist ++AddFolder APPDIR C:/issm-uci/trunk-jpl\bin\@pairoptions ++SetPackageType x64 ++DelEnvironment ISSM_TESTS ++NewEnvironment -name ISSM_TESTS -value [test_Dir] ++DelEnvironment ISSM_TIER ++NewEnvironment -name ISSM_TIER -value [APPDIR] ++DelEnvironment ISSM_TIER_WIN ++NewEnvironment -name ISSM_TIER_WIN -value [APPDIR] ++Save ++Rebuild +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.initial.aip +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/xml + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.initial.aip +___________________________________________________________________ +Added: svn:mime-type + + application/xml +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11471-11490/ISSM-11475-11476.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11475-11476.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11475-11476.diff (revision 11515) @@ -0,0 +1,125 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/README +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/README (revision 11475) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/README (revision 11476) +@@ -1,52 +0,0 @@ +------------------------------------------------------------------------------- +- +-ISSM +-Ice Sheet System Modeling: a framework for modeling ice flow on ice sheet/ice shelf +-systems using Finite Elemenent Analysis, and parallel technologies. +- +------------------------------------------------------------------------------- +- +-Jet Propulsion Laboratory +- +-Eric Eric Larour (Project Lead) +-Mathieu Mathieu Morlighem (Anisotropic Meshing, Control Methods) +-Helene Helene Seroussi (Coupling 2D-3D, Multi-model, full-Stokes) +- +-Email: issm@jpl.nasa.gov +- +------------------------------------------------------------------------------- +-License +- +-ISSM is California Institute of Technology Copyright. +------------------------------------------------------------------------------- +-Overview +- +-More to come +- +-Refer to http://issm.jpl.nasa.gov/ for additional information. +------------------------------------------------------------------------------- +-Distribution +- +-The directories contained in this distribution include: +- +-examples Example problems +- +-externalpackages Other libraries +- +-m4 m4 macros used for supporting autoconf. +- +-doc The Users, Reference, and Developers Manuals are +- maintained here. Other references are available from +- the ISSM Web site (http://issm.jpl.nasa.gov/) +- +-src The main source code repository for the ISSM system. +- +-test Files for regression and unit testing of the ISSM system. +------------------------------------------------------------------------------- +-Installation +- +-The installation procedure uses a standard GNU installation based on autoconf. +-The basic steps are to invoke 'configure' to generate Makefiles for your +-particular system and then invoke 'make' to compile the sources. See the +-INSTALL file for detailed instructions. +------------------------------------------------------------------------------- +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/README.txt +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/README.txt (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/README.txt (revision 11476) +@@ -0,0 +1,63 @@ ++------------------------------------------------------------------------------ ++ ++ISSM ++Ice Sheet System Modeling: a framework for modeling ice flow on ice sheet/ice shelf ++systems using Finite Elemenent Analysis, and parallel technologies. ++ ++------------------------------------------------------------------------------ ++ ++Jet Propulsion Laboratory ++ ++Eric Eric Larour (Project Manager) ++Mathieu Mathieu Morlighem (Core Developer, Anisotropic Meshing, Control Methods) ++Helene Helene Seroussi (Core Develper Coupling 2D-3D, Multi-model, full-Stokes) ++Nicole Nicole Schlegel (Developer, Atmospheric Forcing) ++Chris Christopher Borstad (Developer, Rifting/Faulting/Crack Propagation) ++Feras Feras Habbal (Developer, Solver Technologies) ++Daria Daria Halkides (Analyst, Atmospheric Forcing) ++Ala Ala Khazendar (Analyst, Ice Sheet Processes) ++ ++ ++Email: issm@jpl.nasa.gov ++ ++------------------------------------------------------------------------------ ++ ++Website: ttp://issm.jpl.nasa.gov/ for additional information. ++ ++------------------------------------------------------------------------------ ++ ++License ++ ++ISSM is California Institute of Technology Copyright, Distributed under BSD Three Clause License. ++ ++ ++Copyright (c) 2002-2011, California Institute of Technology. ++All rights reserved. Based on Government Sponsored Research under contracts ++NAS7-1407 and/or NAS7-03001. ++ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++ ++ 1. Redistributions of source code must retain the above copyright notice, ++ this list of conditions and the following disclaimer. ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ 3. Neither the name of the California Institute of Technology (Caltech), ++ its operating division the Jet Propulsion Laboratory (JPL), the National ++ Aeronautics and Space Administration (NASA), nor the names of its ++ contributors may be used to endorse or promote products derived from ++ this software without specific prior written permission. ++ ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE CALIFORNIA INSTITUTE OF TECHNOLOGY BE LIABLE ++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++------------------------------------------------------------------------------ ++ Index: /issm/oecreview/Archive/11471-11490/ISSM-11476-11477.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11476-11477.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11476-11477.diff (revision 11515) @@ -0,0 +1,87 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/README.rtf +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/README.rtf (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/README.rtf (revision 11477) +@@ -0,0 +1,67 @@ ++{\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 Courier New;}} ++{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\lang1033\f0\fs22 ------------------------------------------------------------------------------\par ++\par ++ISSM\par ++Ice Sheet System Modeling: a framework for modeling ice flow on ice sheet/ice shelf\par ++systems using Finite Elemenent Analysis, and parallel technologies.\par ++\par ++------------------------------------------------------------------------------\par ++\par ++Jet Propulsion Laboratory\par ++\par ++Eric Eric Larour (Project Manager)\par ++Mathieu Mathieu Morlighem (Core Developer, Anisotropic Meshing, Control Methods)\par ++Helene Helene Seroussi (Core Develper Coupling 2D-3D, Multi-model, full-Stokes)\par ++Nicole Nicole Schlegel (Developer, Atmospheric Forcing)\par ++Chris Christopher Borstad (Developer, Rifting/Faulting/Crack Propagation)\par ++Feras Feras Habbal (Developer, Solver Technologies)\par ++Daria Daria Halkides (Analyst, Atmospheric Forcing)\par ++Ala Ala Khazendar (Analyst, Ice Sheet Processes)\par ++\par ++\par ++Email: issm@jpl.nasa.gov\par ++\par ++------------------------------------------------------------------------------\par ++\par ++Website: ttp://issm.jpl.nasa.gov/ for additional information.\par ++\par ++------------------------------------------------------------------------------\par ++\par ++License\par ++\par ++ISSM is California Institute of Technology Copyright, Distributed under BSD Three Clause License.\par ++\par ++\par ++Copyright (c) 2002-2011, California Institute of Technology.\par ++All rights reserved. Based on Government Sponsored Research under contracts\par ++NAS7-1407 and/or NAS7-03001.\par ++\par ++Redistribution and use in source and binary forms, with or without\par ++modification, are permitted provided that the following conditions are met:\par ++\par ++ 1. Redistributions of source code must retain the above copyright notice,\par ++ this list of conditions and the following disclaimer.\par ++ 2. Redistributions in binary form must reproduce the above copyright\par ++ notice, this list of conditions and the following disclaimer in the\par ++ documentation and/or other materials provided with the distribution.\par ++ 3. Neither the name of the California Institute of Technology (Caltech),\par ++ its operating division the Jet Propulsion Laboratory (JPL), the National\par ++ Aeronautics and Space Administration (NASA), nor the names of its\par ++ contributors may be used to endorse or promote products derived from\par ++ this software without specific prior written permission.\par ++\par ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\par ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\par ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\par ++DISCLAIMED. IN NO EVENT SHALL THE CALIFORNIA INSTITUTE OF TECHNOLOGY BE LIABLE\par ++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\par ++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\par ++SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\par ++CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\par ++OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\par ++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\par ++------------------------------------------------------------------------------\par ++\par ++\par ++} ++ + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/README.rtf +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/Makefile.am (revision 11476) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/Makefile.am (revision 11477) +@@ -1,3 +1,3 @@ + EXTRA_DIST = reconf scripts test INSTALLICE LICENSE m4 examples cron etc doc packages ChangeLogCielo ChangeLogIce contributors.txt run READMEICE startup.m startup.m startup.m startup.m todo MakefileIce + SUBDIRS = src bin +-bin_SCRIPTS=config.h startup.m ++bin_SCRIPTS=config.h startup.m README.rtf Index: /issm/oecreview/Archive/11471-11490/ISSM-11477-11478.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11477-11478.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11477-11478.diff (revision 11515) @@ -0,0 +1,440 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/proguard.cfg +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/proguard.cfg (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/proguard.cfg (revision 11478) +@@ -0,0 +1,40 @@ ++-optimizationpasses 5 ++-dontusemixedcaseclassnames ++-dontskipnonpubliclibraryclasses ++-dontpreverify ++-verbose ++-optimizations !code/simplification/arithmetic,!field/*,!class/merging/* ++ ++-keep public class * extends android.app.Activity ++-keep public class * extends android.app.Application ++-keep public class * extends android.app.Service ++-keep public class * extends android.content.BroadcastReceiver ++-keep public class * extends android.content.ContentProvider ++-keep public class * extends android.app.backup.BackupAgentHelper ++-keep public class * extends android.preference.Preference ++-keep public class com.android.vending.licensing.ILicensingService ++ ++-keepclasseswithmembernames class * { ++ native ; ++} ++ ++-keepclasseswithmembers class * { ++ public (android.content.Context, android.util.AttributeSet); ++} ++ ++-keepclasseswithmembers class * { ++ public (android.content.Context, android.util.AttributeSet, int); ++} ++ ++-keepclassmembers class * extends android.app.Activity { ++ public void *(android.view.View); ++} ++ ++-keepclassmembers enum * { ++ public static **[] values(); ++ public static ** valueOf(java.lang.String); ++} ++ ++-keep class * implements android.os.Parcelable { ++ public static final android.os.Parcelable$Creator *; ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/project.properties +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/project.properties (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/project.properties (revision 11478) +@@ -0,0 +1,11 @@ ++# This file is automatically generated by Android Tools. ++# Do not modify this file -- YOUR CHANGES WILL BE ERASED! ++# ++# This file must be checked in Version Control Systems. ++# ++# To customize properties used by the Ant build system use, ++# "ant.properties", and override values to adapt the script to your ++# project structure. ++ ++# Project target. ++target=android-7 +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties (revision 11478) +@@ -0,0 +1,10 @@ ++# This file is automatically generated by Android Tools. ++# Do not modify this file -- YOUR CHANGES WILL BE ERASED! ++# ++# This file must *NOT* be checked in Version Control Systems, ++# as it contains information specific to your local configuration. ++ ++# location of the SDK. This is only used by Ant ++# For customization when using a Version Control System, please read the ++# header note. ++sdk.dir=/Users/gperez/android-sdk-macosx +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/AndroidManifest.xml +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/AndroidManifest.xml (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/AndroidManifest.xml (revision 11478) +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld/HelloWorldAppActivity.java +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld/HelloWorldAppActivity.java (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld/HelloWorldAppActivity.java (revision 11478) +@@ -0,0 +1,15 @@ ++package com.example.helloworld; ++ ++import android.app.Activity; ++import android.os.Bundle; ++ ++public class HelloWorldAppActivity extends Activity ++{ ++ /** Called when the activity is first created. */ ++ @Override ++ public void onCreate(Bundle savedInstanceState) ++ { ++ super.onCreate(savedInstanceState); ++ setContentView(R.layout.main); ++ } ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk.d +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk.d (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk.d (revision 11478) +@@ -0,0 +1,3 @@ ++/Users/gperez/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk : \ ++/Users/gperez/HelloWorldAppProject/bin/HelloWorldApp.ap_ \ ++/Users/gperez/HelloWorldAppProject/bin/classes.dex \ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug.apk +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug.apk +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_ +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_ +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_.d +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_.d (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap_.d (revision 11478) +@@ -0,0 +1,4 @@ ++/Users/gperez/HelloWorldAppProject/bin/HelloWorldApp.ap_ \ ++ : /Users/gperez/HelloWorldAppProject/res/layout/main.xml \ ++/Users/gperez/HelloWorldAppProject/res/values/strings.xml \ ++/Users/gperez/HelloWorldAppProject/AndroidManifest.xml \ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$string.class +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$string.class +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$attr.class +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$attr.class +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R.class +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R.class +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$layout.class +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$layout.class +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/HelloWorldAppActivity.class +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/HelloWorldAppActivity.class +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/build.prop +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/build.prop (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/build.prop (revision 11478) +@@ -0,0 +1,10 @@ ++#Last build type ++#Tue, 21 Feb 2012 11:52:47 -0800 ++ ++build.last.target=debug ++ ++build.last.is.instrumented=false ++ ++build.last.is.packaging.debug=true ++ ++build.last.is.signing.debug=true +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex.d +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex.d (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex.d (revision 11478) +@@ -0,0 +1 @@ ++/Users/gperez/HelloWorldAppProject/bin/classes.dex : \ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/R.java.d +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/R.java.d (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/R.java.d (revision 11478) +@@ -0,0 +1,4 @@ ++/Users/gperez/HelloWorldAppProject/gen/com/example/helloworld/R.java \ ++ : /Users/gperez/HelloWorldAppProject/res/layout/main.xml \ ++/Users/gperez/HelloWorldAppProject/res/values/strings.xml \ ++/Users/gperez/HelloWorldAppProject/AndroidManifest.xml \ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld/R.java +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld/R.java (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld/R.java (revision 11478) +@@ -0,0 +1,19 @@ ++/* AUTO-GENERATED FILE. DO NOT MODIFY. ++ * ++ * This class was automatically generated by the ++ * aapt tool from the resource data it found. It ++ * should not be modified by hand. ++ */ ++ ++package com.example.helloworld; ++ ++public final class R { ++ public static final class attr { ++ } ++ public static final class layout { ++ public static final int main=0x7f020000; ++ } ++ public static final class string { ++ public static final int app_name=0x7f030000; ++ } ++} +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values/strings.xml +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values/strings.xml (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values/strings.xml (revision 11478) +@@ -0,0 +1,4 @@ ++ ++ ++ HelloWorldAppActivity ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout/main.xml +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout/main.xml (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout/main.xml (revision 11478) +@@ -0,0 +1,13 @@ ++ ++ ++ ++ ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/ant.properties +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/ant.properties (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/ant.properties (revision 11478) +@@ -0,0 +1,17 @@ ++# This file is used to override default values used by the Ant build system. ++# ++# This file must be checked in Version Control Systems, as it is ++# integral to the build system of your project. ++ ++# This file is only used by the Ant script. ++ ++# You can use this to override default values such as ++# 'source.dir' for the location of your java source folder and ++# 'out.dir' for the location of your output folder. ++ ++# You can also use it define how the release builds are signed by declaring ++# the following properties: ++# 'key.store' for the location of your keystore and ++# 'key.alias' for the name of the key to use. ++# The password will be asked during the build when you use the 'release' target. ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/build.xml +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/build.xml (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/build.xml (revision 11478) +@@ -0,0 +1,85 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/README +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/README (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/README (revision 11478) +@@ -0,0 +1,19 @@ ++//Written by: Gilberto Perez ++//Last Modified 2/21/2012 ++/* ++ * This is a temporary readme file for the installation of the Android emulator. ++ */ ++1) Download the Android SDK . ++2) Add to your PATH the following: ++ ANDROID_HOME=~/android-sdk-macosx ++ PATH=${PATH}:ANDROID_HOME/platforms/android-15/:~ANDROID_HOME/platform-tools/:ANDROID_HOME/tools/ ++3) Run Android and install the newest Android distribution(as of the last update: android-15) ++4) Navigate to the project directory and run Android update project ./ ++5) Run ant debug. ++6) Initiate an emulator by entering: ++ 1) android list targets (this will produce a list of available of system image targets) ++ 2) android create avd -n -t (Choose targetID to match android-15) ++7) Start up the emulator by entering: emulator -avd ++8) Install the app by entering: adb install .apk ++ ++The app should be installed and ready to run from the virtual device! Index: /issm/oecreview/Archive/11471-11490/ISSM-11478-11479.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11478-11479.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11478-11479.diff (revision 11515) @@ -0,0 +1,68 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/README +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/README (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/README (revision 11479) +@@ -0,0 +1,63 @@ ++------------------------------------------------------------------------------ ++ ++ISSM ++Ice Sheet System Modeling: a framework for modeling ice flow on ice sheet/ice shelf ++systems using Finite Elemenent Analysis, and parallel technologies. ++ ++------------------------------------------------------------------------------ ++ ++Jet Propulsion Laboratory ++ ++Eric Eric Larour (Project Manager) ++Mathieu Mathieu Morlighem (Core Developer, Anisotropic Meshing, Control Methods) ++Helene Helene Seroussi (Core Develper Coupling 2D-3D, Multi-model, full-Stokes) ++Nicole Nicole Schlegel (Developer, Atmospheric Forcing) ++Chris Christopher Borstad (Developer, Rifting/Faulting/Crack Propagation) ++Feras Feras Habbal (Developer, Solver Technologies) ++Daria Daria Halkides (Analyst, Atmospheric Forcing) ++Ala Ala Khazendar (Analyst, Ice Sheet Processes) ++ ++ ++Email: issm@jpl.nasa.gov ++ ++------------------------------------------------------------------------------ ++ ++Website: ttp://issm.jpl.nasa.gov/ for additional information. ++ ++------------------------------------------------------------------------------ ++ ++License ++ ++ISSM is California Institute of Technology Copyright, Distributed under BSD Three Clause License. ++ ++ ++Copyright (c) 2002-2011, California Institute of Technology. ++All rights reserved. Based on Government Sponsored Research under contracts ++NAS7-1407 and/or NAS7-03001. ++ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++ ++ 1. Redistributions of source code must retain the above copyright notice, ++ this list of conditions and the following disclaimer. ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ 3. Neither the name of the California Institute of Technology (Caltech), ++ its operating division the Jet Propulsion Laboratory (JPL), the National ++ Aeronautics and Space Administration (NASA), nor the names of its ++ contributors may be used to endorse or promote products derived from ++ this software without specific prior written permission. ++ ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE CALIFORNIA INSTITUTE OF TECHNOLOGY BE LIABLE ++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++------------------------------------------------------------------------------ ++ Index: /issm/oecreview/Archive/11471-11490/ISSM-11479-11480.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11479-11480.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11479-11480.diff (revision 11515) @@ -0,0 +1,7 @@ + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject +___________________________________________________________________ +Added: svn:ignore + + local.properties + + Index: /issm/oecreview/Archive/11471-11490/ISSM-11480-11481.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11480-11481.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11480-11481.diff (revision 11515) @@ -0,0 +1,19 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties (revision 11480) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties (revision 11481) +@@ -1,4 +1,5 @@ + # This file is automatically generated by Android Tools. ++ + # Do not modify this file -- YOUR CHANGES WILL BE ERASED! + # + # This file must *NOT* be checked in Version Control Systems, + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject +___________________________________________________________________ +Modified: svn:ignore + - local.properties + + + local.* + + Index: /issm/oecreview/Archive/11471-11490/ISSM-11481-11482.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11481-11482.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11481-11482.diff (revision 11515) @@ -0,0 +1,16 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties (revision 11481) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties (revision 11482) +@@ -1,11 +0,0 @@ +-# This file is automatically generated by Android Tools. +- +-# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +-# +-# This file must *NOT* be checked in Version Control Systems, +-# as it contains information specific to your local configuration. +- +-# location of the SDK. This is only used by Ant +-# For customization when using a Version Control System, please read the +-# header note. +-sdk.dir=/Users/gperez/android-sdk-macosx Index: /issm/oecreview/Archive/11471-11490/ISSM-11482-11483.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11482-11483.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11482-11483.diff (revision 11515) @@ -0,0 +1,1014 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/aic.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/aic.sh (revision 11482) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/aic.sh (revision 11483) +@@ -12,13 +12,11 @@ + SetPackageName "ISSM.msi" + END + +-ls $ISSM_TIER_WIN/bin/*.m $ISSM_TIER_WIN/bin/*.mexw64 $ISSM_TIER_WIN/bin/*.h $ISSM_TIER_WIN/bin/*.exe | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic ++ls $ISSM_TIER_WIN/bin/*.bat $ISSM_TIER_WIN/bin/startup.m $ISSM_TIER_WIN/bin/*.h | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic + +- + cat << END >> ISSM.aic + AddFolder PersonalFolder $ISSM_TIER_WIN\test +-AddFolder APPDIR $ISSM_TIER_WIN\bin\@modellist +-AddFolder APPDIR $ISSM_TIER_WIN\bin\@pairoptions ++AddFolder APPDIR $ISSM_TIER_WIN\bin + SetPackageType x64 + DelEnvironment ISSM_TESTS + NewEnvironment -name ISSM_TESTS -value [test_Dir] +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.aic +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.aic (revision 11482) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.aic (revision 11483) +@@ -1,983 +1,11 @@ + ;aic + SetVersion "1.0" + SetPackageName "ISSM.msi" +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AbsoluteEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AddExternalResult.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointBalancethicknessAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointCorePointerFromSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointHorizAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointpEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AdjointzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AgressiveMigrationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AirEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AnalysisConfiguration.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AnalysisCounterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AnalysisTypeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AreaAverageOntoPartition.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ArrheniusEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AutodiffForwardEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AutodiffIsautodiffEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AutodiffReverseEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\AverageFilter.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessSpcthicknessEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessStabilizationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BalancethicknessThickeningRateEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgCall.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgCallFromMetric.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgConvertMesh.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgMesher.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BamgTriangulate.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalFrictionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalforcingsGeothermalfluxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalforcingsMeltingRateCorrectionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasalforcingsMeltingRateEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasinConstrain.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BasinConstrainShelf.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BathymetryEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeXAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeXEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeYAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BedSlopeYEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BilinearInterpEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolElementResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolInputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoolParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\BoundaryEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Chaco.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ClosedEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ColinearEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ComputeBasalStress.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ComputeHessian.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ComputeMetric.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConfigurationTypeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConfigureObjects.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantsGEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantsReferencetemperatureEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstantsYtsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstraintsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConstraintsState.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ContourToMesh.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ContourToNodes.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputGetGradient.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputScaleGradient.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlInputSetGradient.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlOptimization.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ControlSteadyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ConvergedEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CorePointerFromSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CostFunction.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateDataBoundaries.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateDataMatrix.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateJacobianMatrix.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\CreateNodalConstraints.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DatasetInputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DepthAverage.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticAbstolEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticHorizAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticHutterAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticIcefrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticIsnewtonEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticMaxiterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticNumRequestedOutputsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticPenaltyFactorEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticReferentialEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticReltolEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRequestedOutputsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRestolEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRiftPenaltyLockEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticRiftPenaltyThresholdEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticShelfDampeningEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSpcvxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSpcvyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticSpcvzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticStokesreconditioningEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticVertAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticVertexPairingEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DiagnosticViscosityOvershootEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DofIndexingEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleElementResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleInputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleMatArrayParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleMatExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleMatParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleVecExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DoubleVecParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\DragCoefficientAbsGradientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Echo.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementConnectivity.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ElementsFromEdge.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpyAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpyPicardEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnthalpySolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnumToModelField.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\EnumToString.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Exp2Kml.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ExtToIuEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FieldFindVarNames.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FileParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FillEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FillHole.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FixMesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlagElements.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlaimAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlaimSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationBordermacayealEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationBorderpattynEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationBorderstokesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationElementEquationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationIshutterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationIsmacayealpattynEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationIsstokesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FlowequationVertexEquationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FractionIncrementEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FreeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionCoefficientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionPEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FrictionQEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\FsetEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GeometryHydrostaticRatioEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetAreas.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetCharacteristicLength.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetNodalFunctionsCoeff.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetSolutionFromInputs.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetVectorFromInputs.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GetVerbosityLevel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradient1Enum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradient2Enum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradient3Enum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GradientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Gradj.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GroundinglineMeltingRateEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GroundinglineMigration.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GroundinglineMigrationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\GsetEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HoleFiller.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HookEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HutterApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyCREnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyKnEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyNEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyPEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyQEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologySolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologySpcwatercolumnEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyStabilizationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyWaterVxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\HydrologyWaterVyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IceVolumeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IcefrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IncrementalEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IndexEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IndexedEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputControlUpdate.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputConvergence.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputDuplicate.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputScale.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputToResult.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputUpdateFromConstant.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputUpdateFromSolution.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InputUpdateFromVector.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntInputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntMatParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntVecParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InternalEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InternalFront.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromFile.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromGridToMesh.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMesh2d.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMeshToGrid.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMeshToMesh2d.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InterpFromMeshToMesh3d.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IntersectEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionControlParametersEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionThresholdEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionsCoefficientsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionCostFunctionsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionGradientOnlyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionGradientScalingEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionIncompleteAdjointEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionIscontrolEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionMaxParametersEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionMaxiterPerStepEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionMinParametersEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionNstepsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionNumControlParametersEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionNumCostFunctionsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionStepThresholdEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionTaoEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionThicknessObsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVelObsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVxObsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVyObsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\InversionVzObsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\IuToExtEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\JEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\KMLFileRead.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\KMLMeshWrite.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\KMLOverlay.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Kml2Exp.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Ll2xy.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\LoadsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyeal2dIceFrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyeal3dIceFrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyealApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyealPattynApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MacAyealStokesApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskElementonfloatingiceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskElementongroundediceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskElementonwaterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskVertexonfloatingiceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskVertexongroundediceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaskVertexonwaterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MassFluxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MassFluxProcessProfile.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsBetaEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsHeatcapacityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsLatentheatEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsMeltingpointEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsMixedLayerCapacityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsMuWaterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyBEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyBbarEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyLawEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRheologyNEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRhoIceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsRhoWaterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsThermalExchangeVelocityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaterialsThermalconductivityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaticeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MatlabProcessPatch.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MatparEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxAbsVxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxAbsVyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxAbsVzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxPenetrationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVelEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MaxVzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MelangeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeltingAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeltingGroundingLines.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeltingOffsetEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MergeMetrics.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Mergesolutionfromftog.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshAverageVertexConnectivityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshDimensionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshEdgesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementconnectivityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementonbedEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementonsurfaceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElements2dEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshElementsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshLowerelementsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofedgesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofelements2dEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofelementsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberoflayersEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofvertices2dEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshNumberofverticesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshPartition.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshProfileIntersection.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshQuality.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshUpperelementsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshVertexonbedEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshVertexonsurfaceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshXEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshYEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MeshZEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVelEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MinVzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MiscellaneousNameEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MisfitDeinterlace.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\MisfitEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ModelProcessor.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ModelUpdateInputsFromVector.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NearestInterpEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NewFemModel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodalEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodeConnectivity.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodeInElement.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodesDof.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NodesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NoneAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NoneApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NoneEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NumberNodeToElementConnectivityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\NumericalfluxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OldGradientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OpenEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionCellEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionCharEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionDoubleEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionLogicalEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OptionStructEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Orth.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OutputFilePointerEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OutputResults.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\OutputfilenameEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\P0Enum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\P1DGEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\P1Enum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ParametersEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ParsePetscOptions.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchNodesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchToVec.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatchVerticesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PatersonEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PattynApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PattynIceFrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PattynStokesApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PengridEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PenpairEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PentaEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PentaP1ElementResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PentaP1InputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscMatParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscOptionsAnalysesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscOptionsStringsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscVecExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PetscVecParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PointCloudFindNeighbors.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PressureEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PressurePicardEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ProcessParams.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ProfileProjectOntoMesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticHydrostaticAdjustmentEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticMinThicknessEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticPenaltyFactorEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticSpcthicknessEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticStabilizationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PrognosticVertexPairingEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PropagateFlagsFromConnectivity.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\PropagateFlagsUntilDistance.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuBedEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuErrNameEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuInNameEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuIsdakotaEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuMassFluxSegmentsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuMeltingEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuNumberofpartitionsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuNumberofresponsesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuOutNameEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuPartitionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuPressureEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuResponsedescriptorsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuSurfaceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuTemperatureEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuThicknessEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVariabledescriptorsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QmuVzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\QueueRequirements.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Reduceload.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Reducevectorgtof.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Reducevectorgtos.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RegularEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RelativeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResetBoundaryConditions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResetCoordinateSystem.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResetPenaltiesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Response.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ResultsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RheologyBbarAbsGradientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RiftfrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RiftsNumriftsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\RiftsRiftstructEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ScaledEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Scotch.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SectionValues.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegIntersect.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegmentEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegmentOnIceShelfEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SegmentRiftfrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SeparateEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetCurrentConfiguration.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetIceSheetBC.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetIceShelfBC.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetMarineIceSheetBC.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SetVerbosityLevel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsIoGatherEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsLowmemEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsOutputFrequencyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsResultsAsPatchesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SettingsWaitonlockEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Shp2Kml.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SoftMigrationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SolutionTypeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Solver.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SparseToVector.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpawnCore.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcDynamicEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcNodes.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcStaticEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SpcTransientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SsetEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateMaxiterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateNumRequestedOutputsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateReltolEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateRequestedOutputsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SteadystateSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StepResponsesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StokesApproximationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StokesIceFrontEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StokesSolverEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorxxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorxyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorxzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensoryyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensoryzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StressTensorzzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringArrayParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringExternalResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringParamEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\StringToEnum.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceAbsVelMisfitEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceArea.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceAreaEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceAverageVelMisfitEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceLogVelMisfitEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceLogVxVyMisfitEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceRelVelMisfitEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeXAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeXEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeYAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceSlopeYEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceforcingsAblationRateEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceforcingsAccumulationRateEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SurfaceforcingsMassBalanceEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\SystemMatrices.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TemperatureEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TemperatureOldEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TemperaturePicardEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Test.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalAnalysisEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalIsenthalpyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalMaxiterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalPenaltyFactorEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalPenaltyLockEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalPenaltyThresholdEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalSpctemperatureEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThermalStabilizationEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessAbsGradientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessAbsMisfitEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessCorrection.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ThicknessEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimeAdapt.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingCflCoefficientEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingFinalTimeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingTimeAdaptEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TimesteppingTimeStepEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TracksToMatrix.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientInputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsdiagnosticEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsgroundinglineEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsprognosticEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientIsthermalEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientNumRequestedOutputsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientRequestedOutputsEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TransientSolutionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMesh.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMeshNoDensity.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMeshProcessRifts.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriMeshRefine.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaP1ElementResultEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaP1InputEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriaSearch.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TriangleInterpEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\TypeEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\UpdateConstraints.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\UpdateDynamicConstraints.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\UpdateVertexPositions.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VelEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VelFindVarNames.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VelocityEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseControl.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseConvergence.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseMProcessor.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseModule.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseQmu.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseSolution.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerboseSolver.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VertexEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerticesDof.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VerticesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ViscousHeatingEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxAverageEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxMeshEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VxPicardEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyAverageEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyMeshEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VyPicardEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzMacAyealEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzMeshEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzPattynEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzPicardEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\VzStokesEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WaterColumnOldEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WaterEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WatercolumnEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WaterfractionEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\WriteData.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\XYEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\XYZPEnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\Xy2ll.mexw64 +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\YamsCall.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\addnote.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\addtrack.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\adjacency.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\adjointbalancethickness_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\adjointdiagnostic_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\allempty.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\allequal.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\allnan.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\any2str.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\applyoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\argusmesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\array_numel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\array_size.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\arrow.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\asmoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\autodiff.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\averageconnectivity.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\averaging.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\balancethickness.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\balancethickness_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bamg.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bamggeom.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bamgmesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basalforcings.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basalstress.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basevert.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\basinzoom.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bedslope.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\bedslope_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\carter.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\castor.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\cfl_step.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\checkfield.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\checkmessage.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\checkplotoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\clicktoflowline.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\collapse.m + AddFile APPDIR C:\issm-uci\trunk-jpl\bin\config.h +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\constants.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\contourenvelope.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\contourmassbalance.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\control_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\controlconvergence.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\convergence.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\cosmos.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\create_region.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_cdfs.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_data.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_params.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_parse.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_in_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_m_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_moments.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_out_parse.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dakota_resp_uconv.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\data_processing_tool.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ddeblank.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ddewhite.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\debug.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\dewhite.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\diagnostic.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\diagnostic_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\discardnum.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\divergence.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\downstreamflowlines.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\drivingstress.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ecco32issm.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\edgeadjacency.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\edgeperimeter.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\effective_value.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\effectivepressure.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\enthalpy_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\enthalpy_core_step.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\exp2kml.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expandresponses.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expandvariables.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expbox.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expboxgen.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcoarsen.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expconcatenate.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcontract.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcreatecircle.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcreatecontour.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcreateprofile.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expcut.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expdisp.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expdoc.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expexcludeoutliers.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expflip.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expgen.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\explink.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expll2xy.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expmaster.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expopen.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\exporientation.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expremovestraightsegments.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expselect.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expsplit.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expsquare.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expswapxy.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\exptool.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\expxy2ll.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\extrude.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\fielddisplay.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\fielddisplay2.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\find_point.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\find_string.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\findarg.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\findsegments.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\fixdec.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flagedges.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flaim.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flaim_sol.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flaimdir.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flowequation.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\flowlines.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\friction.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\gemini.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\generic.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\geometry.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ginputquick.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\glen_coefficients.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\graddetection.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\gradient_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\gradient_perso.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\greenplanet.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\groundingline.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\hydrology.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\iluasmoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\im_resize.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\imagescnan.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\immerge.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\importancefactors.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\initialization.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\intersections.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\inversion.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\isbasin.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\isconnected.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ismemberi.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ismodelselfconsistent.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ismumps.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\isnans.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issm.exe +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issm.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issm2ecco3.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmbbftpin.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmbbftpout.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmdir.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmprintf.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmscpin.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmscpout.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmssh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\issmtier.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\item2str.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\jacobiasmoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\jacobicgoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml2exp.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml2expg.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_colorstyle.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_container.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_document.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_feature.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_file_swrite.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_file_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_folder.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_geometry.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_linearring.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_linestring.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_linestyle.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_mesh_elem.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_mesh_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_multigeometry.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_object.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_part_edges.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_part_elems.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_part_flagedges.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_partitions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_placemark.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_polygon.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_polystyle.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_style.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_styleselector.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_substyle.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kml_unsh_edges.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kmlgroundoverlay.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\kmlimagesc.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\latlonoverlay.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\lclist_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\listfiles.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\listfilesparallel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\lithostaticpressure.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\ll2xy.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadmodel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadmodellist.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadmultipleresultsfromcluster.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadresultsfromcluster.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\loadresultsfromdisk.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\logoutput.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\marshall.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mask.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\materials.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\matlaboptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mean_congrid.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mechanicalproperties.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mesh_refine_tri4.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshconvert.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshnodensity.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshread.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\meshrefine.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\miscellaneous.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\misfit.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\model.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelconsistency.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelextract.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelsextract.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelsextractfromdomains.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modelsize.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\modis.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\mumpsoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\netcdf.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\netcdf2struct.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\nodeconnectivity.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\none.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\northarrow.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\objectivefunctionC.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\organizer.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\oshostname.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\outflow.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parallelrange.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\param_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parametercontrolB.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parametercontroldrag.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parametercontroloptimization.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parameterize.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\pargenerate.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\parseresultsfromdisk.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\partitioner.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\paterson.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\petscversion.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\pfe.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\planet.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\planetmixedmesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\planettrimesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot2patch.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_BC.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_basaldrag.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_basins.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_boundaries.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_contour.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_drivingstress.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_edges.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_elementnumbering.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_elementstype.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_gridded.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_highlightelements.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_highlightvertices.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_icefront.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_importancefactors.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_manager.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_mesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_none.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_overlay.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_parthist.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_parthistn.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_parthistw.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_penalties.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmu_mass_flux_segments.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmuhistnorm.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmumean.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmunormplot.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_qmustddev.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_quiver.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_quiver3.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_referential.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftfraction.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftnumbering.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftpenetration.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftrelvel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_rifts.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_riftvel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_sarpwr.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_scatter.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_section.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_segments.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_streamlines.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor_components.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor_principal.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_tensor_principalaxis.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_thermaltransient_results.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_transient_field.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_transient_movie.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_transient_results.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_unit.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plot_vertexnumbering.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotbasins.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotdoc.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotmodel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plotoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\plugvelocities.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\pollux.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\postqmu.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\preqmu.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\printmodel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\private.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\process_qmu_options.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\process_qmu_response_data.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\process_solve_options.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\processdata.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\processgeometry.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\processmesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\prognostic.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\prognostic_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\project2d.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\project3d.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmu.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmu_correlation.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuisdistributed.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmumarshall.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuname.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuresponse.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qmuroot.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qpr.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\qstat.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\quiver_colorbar.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\quiver_process.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\radaroverlay.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\radarpower.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rebin.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\recover_areas.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\recover_qmu_options.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\recursivepath.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\regionaltransient2d.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rifts.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rifttipsonmesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rlev_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rlist_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\rotateticklabel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\round_ice.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\roundmesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\runme.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\scaleruler.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sensitivities.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setcluster.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setflowequation.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setmask.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\setmask2.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\settings.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\shear2d.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\showbasins.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\showregion.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sia.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\slope.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solve.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solveparallel.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_adjoint_linear.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_linear.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_newton.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_nonlinear.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_stokescoupling_nonlinear.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\solver_thermal_nonlinear.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\soroptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sphere_project.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\sphere_tri.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\squaremesh.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\squarezoom.m ++AddFile APPDIR C:\issm-uci\trunk-jpl\bin\matlabissm.bat + AddFile APPDIR C:\issm-uci\trunk-jpl\bin\startup.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\steadystate.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\steadystate_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\steadystateconvergence.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\stokesoptions.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\str2int.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_buf.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_cell.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_dim.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_size.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\string_vec.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\strsplit.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\strsplit_strict.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\struc_class.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\struc_desc.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\structtoobj.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\surfaceforcings.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\surfaceslope_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thermal.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thermal_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thermal_core_step.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\thicknessevolution.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\timestepping.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\transient.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\transient_core.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\transp.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\tres.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\triangle.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\utm2ll.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\vector_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\verbose.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\vlist_write.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\waitonlock.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\xy2ll.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\yams.m +-AddFile APPDIR C:\issm-uci\trunk-jpl\bin\zinput.m + AddFolder PersonalFolder C:/issm-uci/trunk-jpl\test +-AddFolder APPDIR C:/issm-uci/trunk-jpl\bin\@modellist +-AddFolder APPDIR C:/issm-uci/trunk-jpl\bin\@pairoptions ++AddFolder APPDIR C:/issm-uci/trunk-jpl\bin + SetPackageType x64 + DelEnvironment ISSM_TESTS + NewEnvironment -name ISSM_TESTS -value [test_Dir] +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/win7/ISSM.initial.aip +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/xml Index: /issm/oecreview/Archive/11471-11490/ISSM-11483-11484.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11483-11484.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11483-11484.diff (revision 11515) @@ -0,0 +1,8 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile.am (revision 11483) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/Makefile.am (revision 11484) +@@ -1,2 +1,2 @@ +-SUBDIRS = @pairoptions @modellist ++SUBDIRS = @pairoptions @modellist model clusters + bin_SCRIPTS=*.m Index: /issm/oecreview/Archive/11471-11490/ISSM-11484-11485.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11484-11485.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11484-11485.diff (revision 11515) @@ -0,0 +1,196 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/generic.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/generic.m (revision 11484) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/generic.m (revision 11485) +@@ -77,33 +77,65 @@ + isgprof=md.debug.gprof; + + %open file for writing: +- fid=fopen([modelname '.queue'],'w'); ++ if ~ispc, ++ fid=fopen([modelname '.queue'],'w'); ++ else ++ fid=fopen([modelname '.bat'],'w'); ++ end + + %write instructions for launching a job on the cluster +- fprintf(fid,'#!/bin/sh\n'); ++ if ~ispc, ++ fprintf(fid,'#!/bin/sh\n'); ++ else ++ fprintf(fid,'@echo off\n'); ++ end ++ + if ~isvalgrind, + if cluster.interactive +- fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s ',... +- cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); ++ if ~ispc, ++ fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s ',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); ++ else ++ fprintf(fid,'"%s/issm.exe" %s "%s" %s ',cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); ++ end + else +- fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',... +- cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); ++ if ~ispc, ++ fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); ++ else ++ fprintf(fid,'"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog ',cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); ++ end + end + else +- %Add --gen-suppressions=all to get suppression lines +- fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib); +- fprintf(fid,'mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',... ++ if ~ispc, ++ %Add --gen-suppressions=all to get suppression lines ++ fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib); ++ fprintf(fid,'mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',... + cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); ++ else ++ error('valgrind not supported on windows platforms'); ++ end + end + + if isgprof, +- fprintf(fid,'\n gprof %s/issm.exe gmon.out > %s.performance',cluster.codepath,modelname); ++ if ~ispc, ++ fprintf(fid,'\n gprof %s/issm.exe gmon.out > %s.performance',cluster.codepath,modelname); ++ else ++ error('gprof not supported on windows platforms'); ++ end ++ + end + + if ~md.settings.io_gather, +- %concatenate the output files: +- fprintf(fid,'\ncat %s.outbin.* > %s.outbin',modelname,modelname); ++ if ~ispc, ++ %concatenate the output files: ++ fprintf(fid,'\ncat %s.outbin.* > %s.outbin',modelname,modelname); ++ else ++ error('iogather not supported on windows platforms'); ++ end ++ + end ++ ++ %close file: ++ fclose(fid); + + %in interactive mode, create a run file, and errlog and outlog file + if cluster.interactive, +@@ -111,63 +143,73 @@ + fid=fopen([modelname '.outlog'],'w'); fclose(fid); + end + ++ + end + %}}} + function LaunchQueueJob(cluster,md,options)% {{{1 + +- %lauch command, to be executed via ssh +- launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... +- ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && source ' md.miscellaneous.name '.queue ']; ++ if ~ispc, ++ %lauch command, to be executed via ssh ++ launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... ++ ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && source ' md.miscellaneous.name '.queue ']; + +- if ~strcmpi(options.batch,'yes'), +- +- %compress the files into one zip. +- compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.miscellaneous.name '.bin ' md.miscellaneous.name '.queue ' md.miscellaneous.name '.petsc ']; +- if md.qmu.isdakota, +- compressstring=[compressstring md.miscellaneous.name '.qmu.in']; ++ if ~strcmpi(options.batch,'yes'), ++ ++ %compress the files into one zip. ++ compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.miscellaneous.name '.bin ' md.miscellaneous.name '.queue ' md.miscellaneous.name '.petsc ']; ++ if md.qmu.isdakota, ++ compressstring=[compressstring md.miscellaneous.name '.qmu.in']; ++ end ++ if cluster.interactive, ++ compressstring=[compressstring ' ' md.miscellaneous.name '.errlog ' md.miscellaneous.name '.outlog ']; ++ end ++ system(compressstring); ++ ++ disp('uploading input file and queueing script'); ++ issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[md.private.runtimename '.tar.gz']}); ++ ++ disp('launching solution sequence on remote cluster'); ++ issmssh(cluster.name,cluster.login,cluster.port,launchcommand); ++ else ++ disp('batch mode requested: not launching job interactively'); ++ disp('launch solution sequence on remote cluster by hand'); + end +- if cluster.interactive, +- compressstring=[compressstring ' ' md.miscellaneous.name '.errlog ' md.miscellaneous.name '.outlog ']; +- end +- system(compressstring); +- +- disp('uploading input file and queueing script'); +- issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[md.private.runtimename '.tar.gz']}); +- +- disp('launching solution sequence on remote cluster'); +- issmssh(cluster.name,cluster.login,cluster.port,launchcommand); + else +- disp('batch mode requested: not launching job interactively'); +- disp('launch solution sequence on remote cluster by hand'); ++ %launch right here, do not compress or archive. ++ system([md.miscellaneous.name '.bat']); + end + +- end %}}} ++ end %}}} + function Download(cluster,md)% {{{1 + +- %some check +- if isempty(md.private.runtimename), +- error('supply runtime name for results to be loaded!'); +- end ++ if ~ispc, ++ %some check ++ if isempty(md.private.runtimename), ++ error('supply runtime name for results to be loaded!'); ++ end + +- %Figure out the directory where all the files are in: +- directory=[cluster.executionpath '/' md.private.runtimename '/']; ++ %Figure out the directory where all the files are in: ++ directory=[cluster.executionpath '/' md.private.runtimename '/']; + +- %What packages are we picking up from remote cluster +- packages={[md.miscellaneous.name '.outlog'],[md.miscellaneous.name '.errlog']}; +- if md.qmu.isdakota, +- packages{end+1}=[md.miscellaneous.name '.qmu.err']; +- packages{end+1}=[md.miscellaneous.name '.qmu.out']; +- if isfield(md.qmu.params,'tabular_graphics_data'), +- if md.qmu.params.tabular_graphics_data==true, +- packages{end+1}='dakota_tabular.dat'; ++ %What packages are we picking up from remote cluster ++ packages={[md.miscellaneous.name '.outlog'],[md.miscellaneous.name '.errlog']}; ++ if md.qmu.isdakota, ++ packages{end+1}=[md.miscellaneous.name '.qmu.err']; ++ packages{end+1}=[md.miscellaneous.name '.qmu.out']; ++ if isfield(md.qmu.params,'tabular_graphics_data'), ++ if md.qmu.params.tabular_graphics_data==true, ++ packages{end+1}='dakota_tabular.dat'; ++ end + end ++ else ++ packages{end+1}=[md.miscellaneous.name '.outbin']; + end ++ ++ %copy files from cluster to present directory ++ issmscpin(cluster.name, cluster.login, cluster.port, directory, packages); + else +- packages{end+1}=[md.miscellaneous.name '.outbin']; ++ %do nothing! + end +- +- %copy files from cluster to present directory +- issmscpin(cluster.name, cluster.login, cluster.port, directory, packages); + end %}}} + end + end Index: /issm/oecreview/Archive/11471-11490/ISSM-11485-11486.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11485-11486.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11485-11486.diff (revision 11515) @@ -0,0 +1,8 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile.am (revision 11485) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/Makefile.am (revision 11486) +@@ -1 +1,2 @@ +-bin_SCRIPTS=*.m ++SUBDIRS = plot mesh display parameterization partition solvers ++bin_SCRIPTS=*.m Index: /issm/oecreview/Archive/11471-11490/ISSM-11486-11487.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11486-11487.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11486-11487.diff (revision 11515) @@ -0,0 +1,28 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromcluster.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromcluster.m (revision 11486) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/loadresultsfromcluster.m (revision 11487) +@@ -29,7 +29,9 @@ + delete([md.miscellaneous.name '.outlog']); + delete([md.miscellaneous.name '.errlog']); + delete([md.miscellaneous.name '.outbin']); +- delete([md.private.runtimename '.tar.gz']); ++ if ~ispc, ++ delete([md.private.runtimename '.tar.gz']); ++ end + end + + %erase input file if run was carried out on same platform. +@@ -40,7 +42,11 @@ + delete([['qmu' num2str(feature('GetPid')) '/'] md.miscellaneous.name '.queue']); + else + delete([md.miscellaneous.name '.bin']); +- delete([md.miscellaneous.name '.queue']); + delete([md.miscellaneous.name '.petsc']); ++ if ~ispc, ++ delete([md.miscellaneous.name '.queue']); ++ else ++ delete([md.miscellaneous.name '.bat']); ++ end + end + end Index: /issm/oecreview/Archive/11471-11490/ISSM-11487-11488.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11487-11488.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11487-11488.diff (revision 11515) @@ -0,0 +1,12 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmtier.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmtier.m (revision 11487) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell/issmtier.m (revision 11488) +@@ -8,6 +8,7 @@ + ISSM_TIER =getenv('ISSM_TIER'); + else + ISSM_TIER =getenv('ISSM_TIER_WIN'); ++ ISSM_TIER = ISSM_TIER(1:end-1); %shave off the last '/' + end + + if (isempty(ISSM_TIER)), Index: /issm/oecreview/Archive/11471-11490/ISSM-11488-11489.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11488-11489.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11488-11489.diff (revision 11515) @@ -0,0 +1,8 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/Makefile +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/Makefile (revision 11488) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/test/NightlyRun/Makefile (revision 11489) +@@ -1,2 +1,2 @@ + clean: +- rm -rf *.tar.gz *.bin *.errlog *.outlog *.outbin *.petsc *.queue *.run valgrind.log* ++ rm -rf *.tar.gz *.bin *.errlog *.outlog *.outbin *.petsc *.queue *.run valgrind.log* *.bat *.lock Index: /issm/oecreview/Archive/11471-11490/ISSM-11489-11490.diff =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-11489-11490.diff (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-11489-11490.diff (revision 11515) @@ -0,0 +1,22 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 11489) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 11490) +@@ -23,9 +23,17 @@ + src/m/classes/Makefile + src/m/classes/@modellist/Makefile + src/m/classes/@pairoptions/Makefile ++ src/m/classes/model/Makefile ++ src/m/classes/clusters/Makefile + src/m/enum/Makefile + src/m/kml/Makefile + src/m/model/Makefile ++ src/m/model/plot/Makefile ++ src/m/model/mesh/Makefile ++ src/m/model/display/Makefile ++ src/m/model/parameterization/Makefile ++ src/m/model/partition/Makefile ++ src/m/model/solvers/Makefile + src/m/planet/Makefile + src/m/qmu/Makefile + src/m/shared/Makefile Index: /issm/oecreview/Archive/11471-11490/ISSM-DocReview-11471-11490.tex =================================================================== --- /issm/oecreview/Archive/11471-11490/ISSM-DocReview-11471-11490.tex (revision 11515) +++ /issm/oecreview/Archive/11471-11490/ISSM-DocReview-11471-11490.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11471-11490/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11471-11490/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11471-11490/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11471-11490 Index: /issm/oecreview/Archive/11471-11490/Makefile =================================================================== --- /issm/oecreview/Archive/11471-11490/Makefile (revision 11515) +++ /issm/oecreview/Archive/11471-11490/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11471-11490 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11471-11490/log.tex =================================================================== --- /issm/oecreview/Archive/11471-11490/log.tex (revision 11515) +++ /issm/oecreview/Archive/11471-11490/log.tex (revision 11515) @@ -0,0 +1,38 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11471-11472.diff: \\ Function name: \\A /issm/trunk-jpl/scripts/matlabissm.bat \\ Export determination: 6. \\Rationale: Script for fire up matlab and issm in windows +A /issm/trunk-jpl/src/m/Makefile A /issm/trunk-jpl/src/m/Makefile.am A /issm/trunk-jpl/src/m/classes/@modellist/Makefile A /issm/trunk-jpl/src/m/classes/@modellist/Makefile.am A /issm/trunk-jpl/src/m/classes/@pairoptions/Makefile A /issm/trunk-jpl/src/m/classes/@pairoptions/Makefile.am A /issm/trunk-jpl/src/m/classes/Makefile A /issm/trunk-jpl/src/m/classes/Makefile.am A /issm/trunk-jpl/src/m/enum/Makefile A /issm/trunk-jpl/src/m/enum/Makefile.am A /issm/trunk-jpl/src/m/kml/Makefile A /issm/trunk-jpl/src/m/kml/Makefile.am A /issm/trunk-jpl/src/m/model/Makefile A /issm/trunk-jpl/src/m/model/Makefile.am A /issm/trunk-jpl/src/m/planet/Makefile A /issm/trunk-jpl/src/m/planet/Makefile.am A /issm/trunk-jpl/src/m/qmu/Makefile A /issm/trunk-jpl/src/m/qmu/Makefile.am A /issm/trunk-jpl/src/m/shared/Makefile A /issm/trunk-jpl/src/m/shared/Makefile.am A /issm/trunk-jpl/src/m/solutions/Makefile A /issm/trunk-jpl/src/m/solutions/Makefile.am A /issm/trunk-jpl/src/m/solvers/Makefile A /issm/trunk-jpl/src/m/solvers/Makefile.am A /issm/trunk-jpl/src/m/utils/Analysis/Makefile A /issm/trunk-jpl/src/m/utils/Analysis/Makefile.am A /issm/trunk-jpl/src/m/utils/Array/Makefile A /issm/trunk-jpl/src/m/utils/Array/Makefile.am A /issm/trunk-jpl/src/m/utils/BC/Makefile A /issm/trunk-jpl/src/m/utils/BC/Makefile.am A /issm/trunk-jpl/src/m/utils/Basins/Makefile A /issm/trunk-jpl/src/m/utils/Basins/Makefile.am A /issm/trunk-jpl/src/m/utils/Cluster/Makefile A /issm/trunk-jpl/src/m/utils/Cluster/Makefile.am A /issm/trunk-jpl/src/m/utils/DataProcessing/Makefile A /issm/trunk-jpl/src/m/utils/DataProcessing/Makefile.am A /issm/trunk-jpl/src/m/utils/Ecco3/Makefile A /issm/trunk-jpl/src/m/utils/Ecco3/Makefile.am A /issm/trunk-jpl/src/m/utils/Exp/Makefile A /issm/trunk-jpl/src/m/utils/Exp/Makefile.am A /issm/trunk-jpl/src/m/utils/Geometry/Makefile A /issm/trunk-jpl/src/m/utils/Geometry/Makefile.am A /issm/trunk-jpl/src/m/utils/ImageProcessing/Makefile A /issm/trunk-jpl/src/m/utils/ImageProcessing/Makefile.am A /issm/trunk-jpl/src/m/utils/Interp/Makefile A /issm/trunk-jpl/src/m/utils/Interp/Makefile.am A /issm/trunk-jpl/src/m/utils/Kml/Makefile A /issm/trunk-jpl/src/m/utils/Kml/Makefile.am A /issm/trunk-jpl/src/m/utils/LatLong/Makefile A /issm/trunk-jpl/src/m/utils/LatLong/Makefile.am A /issm/trunk-jpl/src/m/utils/Makefile A /issm/trunk-jpl/src/m/utils/Makefile.am A /issm/trunk-jpl/src/m/utils/Math/Makefile A /issm/trunk-jpl/src/m/utils/Math/Makefile.am A /issm/trunk-jpl/src/m/utils/Meca/Makefile A /issm/trunk-jpl/src/m/utils/Meca/Makefile.am A /issm/trunk-jpl/src/m/utils/Mesh/Makefile A /issm/trunk-jpl/src/m/utils/Mesh/Makefile.am A /issm/trunk-jpl/src/m/utils/Miscellaneous/Makefile A /issm/trunk-jpl/src/m/utils/Miscellaneous/Makefile.am A /issm/trunk-jpl/src/m/utils/Model/Makefile A /issm/trunk-jpl/src/m/utils/Model/Makefile.am A /issm/trunk-jpl/src/m/utils/Numerics/Makefile A /issm/trunk-jpl/src/m/utils/Numerics/Makefile.am A /issm/trunk-jpl/src/m/utils/OS/Makefile A /issm/trunk-jpl/src/m/utils/OS/Makefile.am A /issm/trunk-jpl/src/m/utils/Plot/Makefile A /issm/trunk-jpl/src/m/utils/Plot/Makefile.am A /issm/trunk-jpl/src/m/utils/Shell/Makefile A /issm/trunk-jpl/src/m/utils/Shell/Makefile.am A /issm/trunk-jpl/src/m/utils/String/Makefile A /issm/trunk-jpl/src/m/utils/String/Makefile.am A /issm/trunk-jpl/src/m/utils/consistency/Makefile A /issm/trunk-jpl/src/m/utils/consistency/Makefile.am A /issm/trunk-jpl/src/m/utils/qmu/Makefile A /issm/trunk-jpl/src/m/utils/qmu/Makefile.am Adding install targets for all .m files \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11472-11473.diff: \\ Function name: \\A /issm/trunk-jpl/src/m/Makefile A /issm/trunk-jpl/src/m/Makefile.am A /issm/trunk-jpl/src/m/classes/@modellist/Makefile A /issm/trunk-jpl/src/m/classes/@modellist/Makefile.am A /issm/trunk-jpl/src/m/classes/@pairoptions/Makefile A /issm/trunk-jpl/src/m/classes/@pairoptions/Makefile.am A /issm/trunk-jpl/src/m/classes/Makefile A /issm/trunk-jpl/src/m/classes/Makefile.am A /issm/trunk-jpl/src/m/enum/Makefile A /issm/trunk-jpl/src/m/enum/Makefile.am A /issm/trunk-jpl/src/m/kml/Makefile A /issm/trunk-jpl/src/m/kml/Makefile.am A /issm/trunk-jpl/src/m/model/Makefile A /issm/trunk-jpl/src/m/model/Makefile.am A /issm/trunk-jpl/src/m/planet/Makefile A /issm/trunk-jpl/src/m/planet/Makefile.am A /issm/trunk-jpl/src/m/qmu/Makefile A /issm/trunk-jpl/src/m/qmu/Makefile.am A /issm/trunk-jpl/src/m/shared/Makefile A /issm/trunk-jpl/src/m/shared/Makefile.am A /issm/trunk-jpl/src/m/solutions/Makefile A /issm/trunk-jpl/src/m/solutions/Makefile.am A /issm/trunk-jpl/src/m/solvers/Makefile A /issm/trunk-jpl/src/m/solvers/Makefile.am A /issm/trunk-jpl/src/m/utils/Analysis/Makefile A /issm/trunk-jpl/src/m/utils/Analysis/Makefile.am A /issm/trunk-jpl/src/m/utils/Array/Makefile A /issm/trunk-jpl/src/m/utils/Array/Makefile.am A /issm/trunk-jpl/src/m/utils/BC/Makefile A /issm/trunk-jpl/src/m/utils/BC/Makefile.am A /issm/trunk-jpl/src/m/utils/Basins/Makefile A /issm/trunk-jpl/src/m/utils/Basins/Makefile.am A /issm/trunk-jpl/src/m/utils/Cluster/Makefile A /issm/trunk-jpl/src/m/utils/Cluster/Makefile.am A /issm/trunk-jpl/src/m/utils/DataProcessing/Makefile A /issm/trunk-jpl/src/m/utils/DataProcessing/Makefile.am A /issm/trunk-jpl/src/m/utils/Ecco3/Makefile A /issm/trunk-jpl/src/m/utils/Ecco3/Makefile.am A /issm/trunk-jpl/src/m/utils/Exp/Makefile A /issm/trunk-jpl/src/m/utils/Exp/Makefile.am A /issm/trunk-jpl/src/m/utils/Geometry/Makefile A /issm/trunk-jpl/src/m/utils/Geometry/Makefile.am A /issm/trunk-jpl/src/m/utils/ImageProcessing/Makefile A /issm/trunk-jpl/src/m/utils/ImageProcessing/Makefile.am A /issm/trunk-jpl/src/m/utils/Interp/Makefile A /issm/trunk-jpl/src/m/utils/Interp/Makefile.am A /issm/trunk-jpl/src/m/utils/Kml/Makefile A /issm/trunk-jpl/src/m/utils/Kml/Makefile.am A /issm/trunk-jpl/src/m/utils/LatLong/Makefile A /issm/trunk-jpl/src/m/utils/LatLong/Makefile.am A /issm/trunk-jpl/src/m/utils/Makefile A /issm/trunk-jpl/src/m/utils/Makefile.am A /issm/trunk-jpl/src/m/utils/Math/Makefile A /issm/trunk-jpl/src/m/utils/Math/Makefile.am A /issm/trunk-jpl/src/m/utils/Meca/Makefile A /issm/trunk-jpl/src/m/utils/Meca/Makefile.am A /issm/trunk-jpl/src/m/utils/Mesh/Makefile A /issm/trunk-jpl/src/m/utils/Mesh/Makefile.am A /issm/trunk-jpl/src/m/utils/Miscellaneous/Makefile A /issm/trunk-jpl/src/m/utils/Miscellaneous/Makefile.am A /issm/trunk-jpl/src/m/utils/Model/Makefile A /issm/trunk-jpl/src/m/utils/Model/Makefile.am A /issm/trunk-jpl/src/m/utils/Numerics/Makefile A /issm/trunk-jpl/src/m/utils/Numerics/Makefile.am A /issm/trunk-jpl/src/m/utils/OS/Makefile A /issm/trunk-jpl/src/m/utils/OS/Makefile.am A /issm/trunk-jpl/src/m/utils/Plot/Makefile A /issm/trunk-jpl/src/m/utils/Plot/Makefile.am A /issm/trunk-jpl/src/m/utils/Shell/Makefile A /issm/trunk-jpl/src/m/utils/Shell/Makefile.am A /issm/trunk-jpl/src/m/utils/String/Makefile A /issm/trunk-jpl/src/m/utils/String/Makefile.am A /issm/trunk-jpl/src/m/utils/consistency/Makefile A /issm/trunk-jpl/src/m/utils/consistency/Makefile.am A /issm/trunk-jpl/src/m/utils/qmu/Makefile A /issm/trunk-jpl/src/m/utils/qmu/Makefile.am \\ Export determination: 6. \\Rationale: Adding install targets for all .m files +M /issm/trunk-jpl/Makefile.am M /issm/trunk-jpl/bin M /issm/trunk-jpl/configure.ac M /issm/trunk-jpl/src/Makefile.am Adding install targets for .m files. \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11473-11474.diff: \\ Function name: \\M /issm/trunk-jpl/Makefile.am M /issm/trunk-jpl/bin M /issm/trunk-jpl/configure.ac M /issm/trunk-jpl/src/Makefile.am \\ Export determination: 6. \\Rationale: Adding install targets for .m files. +D /issm/trunk-jpl/src/m/Makefile D /issm/trunk-jpl/src/m/classes/@modellist/Makefile D /issm/trunk-jpl/src/m/classes/@pairoptions/Makefile D /issm/trunk-jpl/src/m/classes/Makefile M /issm/trunk-jpl/src/m/classes/clusters/greenplanet.m D /issm/trunk-jpl/src/m/enum/Makefile D /issm/trunk-jpl/src/m/kml/Makefile D /issm/trunk-jpl/src/m/model/Makefile D /issm/trunk-jpl/src/m/planet/Makefile D /issm/trunk-jpl/src/m/qmu/Makefile D /issm/trunk-jpl/src/m/shared/Makefile D /issm/trunk-jpl/src/m/solutions/Makefile D /issm/trunk-jpl/src/m/solvers/Makefile D /issm/trunk-jpl/src/m/utils/Analysis/Makefile D /issm/trunk-jpl/src/m/utils/Array/Makefile D /issm/trunk-jpl/src/m/utils/BC/Makefile D /issm/trunk-jpl/src/m/utils/Basins/Makefile D /issm/trunk-jpl/src/m/utils/Cluster/Makefile D /issm/trunk-jpl/src/m/utils/DataProcessing/Makefile D /issm/trunk-jpl/src/m/utils/Ecco3/Makefile D /issm/trunk-jpl/src/m/utils/Exp/Makefile D /issm/trunk-jpl/src/m/utils/Geometry/Makefile D /issm/trunk-jpl/src/m/utils/ImageProcessing/Makefile D /issm/trunk-jpl/src/m/utils/Interp/Makefile D /issm/trunk-jpl/src/m/utils/Kml/Makefile D /issm/trunk-jpl/src/m/utils/LatLong/Makefile D /issm/trunk-jpl/src/m/utils/Makefile D /issm/trunk-jpl/src/m/utils/Math/Makefile D /issm/trunk-jpl/src/m/utils/Meca/Makefile D /issm/trunk-jpl/src/m/utils/Mesh/Makefile D /issm/trunk-jpl/src/m/utils/Miscellaneous/Makefile D /issm/trunk-jpl/src/m/utils/Model/Makefile D /issm/trunk-jpl/src/m/utils/Numerics/Makefile D /issm/trunk-jpl/src/m/utils/OS/Makefile D /issm/trunk-jpl/src/m/utils/Plot/Makefile D /issm/trunk-jpl/src/m/utils/Shell/Makefile D /issm/trunk-jpl/src/m/utils/String/Makefile D /issm/trunk-jpl/src/m/utils/consistency/Makefile D /issm/trunk-jpl/src/m/utils/qmu/Makefile no need to have Makefiles under svn (generated by configuration) \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11474-11475.diff: \\ Function name: \\D /issm/trunk-jpl/src/m/Makefile D /issm/trunk-jpl/src/m/classes/@modellist/Makefile D /issm/trunk-jpl/src/m/classes/@pairoptions/Makefile D /issm/trunk-jpl/src/m/classes/Makefile M /issm/trunk-jpl/src/m/classes/clusters/greenplanet.m D /issm/trunk-jpl/src/m/enum/Makefile D /issm/trunk-jpl/src/m/kml/Makefile D /issm/trunk-jpl/src/m/model/Makefile D /issm/trunk-jpl/src/m/planet/Makefile D /issm/trunk-jpl/src/m/qmu/Makefile D /issm/trunk-jpl/src/m/shared/Makefile D /issm/trunk-jpl/src/m/solutions/Makefile D /issm/trunk-jpl/src/m/solvers/Makefile D /issm/trunk-jpl/src/m/utils/Analysis/Makefile D /issm/trunk-jpl/src/m/utils/Array/Makefile D /issm/trunk-jpl/src/m/utils/BC/Makefile D /issm/trunk-jpl/src/m/utils/Basins/Makefile D /issm/trunk-jpl/src/m/utils/Cluster/Makefile D /issm/trunk-jpl/src/m/utils/DataProcessing/Makefile D /issm/trunk-jpl/src/m/utils/Ecco3/Makefile D /issm/trunk-jpl/src/m/utils/Exp/Makefile D /issm/trunk-jpl/src/m/utils/Geometry/Makefile D /issm/trunk-jpl/src/m/utils/ImageProcessing/Makefile D /issm/trunk-jpl/src/m/utils/Interp/Makefile D /issm/trunk-jpl/src/m/utils/Kml/Makefile D /issm/trunk-jpl/src/m/utils/LatLong/Makefile D /issm/trunk-jpl/src/m/utils/Makefile D /issm/trunk-jpl/src/m/utils/Math/Makefile D /issm/trunk-jpl/src/m/utils/Meca/Makefile D /issm/trunk-jpl/src/m/utils/Mesh/Makefile D /issm/trunk-jpl/src/m/utils/Miscellaneous/Makefile D /issm/trunk-jpl/src/m/utils/Model/Makefile D /issm/trunk-jpl/src/m/utils/Numerics/Makefile D /issm/trunk-jpl/src/m/utils/OS/Makefile D /issm/trunk-jpl/src/m/utils/Plot/Makefile D /issm/trunk-jpl/src/m/utils/Shell/Makefile D /issm/trunk-jpl/src/m/utils/String/Makefile D /issm/trunk-jpl/src/m/utils/consistency/Makefile D /issm/trunk-jpl/src/m/utils/qmu/Makefile \\ Export determination: 6. \\Rationale: no need to have Makefiles under svn (generated by configuration) +A /issm/trunk-jpl/installers A /issm/trunk-jpl/installers/win7 A /issm/trunk-jpl/installers/win7/ISSM.aic A /issm/trunk-jpl/installers/win7/ISSM.initial.aip A /issm/trunk-jpl/installers/win7/ISSMlogo.ico A /issm/trunk-jpl/installers/win7/aic.sh Installer for win7 \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11475-11476.diff: \\ Function name: \\A /issm/trunk-jpl/installers A /issm/trunk-jpl/installers/win7 A /issm/trunk-jpl/installers/win7/ISSM.aic A /issm/trunk-jpl/installers/win7/ISSM.initial.aip A /issm/trunk-jpl/installers/win7/ISSMlogo.ico A /issm/trunk-jpl/installers/win7/aic.sh \\ Export determination: 6. \\Rationale: Installer for win7 +D /issm/trunk-jpl/README A /issm/trunk-jpl/README.txt (from /issm/trunk-jpl/README:11473) Need extension for Windows installer \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11476-11477.diff: \\ Function name: \\D /issm/trunk-jpl/README A /issm/trunk-jpl/README.txt (from /issm/trunk-jpl/README:11473) \\ Export determination: 6. \\Rationale: Need extension for Windows installer +M /issm/trunk-jpl/Makefile.am A /issm/trunk-jpl/README.rtf Needed in rtf mode \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11477-11478.diff: \\ Function name: \\M /issm/trunk-jpl/Makefile.am A /issm/trunk-jpl/README.rtf \\ Export determination: 6. \\Rationale: Needed in rtf mode +A /issm/trunk-jpl/externalpackages/android A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/AndroidManifest.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/ant.properties A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug.apk A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap\_ A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap\_.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/build.prop A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/HelloWorldAppActivity.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$attr.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$layout.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$string.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/res A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/build.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/R.java.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld/R.java A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/libs A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/proguard.cfg A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/project.properties A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout/main.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values/strings.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld/HelloWorldAppActivity.java A /issm/trunk-jpl/externalpackages/android/README Adding Androi project. \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11478-11479.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/android A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/AndroidManifest.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/ant.properties A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug-unaligned.apk.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp-debug.apk A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap\_ A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/HelloWorldApp.ap\_.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/build.prop A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/HelloWorldAppActivity.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$attr.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$layout.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R$string.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes/com/example/helloworld/R.class A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/classes.dex.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/bin/res A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/build.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/R.java.d A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/gen/com/example/helloworld/R.java A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/libs A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/proguard.cfg A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/project.properties A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/layout/main.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/res/values/strings.xml A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld A /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/src/com/example/helloworld/HelloWorldAppActivity.java A /issm/trunk-jpl/externalpackages/android/README \\ Export determination: 6. \\Rationale: Adding Androi project. +A /issm/trunk-jpl/README (from /issm/trunk-jpl/README.txt:11476) Needed by GNU automake \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11479-11480.diff: \\ Function name: \\A /issm/trunk-jpl/README (from /issm/trunk-jpl/README.txt:11476) \\ Export determination: 6. \\Rationale: Needed by GNU automake +M /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject Ignoring local.properties \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-11480-11481.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject \\ Export determination: 6. \\Rationale: Ignoring local.properties +M /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject M /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties Whatever \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-11481-11482.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject M /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties \\ Export determination: 6. \\Rationale: Whatever +D /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties Not neded \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-11482-11483.diff: \\ Function name: \\D /issm/trunk-jpl/externalpackages/android/HelloWorldAppProject/local.properties \\ Export determination: 6. \\Rationale: Not neded +M /issm/trunk-jpl/installers/win7/ISSM.aic M /issm/trunk-jpl/installers/win7/ISSM.initial.aip M /issm/trunk-jpl/installers/win7/aic.sh Put all the binaries in ISSM\_TIER/bin instead of ISSM\_TIER. Works better for generic class. \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-11483-11484.diff: \\ Function name: \\M /issm/trunk-jpl/installers/win7/ISSM.aic M /issm/trunk-jpl/installers/win7/ISSM.initial.aip M /issm/trunk-jpl/installers/win7/aic.sh \\ Export determination: 6. \\Rationale: Put all the binaries in ISSM\_TIER/bin instead of ISSM\_TIER. Works better for generic class. +M /issm/trunk-jpl/src/m/classes/Makefile.am Added two subdirectories being missed \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-11484-11485.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/Makefile.am \\ Export determination: 6. \\Rationale: Added two subdirectories being missed +M /issm/trunk-jpl/src/m/classes/clusters/generic.m Windows specific changes \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-11485-11486.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/clusters/generic.m \\ Export determination: 6. \\Rationale: Windows specific changes +M /issm/trunk-jpl/src/m/model/Makefile.am Missing a lot of subdirectories \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-11486-11487.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/Makefile.am \\ Export determination: 6. \\Rationale: Missing a lot of subdirectories +M /issm/trunk-jpl/src/m/model/loadresultsfromcluster.m Windows specific changes to delete bat file \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-11487-11488.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/loadresultsfromcluster.m \\ Export determination: 6. \\Rationale: Windows specific changes to delete bat file +M /issm/trunk-jpl/src/m/utils/Shell/issmtier.m Taking out the trailing slash for windows systems \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-11488-11489.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/utils/Shell/issmtier.m \\ Export determination: 6. \\Rationale: Taking out the trailing slash for windows systems +M /issm/trunk-jpl/test/NightlyRun/Makefile Added more erase targets \\\\ +\noindent \textbf{Change \#19} with diff file ISSM-11489-11490.diff: \\ Function name: \\M /issm/trunk-jpl/test/NightlyRun/Makefile \\ Export determination: 6. \\Rationale: Added more erase targets +M /issm/trunk-jpl/configure.ac Multitude of missing subdirs for install target of m files \\\\ Index: /issm/oecreview/Archive/11471-11490/r1.tex =================================================================== --- /issm/oecreview/Archive/11471-11490/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11471-11490/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11471 Index: /issm/oecreview/Archive/11471-11490/r2.tex =================================================================== --- /issm/oecreview/Archive/11471-11490/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11471-11490/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11490 Index: /issm/oecreview/Archive/11491-11500/Date.tex =================================================================== --- /issm/oecreview/Archive/11491-11500/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11491-11500/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11491-11500/ISSM-11491-11492.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11491-11492.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11491-11492.diff (revision 11515) @@ -0,0 +1,92 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.m (revision 11491) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/startup.m (revision 11492) +@@ -25,15 +25,35 @@ + %the variable ISSM_TIER in this file, in case it is not correctly setup. + + %ISSM path +-addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath +-addpath([ISSM_TIER '/doc']); +-addpath([ISSM_TIER '/bin']); +-addpath(recursivepath([ISSM_TIER '/src/m'])); +-addpath(recursivepath([ISSM_TIER '/externalpackages/scotch'])); +-addpath(recursivepath([ISSM_TIER '/externalpackages/canos'])); +-addpath(recursivepath([ISSM_TIER '/externalpackages/kml'])); +-addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/'])); +-addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig'])); ++addpath(pwd); %add current path first ++ ++if exist([ISSM_TIER '/src/m/utils/'],'dir'), ++ addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath ++end ++if exist([ISSM_TIER '/doc'],'dir'), ++ addpath([ISSM_TIER '/doc']); ++end ++if exist([ISSM_TIER '/bin'],'dir'), ++ addpath([ISSM_TIER '/bin']); ++end ++if exist([ISSM_TIER '/src/m'],'dir'), ++ addpath(recursivepath([ISSM_TIER '/src/m'])); ++end ++if exist([ISSM_TIER '/externalpackages/scotch'],'dir'), ++ addpath(recursivepath([ISSM_TIER '/externalpackages/scotch'])); ++end ++if exist([ISSM_TIER '/externalpackages/canos'],'dir'), ++ addpath(recursivepath([ISSM_TIER '/externalpackages/canos'])); ++end ++if exist([ISSM_TIER '/externalpackages/kml'],'dir'), ++ addpath(recursivepath([ISSM_TIER '/externalpackages/kml'])); ++end ++if exist([ISSM_TIER '/externalpackages/googleearthtoolbox/'],'dir'), ++ addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/'])); ++end ++if exist([ISSM_TIER '/externalpackages/export_fig'],'dir'), ++ addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig'])); ++end + clear ISSM_TIER; + + %Check on any warning messages that might indicate that the paths were not correct. +@@ -46,20 +66,31 @@ + + % deal with Matlab bug (on Linux, not WinXP) -- unless + % the class has been called, "empty" method can not be found +-normal_uncertain; +-continuous_design; +-continuous_state; +-linear_inequality_constraint; +-linear_equality_constraint; +-response_function; +-objective_function; +-least_squares_term; +-nonlinear_inequality_constraint; +-nonlinear_equality_constraint; +-clear ans; ++if ~ispc, ++ normal_uncertain; ++ continuous_design; ++ continuous_state; ++ linear_inequality_constraint; ++ linear_equality_constraint; ++ response_function; ++ objective_function; ++ least_squares_term; ++ nonlinear_inequality_constraint; ++ nonlinear_equality_constraint; ++ clear ans; ++end + + %disable matlab bell! + beep off; + + % no warning if we try to plot while in nojvm (will not be supported in future releases) + warning off MATLAB:HandleGraphics:noJVM ++ ++%at the end, get to tests directory if ISSM_TESTS exists: ++if ispc, ++ addpath([pwd '\bin']); ++ ISSM_TESTS=getenv('ISSM_TESTS'); ++ if ~isempty(ISSM_TESTS), ++ cd(ISSM_TESTS); ++ end ++end Index: /issm/oecreview/Archive/11491-11500/ISSM-11492-11493.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11492-11493.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11492-11493.diff (revision 11515) @@ -0,0 +1,68 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/README.txt +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/README.txt (revision 11492) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/README.txt (revision 11493) +@@ -1,63 +0,0 @@ +------------------------------------------------------------------------------- +- +-ISSM +-Ice Sheet System Modeling: a framework for modeling ice flow on ice sheet/ice shelf +-systems using Finite Elemenent Analysis, and parallel technologies. +- +------------------------------------------------------------------------------- +- +-Jet Propulsion Laboratory +- +-Eric Eric Larour (Project Manager) +-Mathieu Mathieu Morlighem (Core Developer, Anisotropic Meshing, Control Methods) +-Helene Helene Seroussi (Core Develper Coupling 2D-3D, Multi-model, full-Stokes) +-Nicole Nicole Schlegel (Developer, Atmospheric Forcing) +-Chris Christopher Borstad (Developer, Rifting/Faulting/Crack Propagation) +-Feras Feras Habbal (Developer, Solver Technologies) +-Daria Daria Halkides (Analyst, Atmospheric Forcing) +-Ala Ala Khazendar (Analyst, Ice Sheet Processes) +- +- +-Email: issm@jpl.nasa.gov +- +------------------------------------------------------------------------------- +- +-Website: ttp://issm.jpl.nasa.gov/ for additional information. +- +------------------------------------------------------------------------------- +- +-License +- +-ISSM is California Institute of Technology Copyright, Distributed under BSD Three Clause License. +- +- +-Copyright (c) 2002-2011, California Institute of Technology. +-All rights reserved. Based on Government Sponsored Research under contracts +-NAS7-1407 and/or NAS7-03001. +- +-Redistribution and use in source and binary forms, with or without +-modification, are permitted provided that the following conditions are met: +- +- 1. Redistributions of source code must retain the above copyright notice, +- this list of conditions and the following disclaimer. +- 2. Redistributions in binary form must reproduce the above copyright +- notice, this list of conditions and the following disclaimer in the +- documentation and/or other materials provided with the distribution. +- 3. Neither the name of the California Institute of Technology (Caltech), +- its operating division the Jet Propulsion Laboratory (JPL), the National +- Aeronautics and Space Administration (NASA), nor the names of its +- contributors may be used to endorse or promote products derived from +- this software without specific prior written permission. +- +-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +-DISCLAIMED. IN NO EVENT SHALL THE CALIFORNIA INSTITUTE OF TECHNOLOGY BE LIABLE +-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +------------------------------------------------------------------------------- +- Index: /issm/oecreview/Archive/11491-11500/ISSM-11493-11494.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11493-11494.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11493-11494.diff (revision 11515) @@ -0,0 +1,27 @@ + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/bin +___________________________________________________________________ +Modified: svn:ignore + - *.mexa64 +*.mexw64 +Makefile +Makefile.in +issm.exe +*.m +*.h +@pairoptions +@modellist + + + *.mexa64 +*.mexw64 +Makefile +Makefile.in +issm.exe +*.m +*.h +@pairoptions +@modellist +*.bat +*.rtf + + Index: /issm/oecreview/Archive/11491-11500/ISSM-11494-11495.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11494-11495.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11494-11495.diff (revision 11515) @@ -0,0 +1,16 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/scripts/wincron.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/scripts/wincron.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/scripts/wincron.sh (revision 11495) +@@ -0,0 +1,5 @@ ++#/bin/bash ++#Launch cron as a windows service, using cygrunsrv: ++ ++cygrunsrv --install cron --path /usr/sbin/cron --args -n ++net start cron + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/scripts/wincron.sh +___________________________________________________________________ +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11491-11500/ISSM-11495-11496.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11495-11496.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11495-11496.diff (revision 11515) @@ -0,0 +1,40 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/bsdtar/install-win7.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/bsdtar/install-win7.sh (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/bsdtar/install-win7.sh (revision 11496) +@@ -0,0 +1,17 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src libarchive-3.0.3 ++mkdir install src ++ ++#Untar ++tar -zxvf libarchive-3.0.3.tar.gz ++ ++#Move libarchive into src directory ++mv libarchive-3.0.3/* src ++rm -rf libarchive-3.0.3 ++ ++cd src ++./configure --prefix="$ISSM_TIER/externalpackages/bsdtar/install" ++make ++make install + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/bsdtar/install-win7.sh +___________________________________________________________________ +Added: svn:executable + + * + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/bsdtar/libarchive-3.0.3.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/x-gzip + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/bsdtar/libarchive-3.0.3.tar.gz +___________________________________________________________________ +Added: svn:mime-type + + application/x-gzip +Added: svn:executable + + * + Index: /issm/oecreview/Archive/11491-11500/ISSM-11496-11497.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11496-11497.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11496-11497.diff (revision 11515) @@ -0,0 +1,182 @@ + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Basins +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/ImageProcessing +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/OS +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Cluster +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Analysis +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Kml +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Numerics +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Math +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Geometry +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Mesh +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Ecco3 +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Exp +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Model +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/LatLong +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Interp +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/consistency +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/qmu +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/DataProcessing +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/String +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Shell +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Array +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Plot +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + Index: /issm/oecreview/Archive/11491-11500/ISSM-11497-11498.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11497-11498.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11497-11498.diff (revision 11515) @@ -0,0 +1,188 @@ + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solutions +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/mesh/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/mesh/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/mesh/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/mesh +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/display/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/display/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/display/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/display +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/parameterization/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/parameterization/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/parameterization/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/parameterization +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/partition/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/partition/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/partition/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/partition +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/solvers/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/solvers/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/solvers/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/solvers +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/qmu +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/kml +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/planet +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/shared +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@modellist +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/Makefile.am (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters/Makefile.am (revision 11498) +@@ -0,0 +1 @@ ++bin_SCRIPTS=*.m + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/clusters +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/@pairoptions +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/solvers +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m +___________________________________________________________________ +Added: svn:ignore + + Makefile.in + + Index: /issm/oecreview/Archive/11491-11500/ISSM-11498-11499.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11498-11499.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11498-11499.diff (revision 11515) @@ -0,0 +1,7 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/macosx/ISSM.pmdoc/index.xml +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/macosx/ISSM.pmdoc/index.xml (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/installers/macosx/ISSM.pmdoc/index.xml (revision 11499) +@@ -0,0 +1 @@ ++http://issm.jpl.nasa.gov +\ No newline at end of file Index: /issm/oecreview/Archive/11491-11500/ISSM-11499-11500.diff =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-11499-11500.diff (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-11499-11500.diff (revision 11515) @@ -0,0 +1,13 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_rifts.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_rifts.m (revision 11499) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_rifts.m (revision 11500) +@@ -16,7 +16,7 @@ + offset=getfieldvalue(options,'offset',500); + if isstruct(md.rifts.riftstruct), + +- for i=1:md.rifts.numrifts, ++ for i=1:size(md.rifts.riftstruct,1), + penaltypairs=md.rifts.riftstruct(i).penaltypairs; + + normal=zeros(2,1); Index: /issm/oecreview/Archive/11491-11500/ISSM-DocReview-11491-11500.tex =================================================================== --- /issm/oecreview/Archive/11491-11500/ISSM-DocReview-11491-11500.tex (revision 11515) +++ /issm/oecreview/Archive/11491-11500/ISSM-DocReview-11491-11500.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11491-11500/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11491-11500/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11491-11500/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11491-11500 Index: /issm/oecreview/Archive/11491-11500/Makefile =================================================================== --- /issm/oecreview/Archive/11491-11500/Makefile (revision 11515) +++ /issm/oecreview/Archive/11491-11500/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11491-11500 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11491-11500/log.tex =================================================================== --- /issm/oecreview/Archive/11491-11500/log.tex (revision 11515) +++ /issm/oecreview/Archive/11491-11500/log.tex (revision 11515) @@ -0,0 +1,18 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11491-11492.diff: \\ Function name: \\M /issm/trunk-jpl/scripts/matlabissm.bat \\ Export determination: 6. \\Rationale: Not needed anymore +M /issm/trunk-jpl/startup.m Windows specific changes \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11492-11493.diff: \\ Function name: \\M /issm/trunk-jpl/startup.m \\ Export determination: 6. \\Rationale: Windows specific changes +D /issm/trunk-jpl/README.txt Not needed anymore \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11493-11494.diff: \\ Function name: \\D /issm/trunk-jpl/README.txt \\ Export determination: 6. \\Rationale: Not needed anymore +M /issm/trunk-jpl/bin Ignoring files \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11494-11495.diff: \\ Function name: \\M /issm/trunk-jpl/bin \\ Export determination: 6. \\Rationale: Ignoring files +A /issm/trunk-jpl/scripts/wincron.sh Attempt at cron job \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11495-11496.diff: \\ Function name: \\A /issm/trunk-jpl/scripts/wincron.sh \\ Export determination: 6. \\Rationale: Attempt at cron job +A /issm/trunk-jpl/externalpackages/bsdtar A /issm/trunk-jpl/externalpackages/bsdtar/install-win7.sh A /issm/trunk-jpl/externalpackages/bsdtar/libarchive-3.0.3.tar.gz Cross platform tar, but won't compile \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11496-11497.diff: \\ Function name: \\A /issm/trunk-jpl/externalpackages/bsdtar A /issm/trunk-jpl/externalpackages/bsdtar/install-win7.sh A /issm/trunk-jpl/externalpackages/bsdtar/libarchive-3.0.3.tar.gz \\ Export determination: 6. \\Rationale: Cross platform tar, but won't compile +M /issm/trunk-jpl/src/m/utils M /issm/trunk-jpl/src/m/utils/Analysis M /issm/trunk-jpl/src/m/utils/Array M /issm/trunk-jpl/src/m/utils/BC M /issm/trunk-jpl/src/m/utils/Basins M /issm/trunk-jpl/src/m/utils/Cluster M /issm/trunk-jpl/src/m/utils/DataProcessing M /issm/trunk-jpl/src/m/utils/Ecco3 M /issm/trunk-jpl/src/m/utils/Exp M /issm/trunk-jpl/src/m/utils/Geometry M /issm/trunk-jpl/src/m/utils/ImageProcessing M /issm/trunk-jpl/src/m/utils/Interp M /issm/trunk-jpl/src/m/utils/Kml M /issm/trunk-jpl/src/m/utils/LatLong M /issm/trunk-jpl/src/m/utils/Math M /issm/trunk-jpl/src/m/utils/Meca M /issm/trunk-jpl/src/m/utils/Mesh M /issm/trunk-jpl/src/m/utils/Miscellaneous M /issm/trunk-jpl/src/m/utils/Model M /issm/trunk-jpl/src/m/utils/Numerics M /issm/trunk-jpl/src/m/utils/OS M /issm/trunk-jpl/src/m/utils/Plot M /issm/trunk-jpl/src/m/utils/Shell M /issm/trunk-jpl/src/m/utils/String M /issm/trunk-jpl/src/m/utils/consistency M /issm/trunk-jpl/src/m/utils/qmu Ignoring Makefile.in \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11497-11498.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/utils M /issm/trunk-jpl/src/m/utils/Analysis M /issm/trunk-jpl/src/m/utils/Array M /issm/trunk-jpl/src/m/utils/BC M /issm/trunk-jpl/src/m/utils/Basins M /issm/trunk-jpl/src/m/utils/Cluster M /issm/trunk-jpl/src/m/utils/DataProcessing M /issm/trunk-jpl/src/m/utils/Ecco3 M /issm/trunk-jpl/src/m/utils/Exp M /issm/trunk-jpl/src/m/utils/Geometry M /issm/trunk-jpl/src/m/utils/ImageProcessing M /issm/trunk-jpl/src/m/utils/Interp M /issm/trunk-jpl/src/m/utils/Kml M /issm/trunk-jpl/src/m/utils/LatLong M /issm/trunk-jpl/src/m/utils/Math M /issm/trunk-jpl/src/m/utils/Meca M /issm/trunk-jpl/src/m/utils/Mesh M /issm/trunk-jpl/src/m/utils/Miscellaneous M /issm/trunk-jpl/src/m/utils/Model M /issm/trunk-jpl/src/m/utils/Numerics M /issm/trunk-jpl/src/m/utils/OS M /issm/trunk-jpl/src/m/utils/Plot M /issm/trunk-jpl/src/m/utils/Shell M /issm/trunk-jpl/src/m/utils/String M /issm/trunk-jpl/src/m/utils/consistency M /issm/trunk-jpl/src/m/utils/qmu \\ Export determination: 6. \\Rationale: Ignoring Makefile.in +M /issm/trunk-jpl/src/m M /issm/trunk-jpl/src/m/classes M /issm/trunk-jpl/src/m/classes/@modellist M /issm/trunk-jpl/src/m/classes/@pairoptions M /issm/trunk-jpl/src/m/classes/clusters A /issm/trunk-jpl/src/m/classes/clusters/Makefile.am M /issm/trunk-jpl/src/m/classes/model A /issm/trunk-jpl/src/m/classes/model/Makefile.am M /issm/trunk-jpl/src/m/enum M /issm/trunk-jpl/src/m/kml M /issm/trunk-jpl/src/m/model M /issm/trunk-jpl/src/m/model/display A /issm/trunk-jpl/src/m/model/display/Makefile.am M /issm/trunk-jpl/src/m/model/mesh A /issm/trunk-jpl/src/m/model/mesh/Makefile.am M /issm/trunk-jpl/src/m/model/parameterization A /issm/trunk-jpl/src/m/model/parameterization/Makefile.am M /issm/trunk-jpl/src/m/model/partition A /issm/trunk-jpl/src/m/model/partition/Makefile.am M /issm/trunk-jpl/src/m/model/plot A /issm/trunk-jpl/src/m/model/plot/Makefile.am M /issm/trunk-jpl/src/m/model/solvers A /issm/trunk-jpl/src/m/model/solvers/Makefile.am M /issm/trunk-jpl/src/m/planet M /issm/trunk-jpl/src/m/qmu M /issm/trunk-jpl/src/m/shared M /issm/trunk-jpl/src/m/solutions M /issm/trunk-jpl/src/m/solvers Added missing Makefile.am and ignored Makefile.in \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11498-11499.diff: \\ Function name: \\M /issm/trunk-jpl/src/m M /issm/trunk-jpl/src/m/classes M /issm/trunk-jpl/src/m/classes/@modellist M /issm/trunk-jpl/src/m/classes/@pairoptions M /issm/trunk-jpl/src/m/classes/clusters A /issm/trunk-jpl/src/m/classes/clusters/Makefile.am M /issm/trunk-jpl/src/m/classes/model A /issm/trunk-jpl/src/m/classes/model/Makefile.am M /issm/trunk-jpl/src/m/enum M /issm/trunk-jpl/src/m/kml M /issm/trunk-jpl/src/m/model M /issm/trunk-jpl/src/m/model/display A /issm/trunk-jpl/src/m/model/display/Makefile.am M /issm/trunk-jpl/src/m/model/mesh A /issm/trunk-jpl/src/m/model/mesh/Makefile.am M /issm/trunk-jpl/src/m/model/parameterization A /issm/trunk-jpl/src/m/model/parameterization/Makefile.am M /issm/trunk-jpl/src/m/model/partition A /issm/trunk-jpl/src/m/model/partition/Makefile.am M /issm/trunk-jpl/src/m/model/plot A /issm/trunk-jpl/src/m/model/plot/Makefile.am M /issm/trunk-jpl/src/m/model/solvers A /issm/trunk-jpl/src/m/model/solvers/Makefile.am M /issm/trunk-jpl/src/m/planet M /issm/trunk-jpl/src/m/qmu M /issm/trunk-jpl/src/m/shared M /issm/trunk-jpl/src/m/solutions M /issm/trunk-jpl/src/m/solvers \\ Export determination: 6. \\Rationale: Added missing Makefile.am and ignored Makefile.in +A /issm/trunk-jpl/installers/macosx A /issm/trunk-jpl/installers/macosx/ISSM.pmdoc A /issm/trunk-jpl/installers/macosx/ISSM.pmdoc/index.xml macosx installer \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-11499-11500.diff: \\ Function name: \\A /issm/trunk-jpl/installers/macosx A /issm/trunk-jpl/installers/macosx/ISSM.pmdoc A /issm/trunk-jpl/installers/macosx/ISSM.pmdoc/index.xml \\ Export determination: 6. \\Rationale: macosx installer +M /issm/trunk-jpl/src/m/model/plot/plot\_rifts.m numrifts is no longer a model field \\\\ Index: /issm/oecreview/Archive/11491-11500/r1.tex =================================================================== --- /issm/oecreview/Archive/11491-11500/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11491-11500/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11491 Index: /issm/oecreview/Archive/11491-11500/r2.tex =================================================================== --- /issm/oecreview/Archive/11491-11500/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11491-11500/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11500 Index: /issm/oecreview/Archive/11501-11509/Date.tex =================================================================== --- /issm/oecreview/Archive/11501-11509/Date.tex (revision 11515) +++ /issm/oecreview/Archive/11501-11509/Date.tex (revision 11515) @@ -0,0 +1,1 @@ +Feb-23-2012 Index: /issm/oecreview/Archive/11501-11509/ISSM-11501-11502.diff =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-11501-11502.diff (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-11501-11502.diff (revision 11515) @@ -0,0 +1,35 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_riftrelvel.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_riftrelvel.m (revision 11501) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_riftrelvel.m (revision 11502) +@@ -22,7 +22,7 @@ + %set as NaN all velocities not on rifts + u=NaN*ones(md.mesh.numberofvertices,1); + v=NaN*ones(md.mesh.numberofvertices,1); +-for i=1:md.rifts.numrifts, ++for i=1:size(md.rifts.riftstruct,1), + penaltypairs=md.rifts.riftstruct(i).penaltypairs(:,[1 2]); + u(md.rifts.riftstruct(i).penaltypairs(:,1))=vx(penaltypairs(:,1))-vx(penaltypairs(:,2)); + v(md.rifts.riftstruct(i).penaltypairs(:,1))=vy(penaltypairs(:,1))-vy(penaltypairs(:,2)); +@@ -61,7 +61,7 @@ + for i=1:size(md.mesh.segments,1), + h1=plot(x(md.mesh.segments(i,1:2)),y(md.mesh.segments(i,1:2)),'b-'); + end +-for i=1:md.rifts.numrifts, ++for i=1:size(md.rifts.riftstruct,1), + + %get nodes on rift + penaltypairs=md.rifts.riftstruct(i).penaltypairs; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_riftvel.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_riftvel.m (revision 11501) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/plot/plot_riftvel.m (revision 11502) +@@ -18,7 +18,7 @@ + %set as NaN all velocities not on rifts + u=NaN*ones(md.mesh.numberofvertices,1); + v=NaN*ones(md.mesh.numberofvertices,1); +-for i=1:md.rifts.numrifts, ++for i=1:size(md.rifts.riftstruct,1), + penaltypairs=md.rifts.riftstruct(i).penaltypairs(:,[1 2]); + u(penaltypairs(:))=md.initialization.vx(penaltypairs(:)); + v(penaltypairs(:))=md.initialization.vy(penaltypairs(:)); Index: /issm/oecreview/Archive/11501-11509/ISSM-11503-11504.diff =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-11503-11504.diff (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-11503-11504.diff (revision 11515) @@ -0,0 +1,41 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/tao/tao-2.0.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/tao/install.sh +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/tao/install.sh (revision 11503) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/tao/install.sh (revision 11504) +@@ -1,16 +1,17 @@ + #!/bin/bash +-#wget http://www.mcs.anl.gov/research/projects/tao/download/tao-2.0.tar.gz ++#http://www.mcs.anl.gov/research/projects/tao/download/index.html ++#wget http://www.mcs.anl.gov/research/projects/tao/download/tao-2.0-p3.tar.gz + + #Some cleanup +-rm -rf install tao-2.0 ++rm -rf install tao-2.0-p3 + mkdir install + + #Untar +-tar -zxvf tao-2.0.tar.gz ++tar -zxvf tao-2.0-p3.tar.gz + + #move into place +-mv tao-2.0/* install/ +-rm -rf tao-2.0 ++mv tao-2.0-p3/* install/ ++rm -rf tao-2.0-p3 + cd install + export TAO_DIR="$ISSM_TIER/externalpackages/tao/install/" + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/tao/tao-2.0-p3.tar.gz +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/tao/tao-2.0-p3.tar.gz +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + Index: /issm/oecreview/Archive/11501-11509/ISSM-11504-11505.diff =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-11504-11505.diff (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-11504-11505.diff (revision 11515) @@ -0,0 +1,12 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 11504) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configure.ac (revision 11505) +@@ -4,6 +4,7 @@ + #LT_INIT + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE ++AM_SILENT_RULES([yes]) + AC_PROG_RANLIB + AC_PROG_CC([gcc icl cccl cl]) + AC_PROG_CPP Index: /issm/oecreview/Archive/11501-11509/ISSM-11505-11506.diff =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-11505-11506.diff (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-11505-11506.diff (revision 11515) @@ -0,0 +1,54 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/glen_coefficients.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/glen_coefficients.m (revision 11505) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/glen_coefficients.m (revision 11506) +@@ -1,26 +0,0 @@ +-function [A ,B]=glen_coefficients(Ao,T); +-%GLEN_COEFFICIENTS - compute A and B, given the temperature and Ao +-% +-% Ao,T according to patterson,Ao in s-1kPa-3. +-% values range between 3.9 and 5.3*10^-16; +-% Return: A in s-1kPa-3. B in Pa.a1/3 +-% +-% Usage: +-% [A ,B]=glen_coefficients(Ao,T) +- +-To=263; +-R=8.314; +-E1=139000; +-E2=60000; +- +-%For T>263, +-Ac1=Ao*exp(E1/R/To); +-%For T<263, +-Ac2=Ao*exp(E2/R/To); +- +-A=Ac1*exp(-E1/R./T); +-pos=find(T<263); +-A(pos)=Ac2*exp(-E2/R./T(pos)); +- +-B=(A*365*24*3600).^(-1/3); +- +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/effective_value.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/effective_value.m (revision 11505) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Meca/effective_value.m (revision 11506) +@@ -1,18 +0,0 @@ +-function effective_value=effective_value(A) +-%EFFECTIVE_VALUE - compute the effective value of any matrix +-% +-% effective(A)= 1/sqrt(2)*sqrt(sum(Aij^2)) +-% +-% Usage: +-% effective_value=effective_value(A) +- +-[row,col]=size(A); +- +-SUM=0; +-for i=1:row +- for j=1:col +- SUM=SUM+A(i,j)^2; +- end +-end +- +-effective_value=1/sqrt(2)*sqrt(SUM); Index: /issm/oecreview/Archive/11501-11509/ISSM-11506-11507.diff =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-11506-11507.diff (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-11506-11507.diff (revision 11515) @@ -0,0 +1,20 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m (revision 11507) +@@ -0,0 +1,15 @@ ++%Quick documentation for ISSM ++ ++%First get ISSM tier: ++ISSM_TIER=issmtier; ++ ++disp(sprintf('\n%s',' A comprehensive documentation is available on http://issm.jpl.nasa.gov')); ++disp(sprintf('\n%s',' Example: how to create a square ice shelf')); ++disp(sprintf('%s',' go to ',ISSM_TIER,'/examples/SquareIceshelf')); ++disp(sprintf('%s',' md=model; %creates a new empty model structure')); ++disp(sprintf('%s',' md=triangle(md,''DomainOutline.exp'',50000); %creates a mesh of the domain outline with a resolution of 50000m')); ++disp(sprintf('%s',' md=geography(md,''all'',''''); %defines the glacier system as an ice shelf (no island)')); ++disp(sprintf('%s',' md=parameterize(md,''Square.par''); %fills all the other fields of the model')); ++disp(sprintf('%s',' md=setelementstype(md,''macayeal'',''all''); %defines all elements as MacAyeal''s')); ++disp(sprintf('%s',' md=solve(md,DiagnosticSolutionEnum); %generate the velocity field')); ++disp(sprintf('%s',' plotmodel(md,''data'',md.results.DiagnosticSolution.Vel); %displays the velocity (type plotdoc for plotmodel help)')); Index: /issm/oecreview/Archive/11501-11509/ISSM-11507-11508.diff =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-11507-11508.diff (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-11507-11508.diff (revision 11515) @@ -0,0 +1,83 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11507) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/Makefile.am (revision 11508) +@@ -311,6 +311,8 @@ + ./modules/ComputeStrainRatex/ComputeStrainRatex.cpp\ + ./modules/SpcNodesx/SpcNodesx.h\ + ./modules/SpcNodesx/SpcNodesx.cpp\ ++ ./modules/PositiveDegreeDayx/PositiveDegreeDayx.h\ ++ ./modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp\ + ./modules/UpdateConstraintsx/UpdateConstraintsx.h\ + ./modules/UpdateConstraintsx/UpdateConstraintsx.cpp\ + ./modules/MeshPartitionx/MeshPartitionx.cpp\ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11507) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Element.h (revision 11508) +@@ -67,6 +67,7 @@ + virtual double TimeAdapt()=0; + virtual void MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding)=0; + virtual void PotentialSheetUngrounding(Vec potential_sheet_ungrounding)=0; ++ virtual void PositiveDegreeDay(void)=0; + virtual int UpdatePotentialSheetUngrounding(double* potential_sheet_ungrounding,Vec vec_nodes_on_iceshelf,double* nodes_on_iceshelf)=0; + virtual void ResetCoordinateSystem()=0; + virtual void SmearFunction(Vec smearedvector,double (*WeightFunction)(double distance,double radius),double radius)=0; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11507) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 11508) +@@ -2202,6 +2202,12 @@ + } + } + /*}}}*/ ++/*FUNCTION Tria::PositiveDegreeDay{{{1*/ ++void Tria::PositiveDegreeDay(){ ++ ++ _error_("Not implemented yet"); ++} ++/*}}}*/ + /*FUNCTION Tria::ProcessResultsUnits{{{1*/ + void Tria::ProcessResultsUnits(void){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11507) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Tria.h (revision 11508) +@@ -106,6 +106,7 @@ + void MaterialUpdateFromTemperature(void){_error_("not implemented yet");}; + void MigrateGroundingLine(double* oldfloating,double* sheet_ungrounding); + void PotentialSheetUngrounding(Vec potential_sheet_ungrounding); ++ void PositiveDegreeDay(void); + void RequestedOutput(int output_enum,int step,double time); + void ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results); + void PatchFill(int* pcount, Patch* patch); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11507) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 11508) +@@ -2377,6 +2377,12 @@ + *pnumnodes=numnodes; + } + /*}}}*/ ++/*FUNCTION Penta::PositiveDegreeDay{{{1*/ ++void Penta::PositiveDegreeDay(){ ++ ++ _error_("Not implemented yet"); ++} ++/*}}}*/ + /*FUNCTION Penta::PotentialSheetUngrounding{{{1*/ + void Penta::PotentialSheetUngrounding(Vec potential_sheet_ungrounding){ + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11507) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/objects/Elements/Penta.h (revision 11508) +@@ -111,6 +111,7 @@ + void ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results); + void PatchFill(int* pcount, Patch* patch); + void PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes); ++ void PositiveDegreeDay(void); + void ProcessResultsUnits(void); + void ResetCoordinateSystem(void); + double SurfaceArea(void); Index: /issm/oecreview/Archive/11501-11509/ISSM-11508-11509.diff =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-11508-11509.diff (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-11508-11509.diff (revision 11515) @@ -0,0 +1,344 @@ +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 11509) +@@ -152,8 +152,7 @@ + SteadystateReltolEnum, + SteadystateRequestedOutputsEnum, + SurfaceEnum, +- SurfaceforcingsAblationRateEnum, +- SurfaceforcingsAccumulationRateEnum, ++ SurfaceforcingsPrecipitationEnum, + SurfaceforcingsMassBalanceEnum, + ThermalMaxiterEnum, + ThermalPenaltyFactorEnum, +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumToModelField.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumToModelField.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/EnumDefinitions/EnumToModelField.cpp (revision 11509) +@@ -22,8 +22,6 @@ + case VyEnum : return "vy"; + case InversionVyObsEnum : return "vy_obs"; + case BasalforcingsMeltingRateEnum : return "basal_melting_rate"; +- case SurfaceforcingsAccumulationRateEnum : return "surface_accumulation_rate"; +- case SurfaceforcingsAblationRateEnum : return "surface_ablation_rate"; + case SurfaceforcingsMassBalanceEnum : return "surface_mass_balance"; + default : _error_("No model field is associated to enum %s",EnumToStringx(en)); + } +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 11509) +@@ -62,8 +62,7 @@ + case BalancethicknessThickeningRateEnum: scale=yts;break; //m/yr + case BasalforcingsMeltingRateEnum: scale=yts;break; //m/yr + case BasalforcingsMeltingRateCorrectionEnum: scale=yts;break; //m/yr +- case SurfaceforcingsAccumulationRateEnum: scale=yts;break; //m/yr +- case SurfaceforcingsAblationRateEnum: scale=yts;break; //m/yr ++ case SurfaceforcingsPrecipitationEnum: scale=yts;break; //m/yr + case SurfaceforcingsMassBalanceEnum: scale=yts;break; //m/yr + case MisfitEnum: scale=pow(yts,2);break; //(m/yr)^2 + case MassFluxEnum: scale=pow((double)10,-12)*yts;break; // (GigaTon/year) +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 11509) +@@ -160,8 +160,7 @@ + else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; + else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; + else if (strcmp(name,"Surface")==0) return SurfaceEnum; +- else if (strcmp(name,"SurfaceforcingsAblationRate")==0) return SurfaceforcingsAblationRateEnum; +- else if (strcmp(name,"SurfaceforcingsAccumulationRate")==0) return SurfaceforcingsAccumulationRateEnum; ++ else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum; + else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; + else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; + else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; +@@ -259,11 +258,11 @@ + else if (strcmp(name,"Node")==0) return NodeEnum; + else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; + else if (strcmp(name,"Param")==0) return ParamEnum; ++ else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; + else stage=3; + } + if(stage==3){ +- if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum; +- else if (strcmp(name,"Pengrid")==0) return PengridEnum; ++ if (strcmp(name,"Pengrid")==0) return PengridEnum; + else if (strcmp(name,"Penpair")==0) return PenpairEnum; + else if (strcmp(name,"Penta")==0) return PentaEnum; + else if (strcmp(name,"PentaP1Input")==0) return PentaP1InputEnum; +@@ -382,11 +381,11 @@ + else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; + else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; + else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; ++ else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; + else stage=4; + } + if(stage==4){ +- if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum; +- else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; ++ if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; + else if (strcmp(name,"J")==0) return JEnum; + else if (strcmp(name,"Patch")==0) return PatchEnum; + else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 11509) +@@ -156,8 +156,7 @@ + case SteadystateReltolEnum : return "SteadystateReltol"; + case SteadystateRequestedOutputsEnum : return "SteadystateRequestedOutputs"; + case SurfaceEnum : return "Surface"; +- case SurfaceforcingsAblationRateEnum : return "SurfaceforcingsAblationRate"; +- case SurfaceforcingsAccumulationRateEnum : return "SurfaceforcingsAccumulationRate"; ++ case SurfaceforcingsPrecipitationEnum : return "SurfaceforcingsPrecipitation"; + case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance"; + case ThermalMaxiterEnum : return "ThermalMaxiter"; + case ThermalPenaltyFactorEnum : return "ThermalPenaltyFactor"; +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 11509) +@@ -47,8 +47,6 @@ + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); + iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); + iomodel->FetchDataToInput(elements,VxEnum); + iomodel->FetchDataToInput(elements,VyEnum); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 11509) +@@ -43,8 +43,7 @@ + iomodel->FetchDataToInput(elements,BathymetryEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum); ++ iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); + iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); + iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 11509) +@@ -52,9 +52,6 @@ + iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); + iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); + iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); + iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); + iomodel->FetchDataToInput(elements,PressureEnum); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 11509) +@@ -65,8 +65,6 @@ + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,VzEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); + iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); + iomodel->FetchDataToInput(elements,FlowequationBorderstokesEnum); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 11509) +@@ -41,8 +41,6 @@ + iomodel->FetchDataToInput(elements,VxEnum); + iomodel->FetchDataToInput(elements,VyEnum); + iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); +- iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); + iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum); + +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/extrude.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/extrude.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/extrude.m (revision 11509) +@@ -136,8 +136,7 @@ + md.inversion.vy_obs=project3d(md,'vector',md.inversion.vy_obs,'type','node'); + md.inversion.vel_obs=project3d(md,'vector',md.inversion.vel_obs,'type','node'); + md.surfaceforcings.mass_balance=project3d(md,'vector',md.surfaceforcings.mass_balance,'type','node'); +-md.surfaceforcings.accumulation_rate=project3d(md,'vector',md.surfaceforcings.accumulation_rate,'type','node'); +-md.surfaceforcings.ablation_rate=project3d(md,'vector',md.surfaceforcings.ablation_rate,'type','node'); ++md.surfaceforcings.precipitation=project3d(md,'vector',md.surfaceforcings.precipitation,'type','node'); + md.balancethickness.thickening_rate=project3d(md,'vector',md.balancethickness.thickening_rate,'type','node'); + + %results +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetMarineIceSheetBC.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetMarineIceSheetBC.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetMarineIceSheetBC.m (revision 11509) +@@ -74,16 +74,11 @@ + md.diagnostic.icefront=pressureload; + + +-%Create zeros basalforcings.melting_rate, surfaceforcings.ablation_rate, surfaceforcings.accumulation_rate +-% and surfaceforcings.mass_balance if not specified +-if isnan(md.surfaceforcings.accumulation_rate), +- md.surfaceforcings.accumulation_rate=zeros(md.mesh.numberofvertices,1); +- disp(' no surfaceforcings.accumulation_rate specified: values set as zero'); ++%Create zeros basalforcings and surfaceforcings ++if isnan(md.surfaceforcings.precipitation), ++ md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1); ++ disp(' no surfaceforcings.precipitation specified: values set as zero'); + end +-if isnan(md.surfaceforcings.ablation_rate), +- md.surfaceforcings.ablation_rate=zeros(md.mesh.numberofvertices,1); +- disp(' no surfaceforcings.ablation_rate specified: values set as zero'); +-end + if isnan(md.surfaceforcings.mass_balance), + md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1); + disp(' no surfaceforcings.mass_balance specified: values set as zero'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetIceSheetBC.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetIceSheetBC.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetIceSheetBC.m (revision 11509) +@@ -33,14 +33,10 @@ + end + + %Create zeros basal melting rate and surface mass balance if not specified +-if isnan(md.surfaceforcings.accumulation_rate), +- md.surfaceforcings.accumulation_rate=zeros(md.mesh.numberofvertices,1); +- disp(' no surfaceforcings.accumulation_rate specified: values set as zero'); ++if isnan(md.surfaceforcings.precipitation), ++ md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1); ++ disp(' no surfaceforcings.precipitation specified: values set as zero'); + end +-if isnan(md.surfaceforcings.ablation_rate), +- md.surfaceforcings.ablation_rate=zeros(md.mesh.numberofvertices,1); +- disp(' no surfaceforcings.ablation_rate specified: values set as zero'); +-end + if isnan(md.surfaceforcings.mass_balance), + md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1); + disp(' no surfaceforcings.mass_balance specified: values set as zero'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetIceShelfBC.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetIceShelfBC.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/utils/BC/SetIceShelfBC.m (revision 11509) +@@ -63,16 +63,11 @@ + %plug onto model + md.diagnostic.icefront=pressureload; + +-%Create zeros basalforcings.melting_rate, surfaceforcings.ablation_rate, surfaceforcings.accumulation_rate +-% and surfaceforcings.mass_balance if not specified +-if isnan(md.surfaceforcings.accumulation_rate), +- md.surfaceforcings.accumulation_rate=zeros(md.mesh.numberofvertices,1); +- disp(' no surfaceforcings.accumulation_rate specified: values set as zero'); ++%Create zeros basalforcings and surfaceforcings ++if isnan(md.surfaceforcings.precipitation), ++ md.surfaceforcings.precipitation=zeros(md.mesh.numberofvertices,1); ++ disp(' no surfaceforcings.precipitation specified: values set as zero'); + end +-if isnan(md.surfaceforcings.ablation_rate), +- md.surfaceforcings.ablation_rate=zeros(md.mesh.numberofvertices,1); +- disp(' no surfaceforcings.ablation_rate specified: values set as zero'); +-end + if isnan(md.surfaceforcings.mass_balance), + md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1); + disp(' no surfaceforcings.mass_balance specified: values set as zero'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsAccumulationRateEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsAccumulationRateEnum.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsAccumulationRateEnum.m (revision 11509) +@@ -1,11 +0,0 @@ +-function macro=SurfaceforcingsAccumulationRateEnum() +-%SURFACEFORCINGSACCUMULATIONRATEENUM - Enum of SurfaceforcingsAccumulationRate +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=SurfaceforcingsAccumulationRateEnum() +- +-macro=StringToEnum('SurfaceforcingsAccumulationRate'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsAblationRateEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsAblationRateEnum.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsAblationRateEnum.m (revision 11509) +@@ -1,11 +0,0 @@ +-function macro=SurfaceforcingsAblationRateEnum() +-%SURFACEFORCINGSABLATIONRATEENUM - Enum of SurfaceforcingsAblationRate +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=SurfaceforcingsAblationRateEnum() +- +-macro=StringToEnum('SurfaceforcingsAblationRate'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsPrecipitationEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsPrecipitationEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/enum/SurfaceforcingsPrecipitationEnum.m (revision 11509) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsPrecipitationEnum() ++%SURFACEFORCINGSPRECIPITATIONENUM - Enum of SurfaceforcingsPrecipitation ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsPrecipitationEnum() ++ ++macro=StringToEnum('SurfaceforcingsPrecipitation'); +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/model.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/model.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/model/model.m (revision 11509) +@@ -135,7 +135,6 @@ + if isfield(structmd,'melting'), md.basalforcings.melting_rate=structmd.melting; end + if isfield(structmd,'melting_rate'), md.basalforcings.melting_rate=structmd.melting_rate; end + if isfield(structmd,'accumulation'), md.surfaceforcings.mass_balance=structmd.accumulation; end +- if isfield(structmd,'accumulation_rate'), md.surfaceforcings.mass_balance=structmd.accumulation_rate; end + if isfield(structmd,'numberofgrids'), md.mesh.numberofvertices=structmd.numberofgrids; end + if isfield(structmd,'numberofgrids2d'), md.mesh.numberofvertices2d=structmd.numberofgrids2d; end + if isfield(structmd,'uppergrids'), md.mesh.uppervertex=structmd.uppergrids; end +Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/surfaceforcings.m +=================================================================== +--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/surfaceforcings.m (revision 11508) ++++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/classes/surfaceforcings.m (revision 11509) +@@ -5,9 +5,8 @@ + + classdef surfaceforcings + properties (SetAccess=public) +- accumulation_rate = NaN; +- ablation_rate = NaN; +- mass_balance = NaN; ++ precipitation = NaN; ++ mass_balance = NaN; + end + methods + function obj = surfaceforcings(varargin) % {{{ +@@ -40,14 +39,12 @@ + function disp(obj) % {{{ + disp(sprintf(' surface forcings parameters:')); + +- fielddisplay(obj,'accumulation_rate','surface accumulation rate [m]'); +- fielddisplay(obj,'ablation_rate','surface ablation rate [m]'); +- fielddisplay(obj,'mass_balance','surface mass balance [m]'); ++ fielddisplay(obj,'precipitation','surface precipitation [m/yr ice eq]'); ++ fielddisplay(obj,'mass_balance','surface mass balance [m/yr ice eq]'); + + end % }}} + function marshall(obj,fid) % {{{ +- WriteData(fid,'object',obj,'fieldname','accumulation_rate','format','DoubleMat','mattype',1); +- WriteData(fid,'object',obj,'fieldname','ablation_rate','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','precipitation','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'fieldname','mass_balance','format','DoubleMat','mattype',1); + end % }}} + end Index: /issm/oecreview/Archive/11501-11509/ISSM-DocReview-11501-11509.tex =================================================================== --- /issm/oecreview/Archive/11501-11509/ISSM-DocReview-11501-11509.tex (revision 11515) +++ /issm/oecreview/Archive/11501-11509/ISSM-DocReview-11501-11509.tex (revision 11515) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/11501-11509/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/11501-11509/LogNumber.tex (revision 11515) +++ /issm/oecreview/Archive/11501-11509/LogNumber.tex (revision 11515) @@ -0,0 +1,1 @@ +11501-11509 Index: /issm/oecreview/Archive/11501-11509/Makefile =================================================================== --- /issm/oecreview/Archive/11501-11509/Makefile (revision 11515) +++ /issm/oecreview/Archive/11501-11509/Makefile (revision 11515) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-11501-11509 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/11501-11509/log.tex =================================================================== --- /issm/oecreview/Archive/11501-11509/log.tex (revision 11515) +++ /issm/oecreview/Archive/11501-11509/log.tex (revision 11515) @@ -0,0 +1,13 @@ +\noindent \textbf{Change \#1} with diff file ISSM-11501-11502.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/plot/plot\_riftrelvel.m M /issm/trunk-jpl/src/m/model/plot/plot\_riftvel.m \\ Export determination: 6. \\Rationale: deleted references to numrifts in plot calls \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-11502-11503.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/model/plot/plot\_riftrelvel.m M /issm/trunk-jpl/src/m/model/plot/plot\_riftvel.m \\ Export determination: 6. \\Rationale: deleted references to numrifts in plot calls \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-11503-11504.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/tao/install.sh A /issm/trunk-jpl/externalpackages/tao/tao-2.0-p3.tar.gz D /issm/trunk-jpl/externalpackages/tao/tao-2.0.tar.gz \\ Export determination: 6. \\Rationale: installing tao 2.0-p3, which fixes some bugs from the previous release (line search failure did not stop the optimization) \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-11504-11505.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/tao/install.sh A /issm/trunk-jpl/externalpackages/tao/tao-2.0-p3.tar.gz D /issm/trunk-jpl/externalpackages/tao/tao-2.0.tar.gz \\ Export determination: 6. \\Rationale: installing tao 2.0-p3, which fixes some bugs from the previous release (line search failure did not stop the optimization) +M /issm/trunk-jpl/configure.ac Added silent-rule in configure.ac for a cleaner compilation, this requires to reinstall automake and autoconf, as this was not supported by the previous versions \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-11505-11506.diff: \\ Function name: \\M /issm/trunk-jpl/configure.ac \\ Export determination: 6. \\Rationale: Added silent-rule in configure.ac for a cleaner compilation, this requires to reinstall automake and autoconf, as this was not supported by the previous versions +D /issm/trunk-jpl/src/m/utils/Meca/effective\_value.m D /issm/trunk-jpl/src/m/utils/Meca/glen\_coefficients.m removed useless matlab routines \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-11506-11507.diff: \\ Function name: \\D /issm/trunk-jpl/src/m/utils/Meca/effective\_value.m D /issm/trunk-jpl/src/m/utils/Meca/glen\_coefficients.m \\ Export determination: 6. \\Rationale: removed useless matlab routines +D /issm/trunk-jpl/doc A /issm/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m (from /issm/trunk-jpl/doc/issmdoc.m:11499) moved issmdoc to utils \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-11507-11508.diff: \\ Function name: \\D /issm/trunk-jpl/doc A /issm/trunk-jpl/src/m/utils/Miscellaneous/issmdoc.m (from /issm/trunk-jpl/doc/issmdoc.m:11499) \\ Export determination: 6. \\Rationale: moved issmdoc to utils +M /issm/trunk-jpl/src/c/Makefile.am M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h added PositiveDegreeDay module \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-11508-11509.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/Makefile.am M /issm/trunk-jpl/src/c/objects/Elements/Element.h M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.h M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.h \\ Export determination: 6. \\Rationale: added PositiveDegreeDay module +M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/EnumDefinitions/EnumToModelField.cpp M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp M /issm/trunk-jpl/src/m/classes/model/model.m M /issm/trunk-jpl/src/m/classes/surfaceforcings.m D /issm/trunk-jpl/src/m/enum/SurfaceforcingsAblationRateEnum.m D /issm/trunk-jpl/src/m/enum/SurfaceforcingsAccumulationRateEnum.m A /issm/trunk-jpl/src/m/enum/SurfaceforcingsPrecipitationEnum.m M /issm/trunk-jpl/src/m/model/extrude.m M /issm/trunk-jpl/src/m/utils/BC/SetIceSheetBC.m M /issm/trunk-jpl/src/m/utils/BC/SetIceShelfBC.m M /issm/trunk-jpl/src/m/utils/BC/SetMarineIceSheetBC.m moved AccumulationRate to Precepitation for PDD and removed ablation\_rate never used \\\\ Index: /issm/oecreview/Archive/11501-11509/r1.tex =================================================================== --- /issm/oecreview/Archive/11501-11509/r1.tex (revision 11515) +++ /issm/oecreview/Archive/11501-11509/r1.tex (revision 11515) @@ -0,0 +1,1 @@ +11501 Index: /issm/oecreview/Archive/11501-11509/r2.tex =================================================================== --- /issm/oecreview/Archive/11501-11509/r2.tex (revision 11515) +++ /issm/oecreview/Archive/11501-11509/r2.tex (revision 11515) @@ -0,0 +1,1 @@ +11509 Index: /issm/oecreview/LastMerge =================================================================== --- /issm/oecreview/LastMerge (revision 11514) +++ /issm/oecreview/LastMerge (revision 11515) @@ -1,1 +1,1 @@ -10980 +11236 Index: /issm/oecreview/SyncBranches.sh =================================================================== --- /issm/oecreview/SyncBranches.sh (revision 11514) +++ /issm/oecreview/SyncBranches.sh (revision 11515) @@ -22,5 +22,5 @@ # svn commit -m "Block revision X from being merged into trunk-jpl" -STEP=1 +STEP=4 LASTMERGEREVISION=`cat LastMerge` @@ -50,5 +50,5 @@ svn update B=$(svnversion .) - svn merge --reintegrate https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl + svn merge --reintegrate http://issm.ess.uci.edu/svn/issm/issm/trunk-jpl svn commit -m "merged trunk-jpl and trunk for revision $B" fi Index: /issm/oecreview/oecreview.sh =================================================================== --- /issm/oecreview/oecreview.sh (revision 11514) +++ /issm/oecreview/oecreview.sh (revision 11515) @@ -167,4 +167,5 @@ rm -rf $archivedir && mkdir $archivedir + #start log template cat > $archivedir/log.tex << EOF @@ -218,4 +219,8 @@ cat $archivedir/log.tex && echo "\\noindent \\textbf{Change \#$counter} with diff file ISSM-$i-$j.diff: \\\\ Function name: \\\\$changedpath \\\\ Export determination: 6. \\\\Rationale: $logmessage \\\\\\\\" >> $archivedir/log.tex done + +#Make this latex compatible: +cat $archivedir/log.tex | sed 's/_/\\_/g' > $archivedir/log.tex.bak +mv $archivedir/log.tex.bak $archivedir/log.tex #create pdf file