Changeset 24839


Ignore:
Timestamp:
05/09/20 18:06:59 (5 years ago)
Author:
Eric.Larour
Message:

CHG: response function now includes a partition vector. Updated preqmu accordingly,
trying to remove md.qmu.partition as much as possible.

Location:
issm/trunk-jpl
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/classes/qmu/response_function.m

    r24537 r24839  
     1%RESPONSE_FUNCTION class definition
    12%
    2 %  definition for the response_function class.
    3 %
    4 %  [rf]=response_function(varargin)
    5 %
    6 %  where the required varargin are:
    7 %    descriptor    (char, description, '')
    8 %  and the optional varargin and defaults are:
    9 %    respl         (double vector, response levels, [])
    10 %    probl         (double vector, probability levels, [])
    11 %    rell          (double vector, reliability levels, [])
    12 %    grell         (double vector, gen. reliability levels, [])
    13 %
    14 %  note that zero arguments constructs a default instance; one
    15 %  argument of the class copies the instance; and one or more
    16 %  arguments constructs a new instance from the arguments.
    17 %
    18 %  "Copyright 2009, by the California Institute of Technology.
    19 %  ALL RIGHTS RESERVED. United States Government Sponsorship
    20 %  acknowledged. Any commercial use must be negotiated with
    21 %  the Office of Technology Transfer at the California Institute
    22 %  of Technology.  (J. Schiermeier, NTR 47078)
    23 %
    24 %  This software may be subject to U.S. export control laws.
    25 %  By accepting this  software, the user agrees to comply with
    26 %  all applicable U.S. export laws and regulations. User has the
    27 %  responsibility to obtain export licenses, or other export
    28 %  authority as may be required before exporting such information
    29 %  to foreign countries or providing access to foreign persons."
    30 %
     3%   Usage:
     4%      rf=response_function('descriptor',descriptor,'response_levels',respl,...
     5%           'probability_levels',probl,'reliability_levels',rell,general_reliability_levels',grell,...
     6%           'partition',partition);
     7%      where rf is the response function object returned by the constructor. All options except the
     8%      descriptor are optional. A partition can be provided for scaled variables.
     9%
     10%   Example:
     11%      md.qmu.responses.maxvel=response_function('descriptor','MaxVel','response_levels',[0],...
     12%                              'probl',[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]');
     13
    3114classdef response_function
    3215    properties
     
    3619        rell      =[];
    3720        grell     =[];
     21                partition = [];
    3822    end
     23    methods
     24                function self=response_function(varargin) %constructor {{{
    3925
    40     methods
    41         function [rf]=response_function(varargin)
     26                        %recover options:
     27                        options = pairoptions(varargin{:});
    4228
    43             switch nargin
     29                        %initialize fields:
     30                        self.descriptor=getfieldvalue(options,'descriptor');
     31                        self.respl=getfieldvalue(options,'response_levels',[]);
     32                        self.probl=getfieldvalue(options,'probability_levels',...
     33                                [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     34                        self.rell=getfieldvalue(options,'reliability_levels',[]);
     35                        self.grell=getfieldvalue(options,'general_reliability_levels',[]);
     36                       
     37                        %if the response is scaled,  a partition vector should have been supplied.
     38                        if self.isscaled(),
     39                                self.partition=getfieldvalue(options,'partition');
     40                                npart=partition_npart(self.partition);
     41                        end
     42                end %}}}
     43        function []=disp(rf)% {{{
    4444
    45                                         %  create a default object
    46                 case 0
    47 
    48                                                  %  copy the object or create the object from the input
    49                 otherwise
    50                     if  (nargin == 1) && isa(varargin{1},'response_function')
    51                         rf=varargin{1};
    52                     else
    53                         asizec=num2cell(array_size(varargin{1:min(nargin,1)}));
    54                         rf(asizec{:})=response_function;
    55                         clear asizec
    56 
    57                         if ischar(varargin{1})
    58                             varargin{1}=cellstr(varargin{1});
    59                         end
    60                         for i=1:numel(rf)
    61                             if (numel(varargin{1}) > 1)
    62                                 rf(i).descriptor=varargin{1}{i};
    63                             else
    64                                 rf(i).descriptor=[char(varargin{1}) string_dim(rf,i,'vector')];
    65                             end
    66                         end
    67 
    68                         if (nargin >= 2)
    69                             for i=1:numel(rf)
    70                                 rf(i).respl     =varargin{2};
    71                             end
    72                             if (nargin >= 3)
    73                                 for i=1:numel(rf)
    74                                     rf(i).probl     =varargin{3};
    75                                 end
    76                                 if (nargin >= 4)
    77                                     for i=1:numel(rf)
    78                                         rf(i).rell      =varargin{4};
    79                                     end
    80                                     if (nargin >= 5)
    81                                         for i=1:numel(rf)
    82                                             rf(i).grell     =varargin{5};
    83                                         end
    84 
    85                                         if (nargin > 5)
    86                                             warning('response_function:extra_arg',...
    87                                                 'Extra arguments for object of class ''%s''.',...
    88                                                 class(rf));
    89                                         end
    90                                     end
    91                                 end
    92                             end
    93                         end
    94                     end
    95             end
    96 
    97         end
    98 
    99         function []=disp(rf)
    10045
    10146        %  display the object
     
    11257            end
    11358
    114         end
     59        end % }}}
     60        function [desc]  =prop_desc(rf,dstr)% {{{
    11561
    116         function [desc]  =prop_desc(rf,dstr)
    11762            desc=cell(1,numel(rf));
    11863            for i=1:numel(rf)
     
    12873            end
    12974            desc=allempty(desc);
    130         end
    131         function [stype] =prop_stype(rf)
     75        end % }}}
     76        function [stype] =prop_stype(rf)% {{{
     77
    13278            stype={};
    133         end
    134         function [scale] =prop_scale(rf)
     79        end% }}}
     80        function [scale] =prop_scale(rf)% {{{
     81
    13582            scale=[];
    136         end
    137         function [weight]=prop_weight(rf)
     83        end% }}}
     84        function [weight]=prop_weight(rf) % {{{
     85
    13886            weight=[];
    139         end
    140         function [lower] =prop_lower(rf)
     87        end% }}}
     88        function [lower] =prop_lower(rf)% {{{
     89
    14190            lower=[];
    142         end
    143         function [upper] =prop_upper(rf)
     91        end% }}}
     92        function [upper] =prop_upper(rf)% {{{
     93
    14494            upper=[];
    145         end
    146         function [target]=prop_target(rf)
     95        end % }}}
     96        function [target]=prop_target(rf) % {{{
    14797            target=[];
    148         end
    149         function [respl,probl,rell,grell]=prop_levels(rf)
     98        end % }}}
     99        function [respl,probl,rell,grell]=prop_levels(rf) % {{{
    150100            respl=cell(1,numel(rf));
    151101            probl=cell(1,numel(rf));
     
    162112            rell =allempty(rell);
    163113            grell=allempty(grell);
    164         end
     114        end % }}}
     115                %new methods:
     116        function scaled =isscaled(self) % {{{
     117                if strncmp(self.descriptor,'scaled_',7),
     118                        scaled=1;
     119                else
     120                        scaled=0;
     121                end
     122        end % }}}
    165123    end
     124    methods (Static)
     125        function [rdesc]=dakota_write(fidi,dresp,rdesc) % {{{
    166126
    167     methods (Static)
    168         function [rdesc]=dakota_write(fidi,dresp,rdesc)
    169 
    170                           %  collect only the responses of the appropriate class
     127                        %collect only the responses of the appropriate class
    171128            rf=struc_class(dresp,'response_function');
    172129
    173                                 %  write responses
    174                                 [rdesc]=rlist_write(fidi,'response_functions','response_function',rf,rdesc);
    175                         end
    176 
    177                         function []=dakota_rlev_write(fidi,dresp,params)
     130                        %write responses
     131                        [rdesc]=rlist_write(fidi,'response_functions','response_function',rf,rdesc);
     132                end % }}}
     133                function []=dakota_rlev_write(fidi,dresp,params) % {{{
    178134
    179135                                %  collect only the responses of the appropriate class
     
    182138                                %  write response levels
    183139                                rlev_write(fidi,rf,params);
    184         end
     140        end % }}}
    185141    end
    186142end
  • issm/trunk-jpl/src/m/qmu/preqmu.m

    r24541 r24839  
    3030responses=expandresponses(md,responses);
    3131
    32 %go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses
     32%go through variables and responses, and check they don't have more than the number of partitions. Also determine numvariables and numresponses
    3333numvariables=0;
    3434variable_fieldnames=fieldnames(variables);
     
    3737        fieldvariables=variables.(field_name);
    3838        for j=1:numel(fieldvariables)
    39                 if strncmpi(fieldvariables(j).descriptor,'scaled_',7) && str2int(fieldvariables(j).descriptor,'last')>md.qmu.numberofpartitions,
    40                         error('preqmu error message: one of the expanded variables has more values than the number of partitions (setup in md.qmu.numberofpartitions)');
     39                if strncmpi(fieldvariables(j).descriptor,'scaled_',7),
     40                        npart=partition_npart(fieldvariables(j).partition);
     41                        if str2int(fieldvariables(j).descriptor,'last')>npart,
     42                                error('preqmu error message: one of the expanded variables has more values than the number of partitions ');
     43                        end
    4144                end
    4245        end
     
    5053        fieldresponses=responses.(field_name);
    5154        for j=1:numel(fieldresponses)
    52                 if strncmpi(fieldresponses(j).descriptor,'scaled_',7) && str2int(fieldresponses(j).descriptor,'last')>md.qmu.numberofpartitions,
    53                         error('preqmu error message: one of the expanded responses has more values than the number of partitions (setup in md.qmu.numberofpartitions)');
     55                if strncmpi(fieldresponses(j).descriptor,'scaled_',7),
     56                        npart=partition_npart(fieldresponses(j).partition);
     57                        if str2int(fieldresponses(j).descriptor,'last')>npart,
     58                                error('preqmu error message: one of the expanded responses has more values than the number of partitions (setup in md.qmu.numberofpartitions)');
     59                        end
    5460                end
    5561        end
  • issm/trunk-jpl/test/NightlyRun/test218.m

    r24836 r24839  
    6666
    6767%responses
    68 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     68md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
    6969
    7070%method
  • issm/trunk-jpl/test/NightlyRun/test234.m

    r24836 r24839  
    3333
    3434%responses
    35 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    36 md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    37 md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    38 md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    39 md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    40 md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    41 md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    42 md.qmu.responses.massFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     35md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
     36md.qmu.responses.IceVolume=response_function('descriptor','IceVolume');
     37md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1');
     38md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2');
     39md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3');
     40md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4');
     41md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5');
     42md.qmu.responses.massFlux6=response_function('descriptor','indexed_MassFlux_6');
    4343
    4444%mass flux profiles
  • issm/trunk-jpl/test/NightlyRun/test235.m

    r24836 r24839  
    3434
    3535%responses
    36 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    37 md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    38 md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    39 md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    40 md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    41 md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    42 md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    43 md.qmu.responses.massFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     36md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
     37md.qmu.responses.IceVolume=response_function('descriptor','IceVolume');
     38md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1');
     39md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2');
     40md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3');
     41md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4');
     42md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5');
     43md.qmu.responses.massFlux6=response_function('descriptor','indexed_MassFlux_6');
    4444
    4545%mass flux profiles
  • issm/trunk-jpl/test/NightlyRun/test244.m

    r24836 r24839  
    7373
    7474%responses
    75 md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    76 md.qmu.responses.IceMass=response_function('IceMass',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    77 md.qmu.responses.TotalSmb=response_function('TotalSmb',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     75md.qmu.responses.IceVolume=response_function('descriptor','IceVolume');
     76md.qmu.responses.IceMass=response_function('descriptor','IceMass');
     77md.qmu.responses.TotalSmb=response_function('descriptor','TotalSmb');
    7878
    7979%  nond_sampling study
  • issm/trunk-jpl/test/NightlyRun/test250.m

    r24838 r24839  
    3333
    3434%responses
    35 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    36 md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    37 md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    38 md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    39 md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    40 md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    41 md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    42 md.qmu.responses.massFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     35md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
     36md.qmu.responses.IceVolume=response_function('descriptor','IceVolume');
     37md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1');
     38md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2');
     39md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3');
     40md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4');
     41md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5');
     42md.qmu.responses.massFlux6=response_function('descriptor','indexed_MassFlux_6');
    4343
    4444%mass flux profiles
  • issm/trunk-jpl/test/NightlyRun/test251.m

    r24836 r24839  
    3333
    3434%responses
    35 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    36 md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    37 md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    38 md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    39 md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    40 md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    41 md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    42 md.qmu.responses.massFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     35md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
     36md.qmu.responses.IceVolume=response_function('descriptor','IceVolume');
     37md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1');
     38md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2');
     39md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3');
     40md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4');
     41md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5');
     42md.qmu.responses.massFlux6=response_function('descriptor','indexed_MassFlux_6');
    4343
    4444%mass flux profiles
  • issm/trunk-jpl/test/NightlyRun/test412.m

    r24836 r24839  
    2626
    2727%responses
    28 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     28md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
    2929
    3030%method
  • issm/trunk-jpl/test/NightlyRun/test413.m

    r24836 r24839  
    2424
    2525%responses
    26 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     26md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
    2727
    2828%method
  • issm/trunk-jpl/test/NightlyRun/test414.m

    r24836 r24839  
    3131
    3232%responses
    33 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    34 md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    35 md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    36 md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    37 md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    38 md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    39 md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    40 md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     33md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
     34md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1');
     35md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2');
     36md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3');
     37md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4');
     38md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5');
     39md.qmu.responses.MassFlux6=response_function('descriptor','indexed_MassFlux_6');
     40md.qmu.responses.MassFlux7=response_function('descriptor','indexed_MassFlux_7');
    4141
    4242%mass flux profiles
  • issm/trunk-jpl/test/NightlyRun/test417.m

    r24836 r24839  
    3030        'partition',md.qmu.vpartition);
    3131
    32 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    33 md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    34 md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    35 md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    36 md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    37 md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    38 md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    39 md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     32md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
     33md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1');
     34md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2');
     35md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3');
     36md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4');
     37md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5');
     38md.qmu.responses.MassFlux6=response_function('descriptor','indexed_MassFlux_6');
     39md.qmu.responses.MassFlux7=response_function('descriptor','indexed_MassFlux_7');
    4040
    4141%mass flux profiles
  • issm/trunk-jpl/test/NightlyRun/test420.m

    r24819 r24839  
    2121
    2222%responses
    23 md.qmu.responses.MaxVel=response_function('scaled_Thickness',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     23md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',md.qmu.vpartition);
    2424
    2525%method
  • issm/trunk-jpl/test/NightlyRun/test440.m

    r24819 r24839  
    2121
    2222%responses
    23 md.qmu.responses.MaxVel=response_function('scaled_Thickness',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     23md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',md.qmu.vpartition);
    2424
    2525%method
  • issm/trunk-jpl/test/NightlyRun/test444.m

    r24836 r24839  
    6060        'partition',md.qmu.vpartition);
    6161
    62 md.qmu.responses.IceMass1=response_function('Outputdefinition5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    63 md.qmu.responses.IceVolume1=response_function('Outputdefinition6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    64 md.qmu.responses.IceVolumeAboveFloatation1=response_function('Outputdefinition7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    65 md.qmu.responses.IceVolumeAboveFloatation=response_function('IceVolumeAboveFloatation',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    66 md.qmu.responses.GroundedArea1=response_function('Outputdefinition1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    67 md.qmu.responses.FloatingArea1=response_function('Outputdefinition2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    68 md.qmu.responses.TotalFloatingBmb1=response_function('Outputdefinition3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    69 md.qmu.responses.TotalGroundedBmb1=response_function('Outputdefinition4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    70 md.qmu.responses.TotalSmb1=response_function('Outputdefinition8',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    71 md.qmu.responses.TotalSmb2=response_function('Outputdefinition9',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    72 md.qmu.responses.FloatingArea=response_function('FloatingArea',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     62md.qmu.responses.IceMass1=response_function('descriptor','Outputdefinition5');
     63md.qmu.responses.IceVolume1=response_function('descriptor','Outputdefinition6');
     64md.qmu.responses.IceVolumeAboveFloatation1=response_function('descriptor','Outputdefinition7');
     65md.qmu.responses.IceVolumeAboveFloatation=response_function('descriptor','IceVolumeAboveFloatation');
     66md.qmu.responses.GroundedArea1=response_function('descriptor','Outputdefinition1');
     67md.qmu.responses.FloatingArea1=response_function('descriptor','Outputdefinition2');
     68md.qmu.responses.TotalFloatingBmb1=response_function('descriptor','Outputdefinition3');
     69md.qmu.responses.TotalGroundedBmb1=response_function('descriptor','Outputdefinition4');
     70md.qmu.responses.TotalSmb1=response_function('descriptor','Outputdefinition8');
     71md.qmu.responses.TotalSmb2=response_function('descriptor','Outputdefinition9');
     72md.qmu.responses.FloatingArea=response_function('descriptor','FloatingArea');
    7373
    7474md.qmu.method     =dakota_method('nond_samp');
  • issm/trunk-jpl/test/NightlyRun/test445.m

    r24836 r24839  
    3535
    3636%responses
    37 md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    38 md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    39 md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    40 md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    41 md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    42 md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    43 md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    44 md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
     37md.qmu.responses.MaxVel=response_function('descriptor','MaxVel');
     38md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1');
     39md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2');
     40md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3');
     41md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4');
     42md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5');
     43md.qmu.responses.MassFlux6=response_function('descriptor','indexed_MassFlux_6');
     44md.qmu.responses.MassFlux7=response_function('descriptor','indexed_MassFlux_7');
    4545
    4646%mass flux profiles
Note: See TracChangeset for help on using the changeset viewer.