source: issm/oecreview/Archive/24684-25833/ISSM-25009-25010.diff@ 25834

Last change on this file since 25834 was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833

File size: 17.9 KB
  • ../trunk-jpl/test/NightlyRun/test444.py

     
    6565version = float(version[0])
    6666
    6767#partitioning
    68 md.qmu.numberofpartitions = 10
    69 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    70 md.qmu.vpartition = md.qmu.vpartition - 1
     68npart = 10
     69partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
    7170md.qmu.isdakota = 1
    7271
    7372#variables
    7473md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
    7574    'descriptor', 'scaled_BasalforcingsFloatingiceMeltingRate',
    76     'mean', np.ones(md.qmu.numberofpartitions),
    77     'stddev', .1 * np.ones(md.qmu.numberofpartitions),
    78     'partition', md.qmu.vpartition
     75    'mean', np.ones(npart),
     76    'stddev', .1 * np.ones(npart),
     77    'partition', partition
    7978    )
    8079
    8180
     
    109108    md.qmu.params.analysis_driver = 'stressbalance'
    110109    md.qmu.params.evaluation_concurrency = 1
    111110
    112 #partitioning
    113 md.qmu.numberofpartitions = 10
    114 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    115 md.qmu.vpartition = md.qmu.vpartition - 1
    116 md.qmu.isdakota = 1
    117 
    118111md.stressbalance.reltol = 10**-5  #tighten for qmu analyses
    119112
    120113#solve
  • ../trunk-jpl/test/NightlyRun/test418.py

     
    2121md.cluster = generic('name', gethostname(), 'np', 3)
    2222
    2323#partitioning
    24 md.qmu.numberofpartitions = 100
     24npart = 100
    2525
    26 # Partitioner seamd to generate the following message,
     26# Partitioner seamed to generate the following message,
    2727#
    2828#       corrupted size vs. prev_size
    2929#       Aborted (core dumped)
     
    3535# TODO:
    3636# - Run valgrind and fix the above
    3737#
    38 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions)
    39 md.qmu.vpartition = md.qmu.vpartition - 1
     38partition = partitioner(md, 'package', 'chaco', 'npart', npart) - 1
    4039
    4140vector = np.arange(1, 1 + md.mesh.numberofvertices, 1).reshape(-1, 1)
    4241# double check this before committing:
    43 vector_on_partition = AreaAverageOntoPartition(md, vector)
    44 vector_on_nodes = vector_on_partition[md.qmu.vpartition]
     42vector_on_partition = AreaAverageOntoPartition(md, vector, partition)
     43vector_on_nodes = vector_on_partition[partition + 1]
    4544
    4645field_names = ['vector_on_nodes']
    4746field_tolerances = [1e-11]
  • ../trunk-jpl/test/NightlyRun/test420.m

     
    4747md.qmu.results=md.results.dakota;
    4848
    4949%test on thickness
    50 h=zeros(part,1);
     50h=zeros(npart,1);
    5151for i=1:npart,
    5252        h(i)=md.qmu.results.dresp_out(i).mean;
    5353end
  • ../trunk-jpl/test/NightlyRun/test420.py

     
    1616md.cluster = generic('name', gethostname(), 'np', 3)
    1717
    1818#partitioning
    19 md.qmu.numberofpartitions = 10
    20 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions)
    21 md.qmu.vpartition = md.qmu.vpartition - 1
     19npart = 10
     20partition = partitioner(md, 'package', 'chaco', 'npart', npart) - 1
    2221md.qmu.isdakota = 1
    2322
    2423#Dakota options
     
    3736#responses
    3837md.qmu.responses.MaxVel = response_function.response_function(
    3938    'descriptor', 'scaled_Thickness',
    40     'partition', md.qmu.vpartition
     39    'partition', partition
    4140    )
    4241
    4342#method
     
    6463md.qmu.results = md.results.dakota
    6564
    6665#test on thickness
    67 h = np.zeros((md.qmu.numberofpartitions, ))
    68 for i in range(md.qmu.numberofpartitions):
     66h = np.zeros(npart)
     67for i in range(npart):
    6968    h[i] = md.qmu.results.dresp_out[i].mean
    7069
    7170#project onto grid
    72 thickness = h[(md.qmu.vpartition).flatten()]
     71thickness = h[(md.qmu.vpartition + 1).flatten()]
    7372
    7473#Fields and tolerances to track changes
    7574field_names = ['Thickness']
  • ../trunk-jpl/test/NightlyRun/test234.py

     
    3737version = float(version[0])
    3838
    3939#partitioning
    40 md.qmu.numberofpartitions = 20
    41 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    42 md.qmu.vpartition = md.qmu.vpartition - 1
     40npart = 20
     41partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
    4342
    4443#variables
    4544md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
    4645    'descriptor', 'scaled_SmbMassBalance',
    47     'mean', np.ones(md.qmu.numberofpartitions),
    48     'stddev', .1 * np.ones(md.qmu.numberofpartitions),
    49     'partition', md.qmu.vpartition
     46    'mean', np.ones(npart),
     47    'stddev', .1 * np.ones(npart),
     48    'partition', partition
    5049    )
    5150
    5251#responses
  • ../trunk-jpl/test/NightlyRun/test440.py

     
    1717md.cluster = generic('name', oshostname(), 'np', 3)
    1818
    1919#partitioning
    20 md.qmu.numberofpartitions = md.mesh.numberofvertices
    21 md = partitioner(md, 'package', 'linear')
    22 md.qmu.vpartition = md.qmu.vpartition - 1
     20npart = md.mesh.numberofvertices
     21partition = partitioner(md, 'package', 'linear', 'npart', npart) - 1
    2322md.qmu.isdakota = 1
    2423
    2524#Dakota options
     
    3837#responses
    3938md.qmu.responses.MaxVel = response_function.response_function(
    4039    'descriptor', 'scaled_Thickness',
    41     'partition', md.qmu.vpartition
     40    'partition', partition
    4241    )
    4342
    4443#method
     
    6564md.qmu.results = md.results.dakota
    6665
    6766#test on thickness
    68 h = np.zeros(md.qmu.numberofpartitions)
    69 for i in range(md.qmu.numberofpartitions):
     67h = np.zeros(npart)
     68for i in range(npart):
    7069    h[i] = md.qmu.results.dresp_out[i].mean
    7170
    7271#project onto grid
    73 thickness = h[md.qmu.vpartition]
     72thickness = h[partition]
    7473
    7574#Fields and tolerances to track changes
    7675field_names = ['Thickness']
  • ../trunk-jpl/test/NightlyRun/test414.py

     
    3131version = float(version[0])
    3232
    3333#partitioning
    34 md.qmu.numberofpartitions = 20
    35 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    36 md.qmu.vpartition = md.qmu.vpartition - 1
     34npart = 20
     35partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
    3736
    3837#variables
    3938md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
    4039    'descriptor', 'scaled_FrictionCoefficient',
    41     'mean', np.ones(md.qmu.numberofpartitions),
    42     'stddev', .01 * np.ones(md.qmu.numberofpartitions),
    43     'partition', md.qmu.vpartition
     40    'mean', np.ones(npart),
     41    'stddev', .01 * np.ones(npart),
     42    'partition', partition
    4443    )
    4544
    4645#responses
  • ../trunk-jpl/test/NightlyRun/test218.py

     
    7171md.stressbalance.spcvy[pos] = 0.
    7272
    7373#partitioning
    74 md.qmu.numberofpartitions = md.mesh.numberofvertices
    75 md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions)
    76 md.qmu.vpartition = md.qmu.vpartition - 1
     74npart = md.mesh.numberofvertices
     75partition = partitioner(md, 'package', 'linear', 'npart', npart) - 1
    7776
    7877#Dakota options
    7978
     
    8786        'descriptor', 'scaled_MaterialsRheologyB',
    8887        'mean', np.ones(md.mesh.numberofvertices),
    8988        'stddev', .05 * np.ones(md.mesh.numberofvertices),
    90         'partition', md.qmu.vpartition
     89        'partition', partition
    9190        )
    9291
    9392#responses
     
    120119
    121120#Fields and tolerances to track changes
    122121md.qmu.results = md.results.dakota
    123 md.results.dakota.importancefactors = importancefactors(md, 'scaled_MaterialsRheologyB', 'MaxVel').reshape(-1, 1)
     122md.results.dakota.importancefactors = importancefactors(md, 'scaled_MaterialsRheologyB', 'MaxVel', partition).reshape(-1, 1)
    124123field_names = ['importancefactors']
    125124field_tolerances = [1e-10]
    126125field_values = [md.results.dakota.importancefactors]
  • ../trunk-jpl/test/NightlyRun/test417.py

     
    3131version = float(version[0])
    3232
    3333#partitioning
    34 md.qmu.numberofpartitions = 20
    35 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    36 md.qmu.vpartition = md.qmu.vpartition - 1
     34npart = 20
     35partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
     36md.qmu.isdakota = 1
    3737
    3838#variables
    3939md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
    4040    'descriptor', 'scaled_FrictionCoefficient',
    41     'mean', np.ones(md.qmu.numberofpartitions),
    42     'stddev', .01 * np.ones(md.qmu.numberofpartitions),
    43     'partition', md.qmu.vpartition
     41    'mean', np.ones(npart),
     42    'stddev', .01 * np.ones(npart),
     43    'partition', partition
    4444    )
    4545
    4646#responses
     
    5858md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp', '../Exp/Square.exp']
    5959md.qmu.mass_flux_profile_directory = getcwd()
    6060
    61 #method
     61# nond_sampling study
    6262md.qmu.method = dakota_method.dakota_method('nond_samp')
    6363md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 20, 'sample_type', 'lhs')
    6464
    65 #parameters
     65# parameters
    6666md.qmu.params.interval_type = 'forward'
    6767md.qmu.params.direct = True
    6868md.qmu.params.tabular_graphics_data = True
     
    7575    md.qmu.params.analysis_driver = 'stressbalance'
    7676    md.qmu.params.evaluation_concurrency = 1
    7777
    78 #partitioning
    79 md.qmu.numberofpartitions = 20
    80 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    81 md.qmu.vpartition = md.qmu.vpartition - 1
    82 md.qmu.isdakota = 1
    83 
    8478md.stressbalance.reltol = 10**-5  #tighten for qmu analyses
    8579
    8680#solve
  • ../trunk-jpl/test/NightlyRun/test445.py

     
    3434version = float(version[0])
    3535
    3636#partitioning
    37 md.qmu.numberofpartitions = 10
    38 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    39 md.qmu.vpartition = md.qmu.vpartition - 1
     37npart = 10
     38partitioner = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
    4039md.qmu.isdakota = 1
    4140
    4241#variables
    4342md.qmu.variables.neff = normal_uncertain.normal_uncertain(
    4443    'descriptor', 'scaled_FrictionEffectivePressure',
    45     'mean', np.ones(md.qmu.numberofpartitions),
    46     'stddev', .05 * np.ones(md.qmu.numberofpartitions),
    47     'partition', md.qmu.vpartition
     44    'mean', np.ones(npart),
     45    'stddev', .05 * npart),
     46    'partition', partition
    4847    )
    4948md.qmu.variables.geoflux = normal_uncertain.normal_uncertain(
    5049    'descriptor', 'scaled_BasalforcingsGeothermalflux',
    51     'mean', np.ones(md.qmu.numberofpartitions),
    52     'stddev', .05 * np.ones(md.qmu.numberofpartitions),
    53     'partition', md.qmu.vpartition
     50    'mean', np.ones(npart),
     51    'stddev', .05 * np.ones(npart),
     52    'partition', partition
    5453    )
    5554
    5655#responses
  • ../trunk-jpl/test/NightlyRun/test412.py

     
    1818md.cluster = generic('name', gethostname(), 'np', 3)
    1919
    2020#partitioning
    21 md.qmu.numberofpartitions = md.mesh.numberofvertices
    22 md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions)
    23 md.qmu.vpartition = md.qmu.vpartition - 1
     21md = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
    2422md.qmu.isdakota = 1
    2523
    2624#Dakota options
     
    3937    'descriptor', 'scaled_FrictionCoefficient',
    4038    'mean', np.ones(md.mesh.numberofvertices),
    4139    'stddev', .01 * np.ones(md.mesh.numberofvertices),
    42     'partition', md.qmu.vpartition
     40    'partition', partition
    4341    )
    4442
    4543#responses
     
    6967
    7068#Fields and tolerances to track changes
    7169md.qmu.results = md.results.dakota
    72 md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel').T
     70md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel', partition).T
    7371field_names = ['importancefactors']
    7472field_tolerances = [1e-10]
    7573field_values = [md.results.dakota.importancefactors]
  • ../trunk-jpl/test/NightlyRun/test250.py

     
    3636
    3737#partitioning
    3838md.qmu.numberofpartitions = md.mesh.numberofvertices
    39 md = partitioner(md, 'package', 'linear')
     39partition = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
    4040md.qmu.vpartition = md.qmu.vpartition - 1
    4141
    4242#variables
    4343md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
    4444    'descriptor', 'scaled_SmbMassBalance',
    45     'mean', np.ones(md.qmu.numberofpartitions),
    46     'stddev', .1 * np.ones(md.qmu.numberofpartitions),
    47     'partition', md.qmu.vpartition
     45    'mean', np.ones(md.mesh.numberofvertices),
     46    'stddev', .1 * np.ones(md.mesh.numberofvertices),
     47    'partition', partition
    4848    )
    4949
    5050#responses
  • ../trunk-jpl/test/NightlyRun/test413.py

     
    2323
    2424#partitioning
    2525md.qmu.numberofpartitions = 20
    26 md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
    27 md.qmu.vpartition = md.qmu.vpartition - 1
     26partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
    2827
    2928#variables
    3029md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain(
     
    3433    )
    3534md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
    3635    'descriptor', 'scaled_FrictionCoefficient',
    37     'mean', np.ones(md.qmu.numberofpartitions),
    38     'stddev', .01 * np.ones(md.qmu.numberofpartitions),
    39     'partition', md.qmu.vpartition
     36    'mean', np.ones(npart),
     37    'stddev', .01 * np.ones(npart),
     38    'partition', partition
    4039    )
    4140
    4241#responses
     
    6867
    6968#Fields and tolerances to track changes
    7069md.qmu.results = md.results.dakota
    71 md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel').T
     70md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel', partition).T
    7271field_names = ['importancefactors']
    7372field_tolerances = [1e-10]
    7473field_values = [md.results.dakota.importancefactors]
  • ../trunk-jpl/test/NightlyRun/test251.py

     
    3636version = float(version[0])
    3737
    3838#partitioning
    39 md.qmu.numberofpartitions = md.mesh.numberofvertices
    40 md = partitioner(md, 'package', 'linear')
    41 md.qmu.vpartition = md.qmu.vpartition - 1
     39partition = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
    4240
    4341#variables
    4442md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
     
    4543    'descriptor', 'scaled_SmbMassBalance',
    4644    'mean', np.ones(md.qmu.numberofpartitions),
    4745    'stddev', 100 * np.ones(md.qmu.numberofpartitions),
    48     'partition', md.qmu.vpartition
     46    'partition', partition
    4947    )
    5048
    5149#responses
  • ../trunk-jpl/src/m/classes/qmu.py

     
    2626        self.method = OrderedDict()
    2727        self.params = OrderedStruct()
    2828        self.results = OrderedDict()
    29         self.vpartition = float('NaN')
    30         self.epartition = float('NaN')
    3129        self.numberofpartitions = 0
    3230        self.numberofresponses = 0
    3331        self.variabledescriptors = []
     
    7775            if isinstance(method, dakota_method):
    7876                s += "            method :    '%s'\n" % (method.method)
    7977
    80     # params could be have a number of forms (mainly 1 struct or many)
     78    # params could have a number of forms (mainly 1 struct or many)
    8179        if type(self.params) == OrderedStruct:
    8280            params = [self.params]
    8381        else:
     
    183181        if not self.isdakota:
    184182            WriteData(fid, prefix, 'data', False, 'name', 'md.qmu.mass_flux_segments_present', 'format', 'Boolean')
    185183            return
    186         WriteData(fid, prefix, 'object', self, 'fieldname', 'vpartition', 'format', 'DoubleMat', 'mattype', 2)
    187         WriteData(fid, prefix, 'object', self, 'fieldname', 'epartition', 'format', 'DoubleMat', 'mattype', 2)
    188184        WriteData(fid, prefix, 'object', self, 'fieldname', 'numberofpartitions', 'format', 'Integer')
    189185        WriteData(fid, prefix, 'object', self, 'fieldname', 'numberofresponses', 'format', 'Integer')
    190186        WriteData(fid, prefix, 'object', self, 'fieldname', 'variabledescriptors', 'format', 'StringArray')
Note: See TracBrowser for help on using the repository browser.