Changeset 1911

Timestamp:

08/26/09 09:26:57 (16 years ago)

Author:

seroussi

Message:

moved control solution in diagnostic for paralle

Location:

issm/trunk/src

Files:

• c/parallel/diagnostic.cpp (modified) (7 diffs)
• m/classes/public/loadresultsfromdisk.m (modified) (1 diff)
• m/classes/public/marshall.m (modified) (1 diff)

issm/trunk/src/c/parallel/diagnostic.cpp

@@ -23 +23 @@
         char* outputfilename=NULL;
         char* lockname=NULL;
-        int   waitonlock=0;
         int   qmu_analysis=0;
+        int   control_analysis=0;
+        char* control_type=NULL;
 
         /*Model: */
@@ -34 +35 @@
         
         ParameterInputs* inputs=NULL;
+        int waitonlock=0;
         int   numberofnodes;
         
         double* u_g_initial=NULL;
+        double* u_g_obs=NULL;
         Param*  param=NULL;
+        int      count;
+        DataSet* parameters=NULL;
 
         MODULEBOOT();
@@ -80 +85 @@
         /*get parameters: */
         model->FindParam(&qmu_analysis,"qmu_analysis");
+        model->FindParam(&control_analysis,"control_analysis");
         model->FindParam(&waitonlock,"waitonlock");
 
@@ -85 +91 @@
         model->FindParam(&u_g_initial,"u_g",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
         model->FindParam(&numberofnodes,"numberofnodes");
+        if(control_analysis){
+                model->FindParam(&u_g_obs,"u_g_obs",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+        }
 
         inputs=new ParameterInputs;
         inputs->Add("velocity",u_g_initial,3,numberofnodes);
+        if(control_analysis){
+                inputs->Add("velocity_obs",u_g_obs,2,numberofnodes);
+        }
         
         _printf_("initialize results:\n");
@@ -94 +106 @@
         /*are we running the solution sequence, or a qmu wrapper around it? : */
         if(!qmu_analysis){
-
-                /*run diagnostic analysis: */
-                _printf_("call computational core:\n");
-                diagnostic_core(results,model,inputs);
-
+                if(!control_analysis){
+                        /*run diagnostic analysis: */
+                        _printf_("call computational core:\n");
+                        diagnostic_core(results,model,inputs);
+                }
+                else{
+                        /*run control analysis: */
+                        _printf_("call computational core:\n");
+                        control_core(results,model,inputs);
+                }
         }
         else{
@@ -111 +128 @@
         }
 
-        /*Add analysis_type to results: */
-        result=new Result(results->Size()+1,0,1,"analysis_type","diagnostic");
-        results->AddObject(result);
+        if(!control_analysis){
+                /*Add analysis_type to results: */
+                result=new Result(results->Size()+1,0,1,"analysis_type","diagnostic");
+                results->AddObject(result);
+                
+                _printf_("process results:\n");
+                ProcessResults(&results,model,DiagnosticAnalysisEnum());
+        }
+        else{
+                /*Add analysis_type and control_type to results: */
+                result=new Result(results->Size()+1,0,1,"analysis_type","control");
+                results->AddObject(result);
+                
+                model->FindParam(&control_type,"control_type");
+                result=new Result(results->Size()+1,0,1,"control_type",control_type);
+                results->AddObject(result);
 
-        _printf_("process results:\n");
-        ProcessResults(&results,model,DiagnosticAnalysisEnum());
-        
+                _printf_("process results:\n");
+                ProcessResults(&results,model,ControlAnalysisEnum());
+        }
+
         _printf_("write results to disk:\n");
         OutputResults(results,outputfilename);
@@ -132 +163 @@
         MODULEEND();
         
+        /*Free ressources */
+        xfree((void**)&u_g_initial);
+        xfree((void**)&u_g_obs);
+
         return 0; //unix success return;
 }

issm/trunk/src/m/classes/public/loadresultsfromdisk.m

@@ -21 +21 @@
 %Check result is consistent, only if it exists
 disp(sprintf('%s\n','checking result consistency'));
-if ~isresultconsistent(md,md.analysis_type),
-        %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
-        disp('!! results not consistent correct the model !!') 
-end
+%if ~isresultconsistent(md,md.analysis_type),
+%       %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
+%       disp('!! results not consistent correct the model !!') 
+%end
 
 %convert analysis type to string

issm/trunk/src/m/classes/public/marshall.m

@@ -96 +96 @@
 
 %Control methods
+WriteData(fid,md.control_analysis,'Integer','control_analysis');
 WriteData(fid,md.control_type,'String','control_type');