Changeset 5377

Timestamp:

08/18/10 14:58:10 (15 years ago)

Author:

Mathieu Morlighem

Message:

One adjoint per solution

Location:

issm/trunk/src/m/solutions

Files:

• AdjointCorePointerFromSolutionEnum.m (added)
• SetCurrentConfiguration.m (modified) (1 diff)
• adjoint_core.m (deleted)
• adjointbalancedthickness_core.m (added)
• adjointdiagnostic_core.m (added)
• control_core.m (modified) (2 diffs)
• gradient_core.m (modified) (1 diff)

issm/trunk/src/m/solutions/SetCurrentConfiguration.m

@@ -34 +34 @@
 
         if found==-1,
-                error('SetCurrentConfiguration error message: could not find analysis_type in list of FemModel analyses');
+                error(['SetCurrentConfiguration error message: could not find analysis_type ' EnumToString(configuration_enum) ' in list of FemModel analyses']);
         end
         

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

@@ -29 +29 @@
         %Get core from solution type
         solutioncore=CorePointerFromSolutionEnum(solution_type);
+        adjointcore=AdjointCorePointerFromSolutionEnum(solution_type);
 
         %Preprocess models
@@ -44 +45 @@
                         femmodel=steadystate_core(femmodel);
                 end
+
+                displaystring(verbose,'\n%s',['      compute adjoint state...']);
+                eval(['femmodel=' adjointcore '(femmodel);']);
 
                 displaystring(verbose,'\n%s',['      computing gradJ...']);

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

@@ -24 +24 @@
         control_type=femmodel.parameters.ControlType;
         control_steady=femmodel.parameters.ControlSteady;
-
-        displaystring(verbose,'\n%s',['      compute adjoint state...']);
-        femmodel=adjoint_core(femmodel);
 
         displaystring(verbose,'\n%s',['      compute gradient...']);