Changeset 9571


Ignore:
Timestamp:
09/01/11 19:58:19 (14 years ago)
Author:
Eric.Larour
Message:

Simplified solutioncore calling structure. Took out control_core
from issm.m and issm.cpp.
New AnalysisConfiguration routine and new call to CorePointerFromSolutionEnum in issm.m and issm.cpp
Qmu could not be folded, had to put it back into issm.m and issm.cpp

Renamed Qmu to Dakota.

Location:
issm/trunk
Files:
25 added
3 deleted
56 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/externalpackages/dakota/install.sh

    r5034 r9571  
    2929patch src/src/NonDLocalReliability.C ./NonDLocalReliability.C.patch
    3030patch src/src/NonDUnilevelRBDO.C ./NonDUnilevelRBDO.C.patch    #  source not even used?
    31 patch -R src/packages/Pecos/src/LHSDriver.cpp ./LHSDriver.cpp.patch
     31#patch -R src/packages/Pecos/src/LHSDriver.cpp ./LHSDriver.cpp.patch
    3232
    3333#Configure dakota
  • issm/trunk/externalpackages/export_fig/export_fig.m

    r7182 r9571  
    379379        print2eps(tmp_nam, fig, p2eArgs{:});
    380380        % Generate a pdf
     381                options.quality
    381382        eps2pdf(tmp_nam, pdf_nam, 1, options.append, options.colourspace==2, options.quality);
    382383    catch
  • issm/trunk/externalpackages/gdal/install.sh

    r6285 r9571  
    2525cd src
    2626./configure --prefix="$ISSM_TIER/externalpackages/gdal/install" --without-python --with-netcdf=no --with-jasper=no --without-ld-shared --with-unix-stdio-64=no --with-expat-lib=/usr/lib64/libexpat.so
     27#./configure --prefix="$ISSM_TIER/externalpackages/gdal/install" --with-python --with-netcdf=no --with-jasper=no --without-ld-shared --with-unix-stdio-64=no --with-expat-lib=/usr/lib64/libexpat.so
    2728
    2829#Patch GDALmake.opt
  • issm/trunk/externalpackages/matlab/install.sh

    r8348 r9571  
    11#!/bin/bash
     2
     3#Matlab version: used by Petsc to detect some weird behaviour starting at version 7.6/R2008a (all blas and lapack prototypes changed! damn them!)
     4MATLAB_VERSION=R2010b
    25
    36#Erase symlink
     
    58
    69#Select or create a new simlink
    7 ln -s /usr/local/pkgs/matlab-7.6/ install
     10ln -s /usr/local/matlab711/ install
    811#ln -s /usr/local/pkgs/matlab-7.8/ install
    912#ln -s /Applications/MATLAB_R2009a.app/ install
  • issm/trunk/externalpackages/metis/install.sh

    r8570 r9571  
    66#version of metis
    77version=`echo *.tar.gz | sed 's/\.tar\.gz//g' | sed 's/metis-//g'`
    8 echo $version
    98
    109#Some cleanup
  • issm/trunk/m4/issm_options.m4

    r9283 r9571  
    174174                HAVE_DAKOTA=yes
    175175                DAKOTAINCL=-I$DAKOTA_ROOT/include
    176                 DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver "
     176                DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs -levidence -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -lopt -lpsuade -lnewmat -lncsuopt -lgsl -lgslcblas -lquadrature -lcoliny -lcolin -lpebbl -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver"
    177177
    178178                AC_DEFINE([_HAVE_DAKOTA_],[1],[with Dakota in ISSM src])
  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r9563 r9571  
    342342        NumberOfVerticesEnum,
    343343        OutputFilePointerEnum,
    344         QmuAnalysisEnum,
     344        DakotaAnalysisEnum,
    345345        QmuErrNameEnum,
    346346        QmuInNameEnum,
     
    474474        NumberOfEdgesEnum,
    475475        ResultsOnVerticesEnum,
     476        /*Automatic Differentiation {{{1*/
     477        AdAnalysisEnum,
     478        AdForwardEnum,
     479        AdReverseEnum,
     480        /*}}}*/
    476481        MaximumNumberOfEnums
    477482};
  • issm/trunk/src/c/Makefile.am

    r9343 r9571  
    681681                                        ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp\
    682682                                        ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h\
    683                                         ./modules/Qmux/Qmux.h\
    684                                         ./modules/Qmux/Qmux.cpp\
    685                                         ./modules/Qmux/SpawnCore.cpp\
    686                                         ./modules/Qmux/SpawnCoreSerial.cpp\
     683                                        ./modules/Dakotax/Dakotax.h\
     684                                        ./modules/Dakotax/Dakotax.cpp\
     685                                        ./modules/Dakotax/SpawnCore.cpp\
     686                                        ./modules/Dakotax/SpawnCoreSerial.cpp\
    687687                                        ./modules/InputToResultx/InputToResultx.cpp\
    688688                                        ./modules/InputToResultx/InputToResultx.h\
     
    13601360                                        ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\
    13611361                                        ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\
    1362                                         ./modules/Qmux/Qmux.h\
    1363                                         ./modules/Qmux/Qmux.cpp\
    1364                                         ./modules/Qmux/DakotaMPI_Bcast.cpp\
    1365                                         ./modules/Qmux/DakotaFree.cpp\
    1366                                         ./modules/Qmux/SpawnCore.cpp\
    1367                                         ./modules/Qmux/SpawnCoreParallel.cpp\
     1362                                        ./modules/Dakotax/Dakotax.h\
     1363                                        ./modules/Dakotax/Dakotax.cpp\
     1364                                        ./modules/Dakotax/DakotaMPI_Bcast.cpp\
     1365                                        ./modules/Dakotax/DakotaFree.cpp\
     1366                                        ./modules/Dakotax/SpawnCore.cpp\
     1367                                        ./modules/Dakotax/SpawnCoreParallel.cpp\
    13681368                                        ./modules/InputToResultx/InputToResultx.cpp\
    13691369                                        ./modules/InputToResultx/InputToResultx.h\
     
    14051405                                        ./solutions/steadystateconvergence.cpp\
    14061406                                        ./solutions/ResetBoundaryConditions.cpp\
    1407                                         ./solutions/SolutionConfiguration.cpp\
     1407                                        ./solutions/AnalysisConfiguration.cpp\
    14081408                                        ./solutions/CorePointerFromSolutionEnum.cpp\
    14091409                                        ./solutions/AdjointCorePointerFromSolutionEnum.cpp\
  • issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

    r9563 r9571  
    293293                case NumberOfVerticesEnum : return "NumberOfVertices";
    294294                case OutputFilePointerEnum : return "OutputFilePointer";
    295                 case QmuAnalysisEnum : return "QmuAnalysis";
     295                case DakotaAnalysisEnum : return "DakotaAnalysis";
    296296                case QmuErrNameEnum : return "QmuErrName";
    297297                case QmuInNameEnum : return "QmuInName";
     
    417417                case NumberOfEdgesEnum : return "NumberOfEdges";
    418418                case ResultsOnVerticesEnum : return "ResultsOnVertices";
     419                case AdAnalysisEnum : return "AdAnalysis";
     420                case AdForwardEnum : return "AdForward";
     421                case AdReverseEnum : return "AdReverse";
    419422                default : return "unknown";
    420423
  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

    r9451 r9571  
    2121        bool   isstokes;
    2222        bool   control_analysis;
    23         bool   qmu_analysis;
     23        bool   dakota_analysis;
    2424
    2525        /*Fetch constants needed: */
     
    2929        iomodel->Constant(&numberofelements,NumberOfElementsEnum);
    3030        iomodel->Constant(&control_analysis,ControlAnalysisEnum);
    31         iomodel->Constant(&qmu_analysis,QmuAnalysisEnum);
     31        iomodel->Constant(&dakota_analysis,DakotaAnalysisEnum);
    3232
    3333        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
     
    8282        elements->InputDuplicate(VxEnum,VxPicardEnum);
    8383        elements->InputDuplicate(VxEnum,VxObsEnum);
    84         if(qmu_analysis)elements->InputDuplicate(VxEnum,QmuVxEnum);
     84        if(dakota_analysis)elements->InputDuplicate(VxEnum,QmuVxEnum);
    8585       
    8686        elements->InputDuplicate(VyEnum,VyPicardEnum);
    8787        elements->InputDuplicate(VyEnum,VyObsEnum);
    88         if(qmu_analysis)elements->InputDuplicate(VyEnum,QmuVyEnum);
     88        if(dakota_analysis)elements->InputDuplicate(VyEnum,QmuVyEnum);
    8989       
    9090        if(dim==3){
    9191                elements->InputDuplicate(VzEnum,VzPicardEnum);
    9292                elements->InputDuplicate(VzEnum,VzObsEnum);
    93                 if(qmu_analysis)elements->InputDuplicate(VzEnum,QmuVzEnum);
     93                if(dakota_analysis)elements->InputDuplicate(VzEnum,QmuVzEnum);
    9494        }
    9595       
  • issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

    r9493 r9571  
    5252        int      m,n;
    5353        int      count;
    54         bool     qmu_analysis=false;
     54        bool     dakota_analysis=false;
    5555        char*    name=NULL;
    5656        int      numberofresponses;
     
    6363
    6464        /*recover parameters: */
    65         iomodel->Constant(&qmu_analysis,QmuAnalysisEnum);
    66         parameters->AddObject(new BoolParam(QmuAnalysisEnum,qmu_analysis));
    67 
    68         if(qmu_analysis){
     65        iomodel->Constant(&dakota_analysis,DakotaAnalysisEnum);
     66        parameters->AddObject(new BoolParam(DakotaAnalysisEnum,dakota_analysis));
     67
     68        if(dakota_analysis){
    6969
    7070                iomodel->Constant(&name,NameEnum);
     
    216216                xfree((void**)&qmuoutname);
    217217                /*}}}*/
    218         } //if(qmu_analysis)
     218        } //if(dakota_analysis)
    219219
    220220        /*Free data*/
  • issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

    r9451 r9571  
    1818        int    dim;
    1919        int    numberofelements;
    20         bool   qmu_analysis;
     20        bool   dakota_analysis;
    2121
    2222        /*Fetch parameters: */
    2323        iomodel->Constant(&dim,DimEnum);
    2424        iomodel->Constant(&numberofelements,NumberOfElementsEnum);
    25         iomodel->Constant(&qmu_analysis,QmuAnalysisEnum);
     25        iomodel->Constant(&dakota_analysis,DakotaAnalysisEnum);
    2626
    2727        /*Now, is the model 3d? otherwise, do nothing: */
     
    6161        iomodel->FetchDataToInput(elements,VzEnum);
    6262       
    63         if(qmu_analysis)elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
     63        if(dakota_analysis)elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
    6464
    6565        /*Free data: */
  • issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

    r9405 r9571  
    2929        int         solutiontype;
    3030        Results    *results                 = NULL;
     31        bool        dakota_analysis            = false;
     32       
     33        #ifdef _SERIAL_
     34        const char **fnames      = NULL;
     35        mwSize       onebyone[2] = {0,0};
     36        mwSize       ndim        = 2;
     37        int          nfields=0;
     38        #endif
    3139
    3240        /*recover results dataset: */
    3341        results=*presults;
     42
     43        /*retrieve parameters: */
     44        parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
     45
     46        if(dakota_analysis){
     47                //no need to output anything, Dakota analysis has different outputs
     48                #ifdef _SERIAL_
     49                *pdataref=mxCreateStructArray( ndim,onebyone,nfields,fnames);
     50                #else
     51                return;
     52                #endif
     53        }
    3454
    3555        /*We have results inside our elements, loads, etc ... Get them out of there, into the results dataset: */
  • issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r9563 r9571  
    291291        else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum;
    292292        else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
    293         else if (strcmp(name,"QmuAnalysis")==0) return QmuAnalysisEnum;
     293        else if (strcmp(name,"DakotaAnalysis")==0) return DakotaAnalysisEnum;
    294294        else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum;
    295295        else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum;
     
    415415        else if (strcmp(name,"NumberOfEdges")==0) return NumberOfEdgesEnum;
    416416        else if (strcmp(name,"ResultsOnVertices")==0) return ResultsOnVerticesEnum;
     417        else if (strcmp(name,"AdAnalysis")==0) return AdAnalysisEnum;
     418        else if (strcmp(name,"AdForward")==0) return AdForwardEnum;
     419        else if (strcmp(name,"AdReverse")==0) return AdReverseEnum;
    417420        else _error_("Enum %s not found",name);
    418421
  • issm/trunk/src/c/modules/modules.h

    r9341 r9571  
    8888#include "./PointCloudFindNeighborsx/PointCloudFindNeighborsx.h"
    8989#include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h"
    90 #include "./Qmux/Qmux.h"
     90#include "./Dakotax/Dakotax.h"
    9191#include "./Reduceloadx/Reduceloadx.h"
    9292#include "./Reducevectorgtosx/Reducevectorgtosx.h"
  • issm/trunk/src/c/objects/DakotaPlugin.cpp

    r9338 r9571  
    2626#include "../include/include.h"
    2727#include "../objects/objects.h"
    28 #include "../modules/Qmux/Qmux.h"
     28#include "../modules/Dakotax/Dakotax.h"
    2929
    3030/*Standard includes: */
  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r9563 r9571  
    74987498        double  yts;
    74997499        int     prognostic_DG;
    7500         bool    qmu_analysis;
     7500        bool    dakota_analysis;
    75017501        bool    isstokes;
    75027502        double  beta,heatcapacity,referencetemperature,meltingpoint,latentheat;
     
    75057505        iomodel->Constant(&yts,YtsEnum);
    75067506        iomodel->Constant(&prognostic_DG,PrognosticDGEnum);
    7507         iomodel->Constant(&qmu_analysis,QmuAnalysisEnum);
     7507        iomodel->Constant(&dakota_analysis,DakotaAnalysisEnum);
    75087508        iomodel->Constant(&isstokes,IsstokesEnum);
    75097509        iomodel->Constant(&beta,BetaEnum);
     
    75577557                                this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
    75587558                                this->inputs->AddInput(new PentaVertexInput(VxPicardEnum,nodeinputs));
    7559                                 if(qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs));
     7559                                if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs));
    75607560                        }
    75617561                        if(!iomodel->Data(VyEnum)){
     
    75647564                                this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
    75657565                                this->inputs->AddInput(new PentaVertexInput(VyPicardEnum,nodeinputs));
    7566                                 if(qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs));
     7566                                if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs));
    75677567                        }
    75687568                        if(!iomodel->Data(VzEnum)){
     
    75717571                                this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
    75727572                                this->inputs->AddInput(new PentaVertexInput(VzPicardEnum,nodeinputs));
    7573                                 if(qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs));
     7573                                if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs));
    75747574                        }
    75757575                        if(!iomodel->Data(PressureEnum)){
    75767576                                for(i=0;i<6;i++)nodeinputs[i]=0;
    7577                                 if(qmu_analysis){
     7577                                if(dakota_analysis){
    75787578                                        this->inputs->AddInput(new PentaVertexInput(PressureEnum,nodeinputs));
    75797579                                        this->inputs->AddInput(new PentaVertexInput(QmuPressureEnum,nodeinputs));
  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r9563 r9571  
    52105210        double yts;
    52115211        int    prognostic_DG;
    5212         bool   qmu_analysis;
     5212        bool   dakota_analysis;
    52135213
    52145214        /*Checks if debuging*/
     
    52205220        iomodel->Constant(&yts,YtsEnum);
    52215221        iomodel->Constant(&prognostic_DG,PrognosticDGEnum);
    5222         iomodel->Constant(&qmu_analysis,QmuAnalysisEnum);
     5222        iomodel->Constant(&dakota_analysis,DakotaAnalysisEnum);
    52235223
    52245224        /*Recover element type*/
     
    52695269                                this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
    52705270                                this->inputs->AddInput(new TriaVertexInput(VxPicardEnum,nodeinputs));
    5271                                 if(qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs));
     5271                                if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs));
    52725272                        }
    52735273                        if(!iomodel->Data(VyEnum)){
     
    52765276                                this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));
    52775277                                this->inputs->AddInput(new TriaVertexInput(VyPicardEnum,nodeinputs));
    5278                                 if(qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs));
     5278                                if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs));
    52795279                        }
    52805280                        if(!iomodel->Data(VzEnum)){
     
    52835283                                this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs));
    52845284                                this->inputs->AddInput(new TriaVertexInput(VzPicardEnum,nodeinputs));
    5285                                 if(qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs));
     5285                                if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs));
    52865286                        }
    52875287                        if(!iomodel->Data(PressureEnum)){
    52885288                                for(i=0;i<3;i++)nodeinputs[i]=0;
    5289                                 if(qmu_analysis){
     5289                                if(dakota_analysis){
    52905290                                        this->inputs->AddInput(new TriaVertexInput(PressureEnum,nodeinputs));
    52915291                                        this->inputs->AddInput(new TriaVertexInput(QmuPressureEnum,nodeinputs));
  • issm/trunk/src/c/solutions/CorePointerFromSolutionEnum.cpp

    r9401 r9571  
    1818#include "../solvers/solvers.h"
    1919
    20 void CorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),int solutiontype){
     20void CorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),Parameters* parameters,int solutiontype){
    2121
     22        /*intermediary: */
     23        bool control_analysis=false;
     24        bool dakota_analysis=false;
     25       
    2226        /*output: */
    2327        void (*solutioncore)(FemModel*)=NULL;
     28
     29        /*retrieve some parameters: */
     30        parameters->FindParam(&control_analysis,ControlAnalysisEnum);
     31        parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
    2432
    2533        switch(solutiontype){
     
    6371        }
    6472       
     73        /*if control is being run on top of a solution, change core: */
     74        if(control_analysis){
     75                #ifdef _HAVE_TAO_
     76                //solutioncore=&controltao_core;
     77                solutioncore=&control_core;
     78                #else
     79                solutioncore=&control_core;
     80                #endif
     81        }       
     82               
     83        if(dakota_analysis){
     84                #ifndef _HAVE_DAKOTA_
     85                _error_(" Dakota not present, cannot do qmu!");
     86                #endif
     87        }
     88
    6589        /*Assign output pointer:*/
    6690        _assert_(psolutioncore);
  • issm/trunk/src/c/solutions/control_core.cpp

    r9563 r9571  
    2424        int     solution_type;
    2525        bool    isstokes;
    26         bool    qmu_analysis=false;
     26        bool    dakota_analysis=false;
    2727
    2828        int*    control_type = NULL;
     
    5757        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    5858        femmodel->parameters->FindParam(&isstokes,IsstokesEnum);
    59         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
     59        femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
    6060
    6161        /*out of solution_type, figure out solution core and adjoint function pointer*/
    62         CorePointerFromSolutionEnum(&solutioncore,solution_type);
     62        CorePointerFromSolutionEnum(&solutioncore,femmodel->parameters,solution_type);
    6363        AdjointCorePointerFromSolutionEnum(&adjointcore,solution_type);
    6464
     
    118118
    119119        /*some results not computed by steadystate_core or diagnostic_core: */
    120         if(!qmu_analysis){ //do not save this if we are running the control core from a qmu run!
     120        if(!dakota_analysis){ //do not save this if we are running the control core from a qmu run!
    121121                for(i=0;i<num_controls;i++) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i]);
    122122                femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));
  • issm/trunk/src/c/solutions/controlrestart.cpp

    r9356 r9571  
    1212        int*     control_type = NULL;
    1313        int      nsteps;
    14         bool     qmu_analysis=true;
     14        bool     dakota_analysis=true;
    1515
    1616        /*retrieve output file name: */
     
    1818        femmodel->parameters->FindParam(&control_type,NULL,ControlTypeEnum);
    1919        femmodel->parameters->FindParam(&nsteps,NstepsEnum);
    20         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
     20        femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
    2121
    2222        /*only save if we are not running qmu analysis. We certainly don't want to save control results each time we
    2323         * run on control core!: */
    24         if(!qmu_analysis){
     24        if(!dakota_analysis){
    2525                /*we essentially want J and the parameter: */
    2626                for(int i=0;i<num_controls;i++) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type[i]);
  • issm/trunk/src/c/solutions/diagnostic_core.cpp

    r9406 r9571  
    1515
    1616        /*parameters: */
    17         bool   qmu_analysis         = false;
     17        bool   dakota_analysis         = false;
    1818        int    dim                  = -1;
    1919        bool   ishutter             = false;
     
    3030        femmodel->parameters->FindParam(&ismacayealpattyn,IsmacayealpattynEnum);
    3131        femmodel->parameters->FindParam(&isstokes,IsstokesEnum);
    32         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
     32        femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
    3333        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    3434        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    3535
    3636        /*for qmu analysis, reinitialize velocity so that fake sensitivities do not show up as a result of a different restart of the convergence at each trial.*/
    37         if(qmu_analysis){
     37        if(dakota_analysis){
    3838                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVxEnum,VxEnum);
    3939                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuVyEnum,VyEnum);
  • issm/trunk/src/c/solutions/issm.cpp

    r9561 r9571  
    1414        FILE *output_fid       = NULL;
    1515        FILE *petscoptionsfid  = NULL;
    16         bool  qmu_analysis     = false;
    17         bool  control_analysis = false;
    1816        bool  waitonlock       = false;
     17        bool  dakota_analysis  = false;
    1918
    2019        /*FemModel: */
     
    6766        MPI_Barrier(MPI_COMM_WORLD); start_init=MPI_Wtime();
    6867
    69         /*out of solution_type, figure out solution core function pointer,
    70          *and types of analyses needed: */
    71         SolutionConfiguration(&analyses,&numanalyses,&solutioncore,solution_type);
    72 
     68        /*out of solution_type, figure out types of analyses needed in the femmodel: */
     69        AnalysisConfiguration(&analyses,&numanalyses,solution_type);
     70       
    7371        /*Create femmodel, using input file: */
    7472        femmodel=new FemModel(binfilename,outbinfilename,solution_type,analyses,numanalyses);
     73       
     74        /*get type of solution we are going to run: */
     75        CorePointerFromSolutionEnum(&solutioncore,femmodel->parameters,solution_type);
    7576
    7677        /*Open output file once for all*/
     
    8485
    8586        /*get parameters: */
    86         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
    87         femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    8887        femmodel->parameters->FindParam(&waitonlock,WaitonlockEnum);
     88        femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
    8989
    9090        MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();
    9191
    92         /*if control is being run on top of a solution, change core: */
    93         if(control_analysis){
    94                 #ifdef _HAVE_TAO_
    95                 //solutioncore=&controltao_core;
    96                 solutioncore=&control_core;
    97                 #else
    98                 solutioncore=&control_core;
    99                 #endif
    100         }
     92        /*are we running the solution sequence, or a qmu wrapper around it? : */
    10193
    102         /*are we running the solution sequence, or a qmu wrapper around it? : */
    103         if(!qmu_analysis){
    104                        
    105                 _printf_(true,"call computational core:\n");
    106                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
    107                 solutioncore(femmodel);
    108                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
     94        _printf_(true,"call computational core:\n");
     95        MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
     96        if(dakota_analysis) Dakotax(femmodel);
     97        else                solutioncore(femmodel);
     98        MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
    10999
    110                 _printf_(true,"write results to disk:\n");
    111                 OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
    112         }
    113         else{
    114                 /*run qmu analysis: */
    115                 _printf_(true,"calling qmu analysis on diagnostic core:\n");
    116 
    117                 #ifdef _HAVE_DAKOTA_
    118                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
    119                 Qmux(femmodel,femmodel->parameters);
    120                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
    121                 #else
    122                 _error_(" Dakota not present, cannot do qmu!");
    123                 #endif
    124         }
     100        _printf_(true,"write results to disk:\n");
     101        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
    125102
    126103        /*Close output and petsc options file and write lock file if requested*/
  • issm/trunk/src/c/solutions/solutions.h

    r9563 r9571  
    4848
    4949//solution configuration
    50 void SolutionConfiguration(int** panalyses,int* pnumanalyses, void (**psolutioncore)(FemModel*),int solutiontype);
    51 void CorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),int solutiontype);
     50void AnalysisConfiguration(int** panalyses,int* pnumanalyses, int solutiontype);
     51void CorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),Parameters* parameters,int solutiontype);
    5252void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype);
    5353
  • issm/trunk/src/c/solutions/thermal_core.cpp

    r9159 r9571  
    2424        bool control_analysis;
    2525        int solution_type;
    26         bool   qmu_analysis         = false;
     26        bool   dakota_analysis         = false;
    2727
    2828        //first recover parameters common to all solutions
     
    3131        femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum);
    3232        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    33         femmodel->parameters->FindParam(&qmu_analysis,QmuAnalysisEnum);
     33        femmodel->parameters->FindParam(&dakota_analysis,DakotaAnalysisEnum);
    3434
    3535        /*Compute number of time steps: */
     
    4040        else nsteps=(int)(ndt/dt);
    4141
    42         if(qmu_analysis){
     42        if(dakota_analysis){
    4343                femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);
    4444                ResetConstraintsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
  • issm/trunk/src/m/classes/clusters/castor.m

    r9565 r9571  
    9494                                %compress the files into one zip.
    9595                                compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '  md.name '.petsc '];
    96                                 if md.qmu_analysis,
     96                                if md.dakota_analysis,
    9797                                        compressstring=[compressstring md.name '.qmu.in'];
    9898                                end
     
    124124                        %What packages are we picking up from remote cluster
    125125                        packages={[md.name '.outlog'],[md.name '.errlog']};
    126                         if md.qmu_analysis,
     126                        if md.dakota_analysis,
    127127                                packages{end+1}=[md.name '.qmu.err'];
    128128                                packages{end+1}=[md.name '.qmu.out'];
  • issm/trunk/src/m/classes/clusters/cosmos.m

    r9565 r9571  
    9393                                %compress the files into one zip.
    9494                                compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '  md.name '.petsc '];
    95                                 if md.qmu_analysis,
     95                                if md.dakota_analysis,
    9696                                        compressstring=[compressstring md.name '.qmu.in'];
    9797                                end
     
    123123                        %What packages are we picking up from remote cluster
    124124                        packages={[md.name '.outlog'],[md.name '.errlog']};
    125                         if md.qmu_analysis,
     125                        if md.dakota_analysis,
    126126                                packages{end+1}=[md.name '.qmu.err'];
    127127                                packages{end+1}=[md.name '.qmu.out'];
  • issm/trunk/src/m/classes/clusters/gemini.m

    r9565 r9571  
    9494                                %compress the files into one zip.
    9595                                compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '  md.name '.petsc '];
    96                                 if md.qmu_analysis,
     96                                if md.dakota_analysis,
    9797                                        compressstring=[compressstring md.name '.qmu.in'];
    9898                                end
     
    124124                        %What packages are we picking up from remote cluster
    125125                        packages={[md.name '.outlog'],[md.name '.errlog']};
    126                         if md.qmu_analysis,
     126                        if md.dakota_analysis,
    127127                                packages{end+1}=[md.name '.qmu.err'];
    128128                                packages{end+1}=[md.name '.qmu.out'];
  • issm/trunk/src/m/classes/clusters/generic.m

    r9565 r9571  
    123123                                %compress the files into one zip.
    124124                                compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '  md.name '.petsc '];
    125                                 if md.qmu_analysis,
     125                                if md.dakota_analysis,
    126126                                        compressstring=[compressstring md.name '.qmu.in'];
    127127                                end
     
    154154                        %What packages are we picking up from remote cluster
    155155                        packages={[md.name '.outlog'],[md.name '.errlog']};
    156                         if md.qmu_analysis,
     156                        if md.dakota_analysis,
    157157                                packages{end+1}=[md.name '.qmu.err'];
    158158                                packages{end+1}=[md.name '.qmu.out'];
  • issm/trunk/src/m/classes/clusters/pfe.m

    r9565 r9571  
    182182                                %compress the files into one zip.
    183183                                compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '  md.name '.petsc '];
    184                                 if md.qmu_analysis,
     184                                if md.dakota_analysis,
    185185                                        compressstring=[compressstring md.name '.qmu.in '];
    186186                                end
     
    234234                                packages={};
    235235                        end
    236                         if md.qmu_analysis,
     236                        if md.dakota_analysis,
    237237                                packages{end+1}=[md.name '.qmu.err'];
    238238                                packages{end+1}=[md.name '.qmu.out'];
  • issm/trunk/src/m/classes/clusters/pollux.m

    r9565 r9571  
    9494                                %compress the files into one zip.
    9595                                compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '  md.name '.petsc '];
    96                                 if md.qmu_analysis,
     96                                if md.dakota_analysis,
    9797                                        compressstring=[compressstring md.name '.qmu.in'];
    9898                                end
     
    124124                        %What packages are we picking up from remote cluster
    125125                        packages={[md.name '.outlog'],[md.name '.errlog']};
    126                         if md.qmu_analysis,
     126                        if md.dakota_analysis,
    127127                                packages{end+1}=[md.name '.qmu.err'];
    128128                                packages{end+1}=[md.name '.qmu.out'];
  • issm/trunk/src/m/classes/model/model.m

    r9566 r9571  
    247247                 dakotaout                       = modelfield('default','','marshall',false);
    248248                 dakotadat                       = modelfield('default','','marshall',false);
    249                  qmu_analysis                    = modelfield('default',0,'marshall',true,'format','Boolean');
     249                 dakota_analysis                    = modelfield('default',0,'marshall',true,'format','Boolean');
    250250                 part                            = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2);
    251251                 npart                           = modelfield('default',0,'marshall',true,'format','Integer');
     
    266266                 fm_solution           = modelfield('default','','marshall',false);
    267267                 fm_quality            = modelfield('default',0,'marshall',false);
     268                 
     269                 %ad: automatic differentiation
     270                 ad_analysis = modelfield('default',false,'marshall',true,'format','Boolean');
     271                 ad_forward = modelfield('default',true,'marshall',true,'format','Boolean');
     272                 ad_reverse = modelfield('default',false,'marshall',true,'format','Boolean');
    268273
    269274                 %grounding line migration:
     
    433438                         if isfield(structmd,'gridonboundary'), md.nodeonboundary=structmd.gridonboundary; end
    434439                         if isfield(structmd,'petscoptions'), md.solver=structmd.petscoptions; end
     440                         if isfield(structmd,'dakota_analysis'), md.dakota_analysis=structmd.dakota_analysis; end
    435441
    436442                         %Field changes
  • issm/trunk/src/m/model/display/displayqmu.m

    r1249 r9571  
    1111disp(sprintf('      ''%s''','qmu using Dakota'));
    1212
    13 if ~md.qmu_analysis,
    14         disp(sprintf('         %s','no scheduled qmu. activate by doing md.qmu_analysis=1'));
     13if ~md.dakota_analysis,
     14        disp(sprintf('         %s','no scheduled qmu. activate by doing md.dakota_analysis=1'));
    1515else
    1616
  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r9563 r9571  
    249249%}}}
    250250%QMU {{{1
    251 if md.qmu_analysis,
     251if md.dakota_analysis,
    252252        if md.qmu_params.evaluation_concurrency~=1,
    253253                message(['model not consistent: concurrency should be set to 1 when running dakota in library mode']);
     
    347347%Now check all analyses called for a given solution
    348348%ANALYSESCHECKS {{{1
    349 [analyses,numanalyses,solutioncore]=SolutionConfiguration(md.solution_type);
     349[analyses,numanalyses]=AnalysisConfiguration(md.solution_type);
    350350for i=1:numanalyses,
    351351        checkforanalysis(md,analyses(i));
  • issm/trunk/src/m/model/isresultconsistent.m

    r9451 r9571  
    2121
    2222%do not check results if qmu analysis
    23 if md.qmu_analysis,
     23if md.dakota_analysis,
    2424        return
    2525end
  • issm/trunk/src/m/model/loadresultsfromcluster.m

    r9451 r9571  
    3636
    3737%erase the log and output files
    38 if md.qmu_analysis,
     38if md.dakota_analysis,
    3939        delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.outlog']);
    4040        delete([['qmu' num2str(feature('GetPid')) '/']  md.name '.errlog']);
     
    4949hostname=oshostname();
    5050if strcmpi(hostname,cluster.name),
    51         if md.qmu_analysis,
     51        if md.dakota_analysis,
    5252                delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.bin']);
    5353                delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.queue']);
  • issm/trunk/src/m/model/loadresultsfromdisk.m

    r9432 r9571  
    1111end
    1212
    13 if ~md.qmu_analysis,
     13if ~md.dakota_analysis,
    1414
    1515        %initialize md.results if not a structure yet
  • issm/trunk/src/m/model/solve.m

    r9564 r9571  
    4040%if running qmu analysis, some preprocessing of dakota files using
    4141%models fields needs to be carried out.
    42 if md.qmu_analysis,
     42if md.dakota_analysis,
    4343        md=preqmu(md,options);
    4444end
     
    7474
    7575%post processes qmu results if necessary
    76 if md.qmu_analysis,
     76if md.dakota_analysis,
    7777        md=postqmu(md);
    7878        cd ..
  • issm/trunk/src/m/model/solveparallel.m

    r9423 r9571  
    3939
    4040                %post processes qmu results if necessary
    41                 if md.qmu_analysis,
     41                if md.dakota_analysis,
    4242                        if ~strncmpi(options.keep,'y',1)
    4343                                system(['rm -rf qmu' num2str(feature('GetPid'))]);
  • issm/trunk/src/m/qmu/examples/lrel_mmf.m

    r6309 r9571  
    6868md.qmu_params.fd_gradient_step_size=0.01;
    6969
    70 md.qmu_analysis=1;
     70md.dakota_analysis=1;
    7171md.npart=10;
    7272if isempty(md.adjacency)
  • issm/trunk/src/m/qmu/postqmu.m

    r6860 r9571  
    5656
    5757%  move all the individual function evalutations into zip files
    58 if ~md.qmu_analysis,
     58if ~md.dakota_analysis,
    5959        system('zip -mq params.in.zip params.in.[1-9]*');
    6060        system('zip -mq results.out.zip results.out.[1-9]*');
  • issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m

    r9401 r9571  
    1 function [solutioncore]=CorePointerFromSolutionEnum(solutiontype),
     1function [solutioncore]=CorePointerFromSolutionEnum(parameters,solutiontype),
    22%COREPOINTERFROMSOLUTIONENUM - returns solution_core function
    33%
    44%   Usage:
    5 %      [solutioncore]=CorePointerFromSolutionEnum(solutiontype);
     5%      [solutioncore]=CorePointerFromSolutionEnum(parameters,solutiontype);
     6
     7control_analysis=parameters.ControlAnalysis;
     8dakota_analysis=parameters.DakotaAnalysis;
    69
    710switch solutiontype,
     
    2225
    2326end
     27
     28%if control being run on top of solution, change core
     29if(control_analysis)solutioncore='control_core';end
  • issm/trunk/src/m/solutions/diagnostic_core.m

    r8926 r9571  
    1515        ismacayealpattyn=femmodel.parameters.Ismacayealpattyn;
    1616        isstokes=femmodel.parameters.Isstokes;
    17         qmu_analysis=femmodel.parameters.QmuAnalysis;
     17        dakota_analysis=femmodel.parameters.QmuAnalysis;
    1818        control_analysis=femmodel.parameters.ControlAnalysis;
    1919        solution_type=femmodel.parameters.SolutionType;
    2020
    2121        %for qmu analysis, be sure the velocity input we are starting from  is the one in the parameters:
    22         if qmu_analysis,
     22        if dakota_analysis,
    2323                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuVxEnum,VxEnum);
    2424                femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,QmuVyEnum,VyEnum);
  • issm/trunk/src/m/solutions/issm.m

    r9422 r9571  
    99        disp('launching solution sequence');
    1010
    11         %out of solution_type, figure out solution core function pointer, and types of analyses needed:
    12         [analyses,numanalyses,solutioncore]=SolutionConfiguration(solution_type);
     11        %out of solution_type, figure types of analyses needed:
     12        [analyses,numanalyses]=AnalysisConfiguration(solution_type);
    1313
    1414        %create finite element model
    1515        femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
     16
     17        %out of solution_type, figure out solution core function pointer
     18        [solutioncore]=CorePointerFromSolutionEnum(femmodel.parameters,solution_type);
    1619       
    1720        %process petsc options:
     
    1922
    2023        %retrieve parameters
    21         qmu_analysis=femmodel.parameters.QmuAnalysis;
    22         control_analysis=femmodel.parameters.ControlAnalysis;
    23 
    24         %if control being run on top of solution, change core
    25         if(control_analysis)solutioncore='control_core';end
     24        dakota_analysis=femmodel.parameters.DakotaAnalysis;
    2625
    2726        %compute solution
    28         if ~qmu_analysis,
    29                        
    30                 issmprintf(VerboseSolution,'%s',['call computational core']);
     27
     28        issmprintf(VerboseSolution,'%s',['call computational core']);
     29        if dakota_analysis,
     30                Dakota(femmodel);
     31        else
    3132                eval(['femmodel=' solutioncore '(femmodel);']);
     33        end
    3234
    33                 issmprintf(VerboseSolution,'%s',['write results'])
    34                 md.results.(EnumToString(solution_type))=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
    35         else
    36                 %launch dakota driver for diagnostic core solution
    37                 Qmu(femmodel,femmodel.parameters);
    38         end
     35        issmprintf(VerboseSolution,'%s',['write results'])
     36        md.results.(EnumToString(solution_type))=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
    3937
    4038        %stop timing
  • issm/trunk/src/mex/Dakota/Dakota.cpp

    r9570 r9571  
    3131        femmodel=FEMMODEL;
    3232
    33         /*Get parameters out of femmodel, to feed to Dakotax: */
    34         FetchMatlabData((DataSet**)&parameters,mxGetField(FEMMODEL,0,"parameters"));
    35 
    3633        /*!Generate internal degree of freedom numbers: */
    37         Dakotax(femmodel,parameters);
     34        Dakotax(femmodel);
    3835
    3936        /*end module: */
  • issm/trunk/test/NightlyRun/test235.m

    r9463 r9571  
    7878%imperative!
    7979md.eps_rel=10^-10; %tighten for qmu analysese
    80 md.qmu_analysis=1;
     80md.dakota_analysis=1;
    8181
    8282%solve
  • issm/trunk/test/NightlyRun/test236.m

    r9463 r9571  
    7878%imperative!
    7979md.eps_rel=10^-10; %tighten for qmu analysese
    80 md.qmu_analysis=1;
     80md.dakota_analysis=1;
    8181
    8282%solve
  • issm/trunk/test/NightlyRun/test423.m

    r8304 r9571  
    99md=partitioner(md,'package','linear','npart',md.npart);
    1010md.part=md.part-1;
    11 md.qmu_analysis=1;
     11md.dakota_analysis=1;
    1212
    1313%Dakota options
  • issm/trunk/test/NightlyRun/test424.m

    r8589 r9571  
    99md=partitioner(md,'package','linear','npart',md.npart);
    1010md.part=md.part-1;
    11 md.qmu_analysis=1;
     11md.dakota_analysis=1;
    1212
    1313
  • issm/trunk/test/NightlyRun/test425.m

    r8295 r9571  
    3131%imperative!
    3232md.eps_rel=10^-5; %tighten for qmu analyses
    33 md.qmu_analysis=1;
     33md.dakota_analysis=1;
    3434
    3535%solve
  • issm/trunk/test/NightlyRun/test426.m

    r8589 r9571  
    3131%imperative!
    3232md.eps_rel=10^-5; %tighten for qmu analyses
    33 md.qmu_analysis=1;
     33md.dakota_analysis=1;
    3434
    3535%solve
  • issm/trunk/test/NightlyRun/test427.m

    r8824 r9571  
    4343md.qmu_params.evaluation_concurrency=1;
    4444md.qmu_params.interval_type='forward';
    45 md.qmu_analysis=1;
     45md.dakota_analysis=1;
    4646md.eps_rel=10^-5; %tighten for qmu analyses
    4747
  • issm/trunk/test/NightlyRun/test428.m

    r8824 r9571  
    4343md.qmu_params.evaluation_concurrency=1;
    4444md.qmu_params.interval_type='forward';
    45 md.qmu_analysis=1;
     45md.dakota_analysis=1;
    4646md.eps_rel=10^-5; %tighten for qmu analyses
    4747
  • issm/trunk/test/NightlyRun/test434.m

    r8824 r9571  
    4545md=partitioner(md,'package','chaco','npart',md.npart,'weighting','on');
    4646md.part=md.part-1;
    47 md.qmu_analysis=1;
     47md.dakota_analysis=1;
    4848
    4949md.eps_rel=10^-5; %tighten for qmu analyses
  • issm/trunk/test/NightlyRun/test439.m

    r8295 r9571  
    99md=partitioner(md,'package','chaco','npart',md.npart);
    1010md.part=md.part-1;
    11 md.qmu_analysis=1;
     11md.dakota_analysis=1;
    1212
    1313%Dakota options
  • issm/trunk/test/NightlyRun/test440.m

    r8589 r9571  
    99md=partitioner(md,'package','chaco','npart',md.npart);
    1010md.part=md.part-1;
    11 md.qmu_analysis=1;
     11md.dakota_analysis=1;
    1212
    1313%Dakota options
Note: See TracChangeset for help on using the changeset viewer.