Changeset 1665

Timestamp:

08/13/09 11:28:46 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Reducevectorgtof needed to have only one iteration with eps_res

Location:

issm/trunk/src

Files:

• c/Makefile.am (modified) (2 diffs)
• c/Reducevectorgtofx (added)
• c/Reducevectorgtofx/Reducevectorgtofx.cpp (added)
• c/Reducevectorgtofx/Reducevectorgtofx.h (added)
• c/issm.h (modified) (1 diff)
• c/parallel/diagnostic_core_nonlinear.cpp (modified) (2 diffs)
• m/solutions/cielo/diagnostic_core_nonlinear.m (modified) (2 diffs)
• mex/Makefile.am (modified) (2 diffs)
• mex/Reducevectorgtof (added)
• mex/Reducevectorgtof/Reducevectorgtof.cpp (added)
• mex/Reducevectorgtof/Reducevectorgtof.h (added)

issm/trunk/src/c/Makefile.am

@@ -258 +258 @@
                                         ./Reducevectorgtosx/Reducevectorgtosx.cpp\
                                         ./Reducevectorgtosx/Reducevectorgtosx.h\
+                                        ./Reducevectorgtofx/Reducevectorgtofx.cpp\
+                                        ./Reducevectorgtofx/Reducevectorgtofx.h\
                                         ./Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\
                                         ./Reducematrixfromgtofx/Reducematrixfromgton.cpp\
@@ -543 +545 @@
                                         ./Reducevectorgtosx/Reducevectorgtosx.cpp\
                                         ./Reducevectorgtosx/Reducevectorgtosx.h\
+                                        ./Reducevectorgtofx/Reducevectorgtofx.cpp\
+                                        ./Reducevectorgtofx/Reducevectorgtofx.h\
                                         ./Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\
                                         ./Reducematrixfromgtofx/Reducematrixfromgton.cpp\

issm/trunk/src/c/issm.h

@@ -32 +32 @@
 #include "./BuildNodeSetsx/BuildNodeSetsx.h"
 #include "./Reducevectorgtosx/Reducevectorgtosx.h"
+#include "./Reducevectorgtofx/Reducevectorgtofx.h"
 #include "./NormalizeConstraintsx/NormalizeConstraintsx.h"
 #include "./ConfigureObjectsx/ConfigureObjectsx.h"

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

@@ -66 +66 @@
         loads=fem->loads->Copy();
 
-        /*Initialize ug and ug_old */
+        /*Initialize ug, uf, ug_old and uf_old */
         if (numberofdofspernode>=3)dofs[2]=1;//only keep vz if running with more than 3 dofs per node
         if (numberofdofspernode==4)dofs[3]=1;//only keep vz and presure if running with more than 3 dofs per node
         ug=inputs->Get("velocity",&dofs[0],4);
-        VecDuplicate(ug,&old_ug);
-        VecCopy(ug,old_ug);
+        VecDuplicate(ug,&old_ug); VecCopy(ug,old_ug);
+        Reducevectorgtofx(&uf,ug,fem->nodesets);
+        VecDuplicate(uf,&old_uf); VecCopy(uf,old_uf);
 
         count=1;
@@ -143 +144 @@
 
                 /*mechanical residue = norm(KUold-F)/norm(F)*/
-                if (count>1){
-                        //compute KUoldF = KUold - F = K*Uold - F
-                        VecDuplicate(uf,&KUold); MatMultPatch(Kff,old_uf,KUold);
-                        VecDuplicate(KUold,&KUoldF);VecCopy(KUold,KUoldF); VecAYPX(KUoldF,-1.0,pf);
-                        //compute norm(KUF), norm(F) and residue
-                        VecNorm(KUoldF,NORM_2,&nKUoldF);
-                        mechanical_residue=nKUoldF/nF;
-                        //clean up
-                        VecFree(&KUold);
-                        VecFree(&KUoldF);
-                }
-                else{
-                        mechanical_residue=nKUoldF/nF;
-                }
+                //compute KUoldF = KUold - F = K*Uold - F
+                VecDuplicate(uf,&KUold); MatMultPatch(Kff,old_uf,KUold);
+                VecDuplicate(KUold,&KUoldF);VecCopy(KUold,KUoldF); VecAYPX(KUoldF,-1.0,pf);
+                //compute norm(KUF), norm(F) and residue
+                VecNorm(KUoldF,NORM_2,&nKUoldF);
+                mechanical_residue=nKUoldF/nF;
+                //clean up
+                VecFree(&KUold);
+                VecFree(&KUoldF);
                 if (debug) _printf_("%-50s%g%s\n","   Convergence criterion: norm(KUold-F)/norm(F)",mechanical_residue*100," \%");
 

issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m

@@ -13 +13 @@
 
         soln(count).u_g=get(inputs,'velocity',[1 1 (m.parameters.numberofdofspernode>=3) (m.parameters.numberofdofspernode>=3)]); %only keep vz if running with more than 3 dofs per node
-        soln(count).u_f=[];
+        soln(count).u_f= Reducevectorgtof(soln(count).u_g,m.nodesets);
 
         displaystring(m.parameters.debug,'\n%s',['   starting direct shooting method']);
@@ -65 +65 @@
 
                 %Force equilibrium
-                if count>2,
-                        mechanical_residue=norm(K_ff*soln(count-1).u_f-p_f,2)/norm(p_f,2);
-                else
-                        mechanical_residue=NaN;
-                end
+                mechanical_residue=norm(K_ff*soln(count-1).u_f-p_f,2)/norm(p_f,2);
                 displaystring(m.parameters.debug,'%-53s%g%s','      convergence criterion: norm(KUold-F)/norm(F)',mechanical_residue*100,' %');
 

issm/trunk/src/mex/Makefile.am

@@ -38 +38 @@
                                 Reducematrixfromgtof\
                                 Reducevectorgtos\
+                                Reducevectorgtof\
                                 SetStructureField\
                                 Solver\
@@ -180 +181 @@
                           Reducevectorgtos/Reducevectorgtos.h
 
+Reducevectorgtof_SOURCES = Reducevectorgtof/Reducevectorgtof.cpp\
+                                                                        Reducevectorgtof/Reducevectorgtof.h
+
 SetStructureField_SOURCES = SetStructureField/SetStructureField.cpp\
                           SetStructureField/SetStructureField.h