Changeset 2142

Timestamp:

09/09/09 12:09:35 (15 years ago)

Author:

Eric.Larour

Message:

Took out all matlab scripting capabilities, to simplify.

Location:

issm/trunk/src/m/solutions/dakota

Files:

• cielo_ice_script.sh (deleted)
• dakota_in_data.m (modified) (2 diffs)
• dakota_m_write.m (deleted)
• preqmu.m (modified) (1 diff)
• process_qmu_options.m (modified) (1 diff)
• responsefunctions (deleted)
• updatefunctions (deleted)

issm/trunk/src/m/solutions/dakota/dakota_in_data.m

@@ -109 +109 @@
         for j=1:length(variables.(fnames{i}))
             %call setupdesign
-            dvar.(fnames{i})=QmuSetupDesign(dvar.(fnames{i}),variables.(fnames{i})(j),params,varargin{:}); 
+            dvar.(fnames{i})=QmuSetupDesign(dvar.(fnames{i}),variables.(fnames{i})(j),params,varargin{:});
         end
     end
 end
+
 
 %%  responses
@@ -135 +136 @@
 dakota_in_write(dmeth.method,dmeth,dvar,dresp,params,filei,varargin{:});
 
-%Write m file
-%dakota_m_write(dmeth.method,dmeth,dvar,dresp,params,filei,package,varargin{:});
-
 end

issm/trunk/src/m/solutions/dakota/preqmu.m

@@ -41 +41 @@
 %when running in library mode, the in file needs to be called md.name.qmu.in
 options.qmufile=[md.name ];
-
-%create m and in files for dakota
-if (~isfield(md.qmu_params(options.iparams),'direct') || ...
-    ~md.qmu_params(options.iparams).direct) && ...
-   (~isfield(md.qmu_params(options.iparams),'analysis_driver') || ...
-    isempty(md.qmu_params(options.iparams).analysis_driver))
-    md.qmu_params(options.iparams).analysis_driver=[ISSM_DIR '/src/m/solutions/dakota/cielo_ice_script.sh'];
-end
 
 %retrieve variables and resposnes for this particular analysis.

issm/trunk/src/m/solutions/dakota/process_qmu_options.m

@@ -86 +86 @@
 %first, the defaults
 qmudir ='qmu';% qmudir =['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
-qmufile='qmu';%  qmufile can not be changed unless cielo_ice_script.sh is also changed
+qmufile='qmu';
 ivar   =1;
 iresp  =1;