Changeset 8930

Timestamp:

07/12/11 16:48:55 (14 years ago)

Author:

Mathieu Morlighem

Message:

fixed some problems with new marshall

Location:

issm/trunk/src

Files:

• c/objects/Elements/Tria.cpp (modified) (1 diff)
• m/model/ismodelselfconsistent.m (modified) (1 diff)
• m/solutions/adjointdiagnostic_core.m (modified) (1 diff)
• m/solutions/control_core.m (modified) (2 diffs)
• m/solutions/gradient_core.m (modified) (1 diff)
• m/solutions/objectivefunctionC.m (modified) (1 diff)
• m/solutions/processresults.m (modified) (2 diffs)
• m/utils/Enum/BuildEnum.m (modified) (3 diffs)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -3093 +3093 @@
                 }
         }
+        /*Analytical gradient*/
+        //delete gauss;
+        //gauss=new GaussTria();
+        //for (int iv=0;iv<NUMVERTICES;iv++){
+        //      gauss->GaussVertex(iv);
+        //      friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum);
+        //      dragcoefficient_input->GetParameterValue(&drag, gauss);
+        //      adjointx_input->GetParameterValue(&lambda, gauss);
+        //      adjointy_input->GetParameterValue(&mu, gauss);
+        //      vx_input->GetParameterValue(&vx,gauss);
+        //      vy_input->GetParameterValue(&vy,gauss);
+        //      grade_g[iv]=-2*drag*alpha_complement*((lambda*vx+mu*vy));
+        //      VecSetValues(gradient,NUMVERTICES,doflist1,(const double*)grade_g,INSERT_VALUES);
+        //}
+        /*End Analytical gradient*/
+
         VecSetValues(gradient,NUMVERTICES,doflist1,(const double*)grade_g,ADD_VALUES);
 

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -188 +188 @@
         num_controls=numel(md.control_type);
         num_costfunc=size(md.cm_responses,2);
-        checkvalues(md,{'control_type'},[DhDtEnum DragCoefficientEnum RheologyBbarEnum VxEnum VyEnum]);
+        checkvalues(md,{'control_type'},[DhdtEnum DragCoefficientEnum RheologyBbarEnum VxEnum VyEnum]);
 
         %LENGTH CONTROL FIELDS

issm/trunk/src/m/solutions/adjointdiagnostic_core.m

@@ -6 +6 @@
 
         %recover parameters common to all solutions
-        isstokes=femmodel.parameters.IsStokes;
+        isstokes=femmodel.parameters.Isstokes;
         dim=femmodel.parameters.Dim;
         control_analysis=femmodel.parameters.ControlAnalysis;

issm/trunk/src/m/solutions/control_core.m

@@ -12 +12 @@
         control_type=femmodel.parameters.ControlType;
         solution_type=femmodel.parameters.SolutionType;
-        nsteps=femmodel.parameters.NSteps;
-        maxiter=femmodel.parameters.MaxIter;
+        nsteps=femmodel.parameters.Nsteps;
+        maxiter=femmodel.parameters.Maxiter;
         cm_jump=femmodel.parameters.CmJump;
         eps_cm=femmodel.parameters.EpsCm;
-        tolx=femmodel.parameters.TolX;
+        tolx=femmodel.parameters.Tolx;
         cm_gradient=femmodel.parameters.CmGradient;
         dim=femmodel.parameters.Dim;
-        isstokes=femmodel.parameters.IsStokes;
+        isstokes=femmodel.parameters.Isstokes;
 
         %Initialise options with tolerance and maxiter
-        options.TolX=femmodel.parameters.TolX;
-        options.MaxIter=femmodel.parameters.MaxIter;
+        options.TolX=femmodel.parameters.Tolx;
+        options.MaxIter=femmodel.parameters.Maxiter;
 
         %Initialize misfits with a vector of zeros
@@ -41 +41 @@
         for n=1:nsteps,
 
-                issmprintf(VerboseControl(),['control method step ' num2str(n) '/' num2str(femmodel.parameters.NSteps)]);
+                issmprintf(VerboseControl(),['control method step ' num2str(n) '/' num2str(femmodel.parameters.Nsteps)]);
                 femmodel.parameters.StepResponses=responses(n,:);
 

issm/trunk/src/m/solutions/gradient_core.m

@@ -24 +24 @@
         control_type=femmodel.parameters.ControlType;
         control_steady=femmodel.parameters.ControlSteady;
-        optscal_list=femmodel.parameters.OptScal;
+        optscal_list=femmodel.parameters.Optscal;
 
         for i=1:num_controls,

issm/trunk/src/m/solutions/objectivefunctionC.m

@@ -8 +8 @@
 analysis_type = femmodel.parameters.AnalysisType;
 solution_type = femmodel.parameters.SolutionType;
-isstokes      = femmodel.parameters.IsStokes;
+isstokes      = femmodel.parameters.Isstokes;
 
 %set current configuration

issm/trunk/src/m/solutions/processresults.m

@@ -22 +22 @@
         %some flags needed
         dim=m_dhu.parameters.Dim;
-        ishutter=m_dhu.parameters.IsHutter;
-        ismacayealpattyn=m_dh.parameters.IsMacAyealPattyn;
-        isstokes=m_ds.parameters.IsStokes;
+        ishutter=m_dhu.parameters.Ishutter;
+        ismacayealpattyn=m_dh.parameters.Ismacayealpattyn;
+        isstokes=m_ds.parameters.Isstokes;
 end
 if (analysis_type==ControlAnalysisEnum()),
@@ -31 +31 @@
         %some flags needed
         dim=m_dh.parameters.Dim;
-        ishutter=m_dh.parameters.IsHutter;
-        ismacayealpattyn=m_dh.parameters.IsMacAyealPattyn;
-        isstokes=m_dh.parameters.IsStokes;
+        ishutter=m_dh.parameters.Ishutter;
+        ismacayealpattyn=m_dh.parameters.Ismacayealpattyn;
+        isstokes=m_dh.parameters.Isstokes;
 end
 if (analysis_type==ThermalAnalysisEnum() | analysis_type==TransientAnalysisEnum() | analysis_type==SteadystateAnalysisEnum()),

issm/trunk/src/m/utils/Enum/BuildEnum.m

@@ -1 +1 @@
 function enum=BuildEnum(string)
-%BUILDENUM: build enum out of string
-
-
-%some processing: 
+%BUILDENUM - build enum out of string
+%
+%   Usage:
+%      enum=BuildEnum(string)
 
 if findstr(string,'icesheet'),
@@ -18 +18 @@
         end
 end
-
 
 if strncmpi(string,'elementon',9),
@@ -57 +56 @@
 end
 
-
-
 %take first letter of string and make it uppercase: 
 string(1)=upper(string(1));
 
+%Get Enum
 enum=eval([string 'Enum']);