Changeset 16307


Ignore:
Timestamp:
10/07/13 10:54:18 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: md.inversion.cost_functions is now only one line (i.e., we cannot change the cost function during the optimization)

Location:
issm/trunk-jpl
Files:
1 deleted
46 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/control_core.cpp

    r16291 r16307  
    1818
    1919        /*parameters: */
    20         int        num_controls,num_responses;
     20        int        num_controls;
    2121        int        nsteps;
    2222        IssmDouble tol_cm;
    … …  
    2626
    2727        int        *control_type   = NULL;
    28         IssmDouble *responses      = NULL;
    29         int        *step_responses = NULL;
    3028        IssmDouble *maxiter        = NULL;
    3129        IssmDouble *cm_jump        = NULL;
    … …  
    4543        /*Recover parameters used throughout the solution*/
    4644        femmodel->parameters->FindParam(&num_controls,InversionNumControlParametersEnum);
    47         femmodel->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    4845        femmodel->parameters->FindParam(&control_type,NULL,InversionControlParametersEnum);
    49         femmodel->parameters->FindParam(&responses,NULL,NULL,InversionCostFunctionsEnum);
    5046        femmodel->parameters->FindParam(&nsteps,InversionNstepsEnum);
    5147        femmodel->parameters->FindParam(&maxiter,NULL,InversionMaxiterPerStepEnum);
    … …  
    6561        if(isFS) solutioncore(femmodel);
    6662
    67         /*Initialize responses: */
     63        /*Initialize cost function: */
    6864        J=xNew<IssmDouble>(nsteps);
    69         step_responses=xNew<int>(num_responses);
    7065
    7166        /*Initialize some of the BrentSearch arguments: */
    … …  
    7873                /*Display info*/
    7974                if(VerboseControl()) _printf0_("\n" << "   control method step " << n+1 << "/" << nsteps << "\n");
    80                 for(i=0;i<num_responses;i++) step_responses[i]=reCast<int,IssmDouble>(responses[n*num_responses+i]);
    81                 femmodel->parameters->SetParam(step_responses,1,num_responses,StepResponsesEnum);
     75
    8276
    8377                /*In steady state inversion, compute new temperature field now*/
    … …  
    118112        /*Free ressources: */
    119113        xDelete<int>(control_type);
    120         xDelete<int>(step_responses);
    121114        xDelete<IssmDouble>(maxiter);
    122         xDelete<IssmDouble>(responses);
    123115        xDelete<IssmDouble>(cm_jump);
    124116        xDelete<IssmDouble>(J);

  • issm/trunk-jpl/src/c/analyses/controltao_core.cpp

    r16158 r16307  
    109109
    110110        /*Retreive arguments*/
    111         int                  solution_type,num_cost_functions;
     111        int                  solution_type;
    112112        AppCtx              *user            = (AppCtx *)userCtx;
    113113        FemModel            *femmodel        = user->femmodel;
    114         int                 *cost_functions  = NULL;
    115         IssmDouble          *cost_functionsd = NULL;
    116114        Vector<IssmDouble>  *gradient        = NULL;
    117115        Vector<IssmDouble>  *X               = NULL;
    … …  
    127125        /*Recover some parameters*/
    128126        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    129         femmodel->parameters->FindParam(&num_cost_functions,InversionNumCostFunctionsEnum);
    130         femmodel->parameters->FindParam(&cost_functionsd,NULL,NULL,InversionCostFunctionsEnum);
    131 
    132         /*Prepare objective function*/
    133         cost_functions=xNew<int>(num_cost_functions);
    134         for(int i=0;i<num_cost_functions;i++) cost_functions[i]=(int)cost_functionsd[i]; //FIXME
    135         femmodel->parameters->SetParam(cost_functions,1,num_cost_functions,StepResponsesEnum);
    136127
    137128        /*Compute solution and adjoint*/
    … …  
    152143
    153144        /*Clean-up and return*/
    154         xDelete<int>(cost_functions);
    155         xDelete<IssmDouble>(cost_functionsd);
    156145        return 0;
    157146}

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r16277 r16307  
    55745574        GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
    55755575        this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    5576         this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     5576        this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    55775577        Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum);   _assert_(weights_input);
    55785578        Input* vx_input     =inputs->GetInput(VxEnum);        _assert_(vx_input);
    … …  
    57705770        GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
    57715771        this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    5772         this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     5772        this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    57735773        Input* weights_input = inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input);
    57745774        Input* vx_input      = inputs->GetInput(VxEnum);                                 _assert_(vx_input);
    … …  
    60086008        int num_responses,resp;
    60096009        this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    6010         this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     6010        this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    60116011
    60126012        for(resp=0;resp<num_responses;resp++) switch(responses[resp]){

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r16291 r16307  
    38033803        int         num_responses,resp;
    38043804        this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    3805         this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     3805        this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    38063806
    38073807        for(resp=0;resp<num_responses;resp++) switch(responses[resp]){
    … …  
    42454245        GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
    42464246        this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    4247         this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     4247        this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    42484248        Input* thickness_input            = inputs->GetInput(ThicknessEnum);                          _assert_(thickness_input);
    42494249        Input* thicknessobs_input         = inputs->GetInput(InversionThicknessObsEnum);              _assert_(thicknessobs_input);
    … …  
    48904890        GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
    48914891        this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    4892         this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     4892        this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    48934893        Input* thickness_input    = inputs->GetInput(ThicknessEnum);                          _assert_(thickness_input);
    48944894        Input* thicknessobs_input = inputs->GetInput(InversionThicknessObsEnum);              _assert_(thicknessobs_input);
    … …  
    49804980        GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
    49814981        this->parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    4982         this->parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     4982        this->parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    49834983        Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum);   _assert_(weights_input);
    49844984        Input* vx_input     =inputs->GetInput(VxEnum);        _assert_(vx_input);

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r16275 r16307  
    10501050        /*Recover parameters*/
    10511051        parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum);
    1052         parameters->FindParam(&responses,NULL,NULL,StepResponsesEnum);
     1052        parameters->FindParam(&responses,NULL,InversionCostFunctionsEnum);
    10531053
    10541054        /*Get response*/

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

    r16248 r16307  
    1616        int         num_cm_responses;
    1717        int        *control_type     = NULL;
    18         IssmDouble *cm_responses     = NULL;
     18        int        *cm_responses     = NULL;
    1919        IssmDouble *cm_jump          = NULL;
    2020        IssmDouble *optscal          = NULL;
    … …  
    5858                if(tao_analysis){
    5959                        parameters->AddObject(new IntVecParam(InversionControlParametersEnum,control_type,num_control_type));
    60                         parameters->AddObject(new DoubleVecParam(InversionCostFunctionsEnum,cm_responses,num_cm_responses));
     60                        parameters->AddObject(new IntVecParam(InversionCostFunctionsEnum,cm_responses,num_cm_responses));
    6161                }
    6262                else{
    6363                        parameters->AddObject(new IntVecParam(InversionControlParametersEnum,control_type,num_control_type));
     64                        parameters->AddObject(new IntVecParam(InversionCostFunctionsEnum,cm_responses,num_cm_responses));
    6465                        parameters->AddObject(new DoubleMatParam(InversionGradientScalingEnum,optscal,nsteps,num_control_type));
    65                         parameters->AddObject(new DoubleMatParam(InversionCostFunctionsEnum,cm_responses,nsteps,num_cm_responses));
    6666                        parameters->AddObject(new DoubleVecParam(InversionStepThresholdEnum,cm_jump,nsteps));
    6767                        parameters->AddObject(new DoubleVecParam(InversionMaxiterPerStepEnum,maxiter,nsteps));
    … …  
    6969
    7070                xDelete<int>(control_type);
    71                 iomodel->DeleteData(cm_responses,InversionCostFunctionsEnum);
     71                xDelete<int>(cm_responses);
    7272                iomodel->DeleteData(cm_jump,InversionStepThresholdEnum);
    7373                iomodel->DeleteData(optscal,InversionGradientScalingEnum);

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r16304 r16307  
    486486        ThicknessAlongGradientEnum,
    487487        ThicknessAcrossGradientEnum,
    488         StepResponsesEnum,
    489488        IntMatParamEnum,
    490489        RheologyBbarAbsGradientEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r16304 r16307  
    480480                case ThicknessAlongGradientEnum : return "ThicknessAlongGradient";
    481481                case ThicknessAcrossGradientEnum : return "ThicknessAcrossGradient";
    482                 case StepResponsesEnum : return "StepResponses";
    483482                case IntMatParamEnum : return "IntMatParam";
    484483                case RheologyBbarAbsGradientEnum : return "RheologyBbarAbsGradient";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r16304 r16307  
    489489              else if (strcmp(name,"ThicknessAlongGradient")==0) return ThicknessAlongGradientEnum;
    490490              else if (strcmp(name,"ThicknessAcrossGradient")==0) return ThicknessAcrossGradientEnum;
    491               else if (strcmp(name,"StepResponses")==0) return StepResponsesEnum;
    492491              else if (strcmp(name,"IntMatParam")==0) return IntMatParamEnum;
    493492              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    … …  
    506505              else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    507506              else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
     507              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    512               else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
     511              if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
    513512              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
    514513              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;

  • issm/trunk-jpl/src/m/classes/inversion.m

    r16249 r16307  
    8686
    8787                        %several responses can be used:
    88                         obj.cost_functions=101*ones(obj.nsteps,1);
     88                        obj.cost_functions=101;
    8989
    9090                        %step_threshold is used to speed up control method. When
    … …  
    115115                        md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps 1],'>=',0);
    116116                        md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps 1]);
    117                         md = checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps num_costfunc],'values',[101:105 201 501:506]);
     117                        md = checkfield(md,'inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506]);
    118118                        md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
    119119                        md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps num_controls]);

  • issm/trunk-jpl/src/m/classes/inversion.py

    r16249 r16307  
    9393
    9494                #several responses can be used:
    95                 self.cost_functions=101*numpy.ones((self.nsteps,1))
     95                self.cost_functions=101
    9696
    9797                #step_threshold is used to speed up control method. When
    … …  
    114114
    115115                num_controls=numpy.size(md.inversion.control_parameters)
    116                 num_costfunc=numpy.size(md.inversion.cost_functions,axis=1)
     116                num_costfunc=numpy.size(md.inversion.cost_functions)
    117117
    118118                md = checkfield(md,'inversion.iscontrol','values',[0,1])
    … …  
    123123                md = checkfield(md,'inversion.maxiter_per_step','size',[md.inversion.nsteps],'>=',0)
    124124                md = checkfield(md,'inversion.step_threshold','size',[md.inversion.nsteps])
    125                 md = checkfield(md,'inversion.cost_functions','size',[md.inversion.nsteps,num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505])
     125                md = checkfield(md,'inversion.cost_functions','size',[num_costfunc],'values',[101,102,103,104,105,201,501,502,503,504,505])
    126126                md = checkfield(md,'inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices,num_costfunc],'>=',0)
    127127                md = checkfield(md,'inversion.gradient_scaling','size',[md.inversion.nsteps,num_controls])
    … …  
    171171
    172172                #process cost functions
    173                 num_cost_functions=numpy.size(self.cost_functions,axis=1)
     173                num_cost_functions=numpy.size(self.cost_functions)
    174174                data=copy.deepcopy(self.cost_functions)
    175                 data[numpy.nonzero(data==101)]=SurfaceAbsVelMisfitEnum()
    176                 data[numpy.nonzero(data==102)]=SurfaceRelVelMisfitEnum()
    177                 data[numpy.nonzero(data==103)]=SurfaceLogVelMisfitEnum()
    178                 data[numpy.nonzero(data==104)]=SurfaceLogVxVyMisfitEnum()
    179                 data[numpy.nonzero(data==105)]=SurfaceAverageVelMisfitEnum()
    180                 data[numpy.nonzero(data==201)]=ThicknessAbsMisfitEnum()
    181                 data[numpy.nonzero(data==501)]=DragCoefficientAbsGradientEnum()
    182                 data[numpy.nonzero(data==502)]=RheologyBbarAbsGradientEnum()
    183                 data[numpy.nonzero(data==503)]=ThicknessAbsGradientEnum()
    184                 data[numpy.nonzero(data==504)]=ThicknessAlongGradientEnum()
    185                 data[numpy.nonzero(data==505)]=ThicknessAcrossGradientEnum()
    186                 WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3)
     175                data=[SurfaceAbsVelMisfitEnum()        if x==101 else x for x in data]
     176                data=[SurfaceRelVelMisfitEnum()        if x==102 else x for x in data]
     177                data=[SurfaceLogVelMisfitEnum()        if x==103 else x for x in data]
     178                data=[SurfaceLogVxVyMisfitEnum()       if x==104 else x for x in data]
     179                data=[SurfaceAverageVelMisfitEnum()    if x==105 else x for x in data]
     180                data=[ThicknessAbsMisfitEnum()         if x==201 else x for x in data]
     181                data=[DragCoefficientAbsGradientEnum() if x==501 else x for x in data]
     182                data=[RheologyBbarAbsGradientEnum()    if x==502 else x for x in data]
     183                data=[ThicknessAbsGradientEnum()       if x==503 else x for x in data]
     184                data=[ThicknessAlongGradientEnum()     if x==504 else x for x in data]
     185                data=[ThicknessAcrossGradientEnum()    if x==505 else x for x in data]
     186                WriteData(fid,'data',numpy.array(data).reshape(1,-1),'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3)
    187187                WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer')
    188188        # }}}

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r16304 r16307  
    472472def ThicknessAlongGradientEnum(): return StringToEnum("ThicknessAlongGradient")[0]
    473473def ThicknessAcrossGradientEnum(): return StringToEnum("ThicknessAcrossGradient")[0]
    474 def StepResponsesEnum(): return StringToEnum("StepResponses")[0]
    475474def IntMatParamEnum(): return StringToEnum("IntMatParam")[0]
    476475def RheologyBbarAbsGradientEnum(): return StringToEnum("RheologyBbarAbsGradient")[0]

  • issm/trunk-jpl/test/NightlyRun/test212.m

    r15771 r16307  
    1010md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1);
    1111md.inversion.nsteps=2;
    12 md.inversion.cost_functions=101*ones(md.inversion.nsteps,1);
     12md.inversion.cost_functions=101;
    1313md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    1414md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test212.py

    r15771 r16307  
    2222md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
    2323md.inversion.nsteps=2
    24 md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
     24md.inversion.cost_functions=101
    2525md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
    2626md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test213.m

    r16167 r16307  
    1111md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=101*ones(md.inversion.nsteps,1);
     13md.inversion.cost_functions=101;
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    1515md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test213.py

    r15771 r16307  
    2323md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
    2424md.inversion.nsteps=2
    25 md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
     25md.inversion.cost_functions=101.
    2626md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
    2727md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test214.m

    r15771 r16307  
    1111md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=101*ones(md.inversion.nsteps,1);
     13md.inversion.cost_functions=101;
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    1515md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test214.py

    r15771 r16307  
    2323md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
    2424md.inversion.nsteps=2
    25 md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
     25md.inversion.cost_functions=101.
    2626md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
    2727md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test215.m

    r16225 r16307  
    1111md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=101*ones(md.inversion.nsteps,1);
     13md.inversion.cost_functions=101;
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    1515md.inversion.gradient_scaling=10^7*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test215.py

    r16225 r16307  
    2323md.inversion.max_parameters=2.*10**9*ones((md.mesh.numberofvertices,1))
    2424md.inversion.nsteps=2
    25 md.inversion.cost_functions=101.*ones((md.inversion.nsteps,1))
     25md.inversion.cost_functions=101.
    2626md.inversion.cost_functions_coefficients=ones((md.mesh.numberofvertices,1))
    2727md.inversion.gradient_scaling=10**7*ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test272.m

    r16167 r16307  
    1212md.inversion.max_parameters=(1-10^-13)*ones(md.mesh.numberofvertices,1);
    1313md.inversion.nsteps=2;
    14 md.inversion.cost_functions=101.*ones(md.inversion.nsteps,1);
     14md.inversion.cost_functions=101;
    1515md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    1616md.inversion.gradient_scaling=0.9*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test272.py

    r16167 r16307  
    2222md.inversion.max_parameters=numpy.ones((md.mesh.numberofvertices,1))
    2323md.inversion.nsteps=2
    24 md.inversion.cost_functions=101.*numpy.ones((md.inversion.nsteps,1))
     24md.inversion.cost_functions=101.
    2525md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
    2626md.inversion.gradient_scaling=0.9*numpy.ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test319.m

    r15771 r16307  
    1010md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1111md.inversion.nsteps=2;
    12 md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     12md.inversion.cost_functions=[103  501];
    1313md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
    1414md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test319.py

    r15771 r16307  
    2020md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2121md.inversion.nsteps=2
    22 md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     22md.inversion.cost_functions=[103,501]
    2323md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2424md.inversion.cost_functions_coefficients[:,1]=2.*10**-7

  • issm/trunk-jpl/test/NightlyRun/test320.m

    r15771 r16307  
    1111md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     13md.inversion.cost_functions=[103  501];
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
    1515md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test320.py

    r15771 r16307  
    2121md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2222md.inversion.nsteps=2
    23 md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     23md.inversion.cost_functions=[103,501]
    2424md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2525md.inversion.cost_functions_coefficients[:,1]=2.*10**-7

  • issm/trunk-jpl/test/NightlyRun/test321.m

    r15771 r16307  
    1111md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=[102*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     13md.inversion.cost_functions=[102  501];
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
    1515md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test321.py

    r15771 r16307  
    2121md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2222md.inversion.nsteps=2
    23 md.inversion.cost_functions=numpy.hstack((102*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     23md.inversion.cost_functions=[102,501]
    2424md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2525md.inversion.cost_functions_coefficients[:,1]=2*10**-7

  • issm/trunk-jpl/test/NightlyRun/test322.m

    r15771 r16307  
    1111md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=[104*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     13md.inversion.cost_functions=[104  501];
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
    1515md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test322.py

    r15771 r16307  
    2121md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2222md.inversion.nsteps=2
    23 md.inversion.cost_functions=numpy.hstack((104*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     23md.inversion.cost_functions=[104,501]
    2424md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2525md.inversion.cost_functions_coefficients[:,1]=2.*10**-7

  • issm/trunk-jpl/test/NightlyRun/test415.m

    r15565 r16307  
    1111md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     13md.inversion.cost_functions=[103  501];
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
    1515md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test415.py

    r15565 r16307  
    2121md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2222md.inversion.nsteps=2
    23 md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     23md.inversion.cost_functions=[103,501]
    2424md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2525md.inversion.cost_functions_coefficients[:,1]=2.*10**-7

  • issm/trunk-jpl/test/NightlyRun/test416.m

    r15565 r16307  
    1111md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=[102*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     13md.inversion.cost_functions=[102  501];
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7;
    1515md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test416.py

    r15565 r16307  
    2121md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2222md.inversion.nsteps=2
    23 md.inversion.cost_functions=numpy.hstack((102*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     23md.inversion.cost_functions=[102,501]
    2424md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2525md.inversion.cost_functions_coefficients[:,1]=2.*10**-7

  • issm/trunk-jpl/test/NightlyRun/test511.m

    r15997 r16307  
    1616md.inversion.max_parameters=2.*10^9*ones(md.mesh.numberofvertices,1);
    1717md.inversion.nsteps=2;
    18 md.inversion.cost_functions=101*ones(md.inversion.nsteps,1);
     18md.inversion.cost_functions=101;
    1919md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    2020md.inversion.gradient_scaling=10.^8*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test511.py

    r15997 r16307  
    2626md.inversion.max_parameters=2.*10**9*numpy.ones((md.mesh.numberofvertices,1))
    2727md.inversion.nsteps=2
    28 md.inversion.cost_functions=101*numpy.ones((md.inversion.nsteps,1))
     28md.inversion.cost_functions=101
    2929md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
    3030md.inversion.gradient_scaling=10.**8*numpy.ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test512.m

    r15771 r16307  
    1111md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     13md.inversion.cost_functions=[103  501];
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
    1515md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test512.py

    r15771 r16307  
    2121md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2222md.inversion.nsteps=2
    23 md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     23md.inversion.cost_functions=[103,501]
    2424md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2525md.inversion.cost_functions_coefficients[:,1]=2.*10**-7

  • issm/trunk-jpl/test/NightlyRun/test513.m

    r15818 r16307  
    1111md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1);
    1212md.inversion.nsteps=2;
    13 md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1)  501*ones(md.inversion.nsteps,1)];
     13md.inversion.cost_functions=[103  501];
    1414md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7;
    1515md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test513.py

    r15586 r16307  
    2020md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1))
    2121md.inversion.nsteps=2
    22 md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1))))
     22md.inversion.cost_functions=[103,501]
    2323md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2))
    2424md.inversion.cost_functions_coefficients[:,1]=2.*10**-7

  • issm/trunk-jpl/test/NightlyRun/test611.m

    r15767 r16307  
    1212md.inversion.min_parameters=-50.*ones(md.mesh.numberofvertices,1);
    1313md.inversion.max_parameters=50.*ones(md.mesh.numberofvertices,1);
    14 md.inversion.cost_functions=201*ones(md.inversion.nsteps,1);
     14md.inversion.cost_functions=201;
    1515md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    1616md.inversion.gradient_scaling=10./md.constants.yts*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test611.py

    r15767 r16307  
    2222md.inversion.min_parameters=-50.*numpy.ones((md.mesh.numberofvertices,1))
    2323md.inversion.max_parameters=50.*numpy.ones((md.mesh.numberofvertices,1))
    24 md.inversion.cost_functions=201*numpy.ones((md.inversion.nsteps,1))
     24md.inversion.cost_functions=201
    2525md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
    2626md.inversion.gradient_scaling=10./md.constants.yts*numpy.ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test612.m

    r15565 r16307  
    1313md.inversion.min_parameters=-50.*ones(md.mesh.numberofvertices,1);
    1414md.inversion.max_parameters=50.*ones(md.mesh.numberofvertices,1);
    15 md.inversion.cost_functions=201*ones(md.inversion.nsteps,1);
     15md.inversion.cost_functions=201;
    1616md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    1717md.inversion.gradient_scaling=10./md.constants.yts*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test612.py

    r15565 r16307  
    2424md.inversion.min_parameters=-50.*numpy.ones((md.mesh.numberofvertices,1))
    2525md.inversion.max_parameters=50.*numpy.ones((md.mesh.numberofvertices,1))
    26 md.inversion.cost_functions=201*numpy.ones((md.inversion.nsteps,1))
     26md.inversion.cost_functions=201
    2727md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
    2828md.inversion.gradient_scaling=10./md.constants.yts*numpy.ones((md.inversion.nsteps,1))

  • issm/trunk-jpl/test/NightlyRun/test613.m

    r15997 r16307  
    1919md.inversion.min_parameters=[-2000.*ones(md.mesh.numberofvertices,1) -2000.*ones(md.mesh.numberofvertices,1)];
    2020md.inversion.max_parameters=[+2000.*ones(md.mesh.numberofvertices,1) +2000.*ones(md.mesh.numberofvertices,1)];
    21 md.inversion.cost_functions=201*ones(md.inversion.nsteps,1);
     21md.inversion.cost_functions=201;
    2222md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1);
    2323md.inversion.maxiter_per_step=4*ones(md.inversion.nsteps,1);

  • issm/trunk-jpl/test/NightlyRun/test613.py

    r15997 r16307  
    3131md.inversion.min_parameters=numpy.hstack((-2000.*numpy.ones((md.mesh.numberofvertices,1)),-2000.*numpy.ones((md.mesh.numberofvertices,1))))
    3232md.inversion.max_parameters=numpy.hstack((+2000.*numpy.ones((md.mesh.numberofvertices,1)),+2000.*numpy.ones((md.mesh.numberofvertices,1))))
    33 md.inversion.cost_functions=201*numpy.ones((md.inversion.nsteps,1))
     33md.inversion.cost_functions=201
    3434md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,1))
    3535md.inversion.maxiter_per_step=4*numpy.ones((md.inversion.nsteps,1))
Note: See TracChangeset for help on using the changeset viewer.