Changeset 4523

Timestamp:

07/12/10 10:53:04 (15 years ago)

Author:

Mathieu Morlighem

Message:

Now CM steadystate runs

Location:

issm/trunk/src

Files:

• c/solutions/control_core.cpp (modified) (3 diffs)
• m/utils/Nightly/testsgetfields.m (modified) (1 diff)

issm/trunk/src/c/solutions/control_core.cpp

@@ -105 +105 @@
                 /*Temporary saving every 5 control steps: */
                 if (((n+1)%5)==0){
-                        _printf_("%s","      saving temporary results...");
+                        _printf_("%s\n","      saving temporary results...");
                         controlrestart(femmodel,J);
                 }
@@ -112 +112 @@
 
         convergence_point:
-        _printf_("%s","      preparing final velocity solution");
+        _printf_("%s\n","      preparing final velocity solution");
         if (control_steady) steadystate_core(femmodel);
         else diagnostic_core(femmodel);
@@ -121 +121 @@
         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum); 
         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VelEnum); 
-        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GradientEnum); 
-        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointxEnum); 
-        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointyEnum); 
+        //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,GradientEnum); 
+        //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointxEnum); 
+        //InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointyEnum); 
         if(dim==3)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum); 
         femmodel->results->AddObject(new DoubleVecExternalResult(femmodel->results->Size()+1,JEnum,J,nsteps,1,0));

issm/trunk/src/m/utils/Nightly/testsgetfields.m

@@ -111 +111 @@
                 vel=zeros(md.numberofgrids,1);
                 vel(md.results.SteadystateSolution.Vel.index)=md.results.SteadystateSolution.Vel.value;
-                j=zeros(md.numberofgrids,1);
-                j(md.results.SteadystateSolution.J.index)=md.results.SteadystateSolution.J.value;
-                parameter=zeros(md.numberofgrids,1);
-                parameter(md.results.SteadystateSolution.parameter.index)=md.results.SteadystateSolution.parameter.value;
+                j=md.results.DiagnosticSolution.J;
+                if strcmpi(md.control_type,'rheology_B'),
+                        parameter(md.results.DiagnosticSolution.RheologyB.index)=md.results.DiagnosticSolution.RheologyB.value;
+                elseif strcmpi(md.control_type,'drag_coefficient'),
+                        parameter(md.results.DiagnosticSolution.DragCoefficient.index)=md.results.DiagnosticSolution.DragCoefficient.value;
+                else
+                        error('not implemented yet');
+                end
                 field_values={vel,j,parameter};
         else