Changeset 2033

Timestamp:

08/27/09 17:15:17 (16 years ago)

Author:

seroussi

Message:

fixed control stedy, but stokes not working yet

Location:

issm/trunk/src/c/parallel

Files:

• convergence.cpp (modified) (2 diffs)
• gradjcompute_core.cpp (modified) (3 diffs)
• objectivefunctionC.cpp (modified) (4 diffs)
• steadystate.cpp (modified) (2 diffs)

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

@@ -67 +67 @@
         VecNorm(pf,NORM_2,&nF);
         res=nKUoldF/nF;
-        if (isnan(res)) throw ErrorException(__FUNCT__,exprintf("mechanical equilibrium convergence criterion is NaN! "));
+        if (isnan(res)){
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"norm nf %lf \n",nF);
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"norm kuold %lf \n",nKUoldF);
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+                throw ErrorException(__FUNCT__,exprintf("mechanical equilibrium convergence criterion is NaN! "));
+        }
 
         //clean up
@@ -89 +96 @@
                 VecDuplicate(old_uf,&duf);VecCopy(old_uf,duf); VecAYPX(duf,-1.0,uf);
                 VecNorm(duf,NORM_2,&ndu); VecNorm(old_uf,NORM_2,&nu);
+
                 if (isnan(ndu) || isnan(nu)) throw ErrorException(__FUNCT__,exprintf("convergence criterion is NaN! "));
 

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

@@ -24 +24 @@
         int sub_analysis_type;
         int numberofnodes;
+        int control_steady;
         int numberofdofspernode;
         char* solverstring=NULL;
@@ -54 +55 @@
         femmodel->parameters->FindParam((void*)&analysis_type,"analysis_type");
         femmodel->parameters->FindParam((void*)&sub_analysis_type,"sub_analysis_type");
+        femmodel->parameters->FindParam((void*)&control_steady,"control_steady");
         femmodel->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
         femmodel->parameters->FindParam((void*)&numberofdofspernode,"numberofdofspernode");
@@ -95 +97 @@
         }
 
-        if(analysis_type==SteadystateAnalysisEnum()){
+        if(control_steady){
                 diagnostic_results=new DataSet(ResultsEnum()); 
                 diagnostic_core(diagnostic_results,model, inputs);

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

@@ -41 +41 @@
         int     analysis_type;
         int     sub_analysis_type;
+        int     control_steady;
         Vec     u_g=NULL;
         Vec     u_g_full=NULL;
@@ -71 +72 @@
         femmodel->parameters->FindParam((void*)&analysis_type,"analysis_type");
         femmodel->parameters->FindParam((void*)&sub_analysis_type,"sub_analysis_type");
+        femmodel->parameters->FindParam((void*)&control_steady,"control_steady");
         femmodel->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
         femmodel->parameters->FindParam((void*)&numberofdofspernode,"numberofdofspernode");
@@ -88 +90 @@
         inputs->Add(control_type,param_g_copy,1,numberofnodes);
 
-        if (analysis_type==DiagnosticAnalysisEnum()){
+        if (control_steady==0){
                 //Run diagnostic with updated parameters.
                 diagnostic_core_nonlinear(&u_g,NULL,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
                 VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
+                inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);
         }
         else{
@@ -102 +105 @@
                 delete results_steadystate;
 
+                VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
+                if(!isstokes){
+                        inputs->Add("velocity",u_g_double,3,numberofnodes);
+                }
+                else{
+                        inputs->Add("velocity",u_g_double,4,numberofnodes);
+                }
                 //extract the correct number of dofs (3 or 4)
-                VecDuplicatePatch(&u_g_full,u_g);VecFree(&u_g);
-                if(!isstokes){
-                        xfree((void**)& dofset);dofset=dofsetgen(2,dofs01,3,numberofnodes*3); VecPartition(&u_g, u_g_full, dofset, numberofnodes*2);
-                }
-                VecFree(&u_g_full);
+//              VecDuplicatePatch(&u_g_full,u_g);VecFree(&u_g);
+//              if(!isstokes){
+//                      xfree((void**)& dofset);
+//                      dofset=dofsetgen(2,dofs01,3,numberofnodes*3); 
+//                      VecPartition(&u_g, u_g_full, dofset, numberofnodes*2);
+//              }
+//              VecFree(&u_g_full);
+//              inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);
         }
-
-        inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);
 
         //Compute misfit for this velocity field. 

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

@@ -30 +30 @@
         /*Model: */
         Model* model=NULL;
+        FemModel* fem_dh=NULL;
+        FemModel* fem_ds=NULL;
 
         /*Results: */
@@ -122 +124 @@
                 }
                 else{
+                        /*change control_steady to 1 to know we are doing steadystate*/
+                        fem_dh=model->GetFormulation(DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+                        fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+                        param=(Param*)fem_dh->parameters->FindParamObject("control_steady");
+                        param->SetInteger(1);
+                        param=(Param*)fem_ds->parameters->FindParamObject("control_steady");
+                        param->SetInteger(1);
                         /*run control analysis: */
                         _printf_("call computational core:\n");