Changeset 18593

Timestamp:

10/08/14 09:26:16 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added SmoothAnalysis, which replaces SmoothedSurfaceXAnalysis and can be applied to any field

Location:

issm/trunk-jpl

Files:

• src/c/Makefile.am (modified) (1 diff)
• src/c/analyses/BalancevelocityAnalysis.cpp (modified) (2 diffs)
• src/c/analyses/EnumToAnalysis.cpp (modified) (1 diff)
• src/c/analyses/L2ProjectionBaseAnalysis.cpp (modified) (1 diff)
• src/c/analyses/SmoothAnalysis.cpp (added)
• src/c/analyses/SmoothAnalysis.h (added)
• src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (deleted)
• src/c/analyses/SmoothedSurfaceSlopeXAnalysis.h (deleted)
• src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (deleted)
• src/c/analyses/SmoothedSurfaceSlopeYAnalysis.h (deleted)
• src/c/analyses/analyses.h (modified) (1 diff)
• src/c/classes/FemModel.cpp (modified) (1 diff)
• src/c/cores/balancevelocity_core.cpp (modified) (2 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (3 diffs)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (3 diffs)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (5 diffs)
• src/m/classes/inversionvalidation.m (modified) (5 diffs)
• src/m/enum/DrivingStressXEnum.m (added)
• src/m/enum/DrivingStressYEnum.m (added)
• src/m/enum/EnumDefinitions.py (modified) (3 diffs)
• src/m/enum/InputToSmoothEnum.m (added)
• src/m/enum/SmoothAnalysisEnum.m (added)
• test/NightlyRun/test530.m (modified) (1 diff)
• test/NightlyRun/test530.py (modified) (1 diff)
• test/NightlyRun/test531.m (modified) (1 diff)
• test/NightlyRun/test531.py (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -657 +657 @@
 issm_sources += ./analyses/ThermalAnalysis.cpp
 endif
-if SMOOTHEDSURFACESLOPEX
-issm_sources += ./analyses/SmoothedSurfaceSlopeXAnalysis.cpp
-endif
-if SMOOTHEDSURFACESLOPEY
-issm_sources += ./analyses/SmoothedSurfaceSlopeYAnalysis.cpp
+if SMOOTH
+issm_sources += ./analyses/SmoothAnalysis.cpp
 endif
 if MESHDEFORMATION

issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp

@@ -95 +95 @@
 
         /*Get vector N for all nodes and build HNx and HNy*/
-        element->GetInputListOnNodes(Nx,SurfaceSlopeXEnum);
-        element->GetInputListOnNodes(Ny,SurfaceSlopeYEnum);
+        element->GetInputListOnNodes(Nx,DrivingStressXEnum);
+        element->GetInputListOnNodes(Ny,DrivingStressYEnum);
         element->GetInputListOnNodes(H,ThicknessEnum);
         for(int i=0;i<numnodes;i++){
@@ -190 +190 @@
 
         /*Get vector N for all nodes*/
-        basalelement->GetInputListOnNodes(Nx,SurfaceSlopeXEnum);
-        basalelement->GetInputListOnNodes(Ny,SurfaceSlopeYEnum);
+        basalelement->GetInputListOnNodes(Nx,DrivingStressXEnum);
+        basalelement->GetInputListOnNodes(Ny,DrivingStressYEnum);
         basalelement->GetInputListOnNodes(H,ThicknessEnum);
         for(int i=0;i<numnodes;i++){

issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp

@@ -86 +86 @@
                 case DepthAverageAnalysisEnum : return new DepthAverageAnalysis();
                 #endif
-                #ifdef _HAVE_SMOOTHEDSURFACESLOPEX_
-                case SmoothedSurfaceSlopeXAnalysisEnum : return new SmoothedSurfaceSlopeXAnalysis();
-                #endif
-                #ifdef _HAVE_SMOOTHEDSURFACESLOPEY_
-                case SmoothedSurfaceSlopeYAnalysisEnum : return new SmoothedSurfaceSlopeYAnalysis();
+                #ifdef _HAVE_SMOOTH_
+                case SmoothAnalysisEnum : return new SmoothAnalysis();
                 #endif
                 #ifdef _HAVE_THERMAL_

issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

@@ -93 +93 @@
 
         /*Initialize Element vector*/
-        ElementMatrix* Ke    = basalelement->NewElementMatrix(NoneApproximationEnum);
+        ElementMatrix* Ke    = basalelement->NewElementMatrix();
         IssmDouble*    basis = xNew<IssmDouble>(numnodes);
 

issm/trunk-jpl/src/c/analyses/analyses.h

@@ -32 +32 @@
 #include "./MeltingAnalysis.h"
 #include "./MeshdeformationAnalysis.h"
-#include "./SmoothedSurfaceSlopeXAnalysis.h"
-#include "./SmoothedSurfaceSlopeYAnalysis.h"
+#include "./SmoothAnalysis.h"
 #include "./SeaiceAnalysis.h"
 #include "./StressbalanceAnalysis.h"

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -475 +475 @@
                 case BalancevelocitySolutionEnum:
                         analyses_temp[numanalyses++]=BalancevelocityAnalysisEnum;
-                        analyses_temp[numanalyses++]=SmoothedSurfaceSlopeXAnalysisEnum;
-                        analyses_temp[numanalyses++]=SmoothedSurfaceSlopeYAnalysisEnum;
+                        analyses_temp[numanalyses++]=SmoothAnalysisEnum;
                         break;
 

issm/trunk-jpl/src/c/cores/balancevelocity_core.cpp

@@ -19 +19 @@
 
         if(VerboseSolution()) _printf0_("computing smoothed slopes:\n");
-        femmodel->SetCurrentConfiguration(SmoothedSurfaceSlopeXAnalysisEnum);
+        femmodel->SetCurrentConfiguration(SmoothAnalysisEnum);
+        femmodel->parameters->SetParam(DrivingStressXEnum,InputToSmoothEnum);
         solutionsequence_linear(femmodel);
-        femmodel->SetCurrentConfiguration(SmoothedSurfaceSlopeYAnalysisEnum);
+        femmodel->parameters->SetParam(DrivingStressYEnum,InputToSmoothEnum);
         solutionsequence_linear(femmodel);
-        //surfaceslope_core(femmodel);
 
         if(VerboseSolution()) _printf0_("call computational core:\n");
@@ -31 +31 @@
         if(save_results){
                 if(VerboseSolution()) _printf0_("   saving results\n");
-                int outputs[3] = {SurfaceSlopeXEnum,SurfaceSlopeYEnum,VelEnum};
+                int outputs[3] = {DrivingStressXEnum,DrivingStressYEnum,VelEnum};
                 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3);
         }

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -388 +388 @@
         SteadystateSolutionEnum,
         SurfaceSlopeSolutionEnum,
-        SmoothedSurfaceSlopeXAnalysisEnum,
-        SmoothedSurfaceSlopeYAnalysisEnum,
+        SmoothAnalysisEnum,
         ThermalAnalysisEnum,
         ThermalSolutionEnum,
@@ -450 +449 @@
         InputToL2ProjectEnum,
         InputToDepthaverageEnum,
+        InputToSmoothEnum,
         IntParamEnum,
         IntVecParamEnum,
@@ -563 +563 @@
         HydrologyWaterVxEnum,
         HydrologyWaterVyEnum,
+        DrivingStressXEnum,
+        DrivingStressYEnum,
         SigmaNNEnum,
         StressTensorEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -391 +391 @@
                 case SteadystateSolutionEnum : return "SteadystateSolution";
                 case SurfaceSlopeSolutionEnum : return "SurfaceSlopeSolution";
-                case SmoothedSurfaceSlopeXAnalysisEnum : return "SmoothedSurfaceSlopeXAnalysis";
-                case SmoothedSurfaceSlopeYAnalysisEnum : return "SmoothedSurfaceSlopeYAnalysis";
+                case SmoothAnalysisEnum : return "SmoothAnalysis";
                 case ThermalAnalysisEnum : return "ThermalAnalysis";
                 case ThermalSolutionEnum : return "ThermalSolution";
@@ -447 +446 @@
                 case InputToL2ProjectEnum : return "InputToL2Project";
                 case InputToDepthaverageEnum : return "InputToDepthaverage";
+                case InputToSmoothEnum : return "InputToSmooth";
                 case IntParamEnum : return "IntParam";
                 case IntVecParamEnum : return "IntVecParam";
@@ -554 +554 @@
                 case HydrologyWaterVxEnum : return "HydrologyWaterVx";
                 case HydrologyWaterVyEnum : return "HydrologyWaterVy";
+                case DrivingStressXEnum : return "DrivingStressX";
+                case DrivingStressYEnum : return "DrivingStressY";
                 case SigmaNNEnum : return "SigmaNN";
                 case StressTensorEnum : return "StressTensor";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -400 +400 @@
               else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
               else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
-              else if (strcmp(name,"SmoothedSurfaceSlopeXAnalysis")==0) return SmoothedSurfaceSlopeXAnalysisEnum;
-              else if (strcmp(name,"SmoothedSurfaceSlopeYAnalysis")==0) return SmoothedSurfaceSlopeYAnalysisEnum;
+              else if (strcmp(name,"SmoothAnalysis")==0) return SmoothAnalysisEnum;
               else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
               else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
@@ -456 +455 @@
               else if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum;
               else if (strcmp(name,"InputToDepthaverage")==0) return InputToDepthaverageEnum;
+              else if (strcmp(name,"InputToSmooth")==0) return InputToSmoothEnum;
               else if (strcmp(name,"IntParam")==0) return IntParamEnum;
               else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
@@ -566 +566 @@
               else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum;
               else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
+              else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum;
+              else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
               else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum;
               else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
@@ -627 +629 @@
               else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
               else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
-              else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
-              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
+              if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum;
+              else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
+              else if (strcmp(name,"MassfluxatgateName")==0) return MassfluxatgateNameEnum;
               else if (strcmp(name,"MassfluxatgateSegments")==0) return MassfluxatgateSegmentsEnum;
               else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
@@ -750 +752 @@
               else if (strcmp(name,"SurfaceforcingsRhoAir")==0) return SurfaceforcingsRhoAirEnum;
               else if (strcmp(name,"SurfaceforcingsAirCoef")==0) return SurfaceforcingsAirCoefEnum;
-              else if (strcmp(name,"SurfaceforcingsAirLinDragCoef")==0) return SurfaceforcingsAirLinDragCoefEnum;
-              else if (strcmp(name,"SurfaceforcingsAirQuadDragCoef")==0) return SurfaceforcingsAirQuadDragCoefEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"SurfaceforcingsWindVx")==0) return SurfaceforcingsWindVxEnum;
+              if (strcmp(name,"SurfaceforcingsAirLinDragCoef")==0) return SurfaceforcingsAirLinDragCoefEnum;
+              else if (strcmp(name,"SurfaceforcingsAirQuadDragCoef")==0) return SurfaceforcingsAirQuadDragCoefEnum;
+              else if (strcmp(name,"SurfaceforcingsWindVx")==0) return SurfaceforcingsWindVxEnum;
               else if (strcmp(name,"SurfaceforcingsWindVy")==0) return SurfaceforcingsWindVyEnum;
               else if (strcmp(name,"Matseaice")==0) return MatseaiceEnum;

issm/trunk-jpl/src/m/classes/inversionvalidation.m

@@ -18 +18 @@
                 vel_obs                     = NaN
                 thickness_obs               = NaN
+                surface_obs               = NaN
         end
         methods
@@ -54 +55 @@
                         md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',...
                                 {'BalancethicknessThickeningRate' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'DamageDbar' 'Vx' 'Vy' 'Thickness',...
-                                'BalancethicknessNu' 'BalancethicknessApparentMassbalance'});
+                                'BalancethicknessOmega' 'BalancethicknessApparentMassbalance'});
                         md = checkfield(md,'fieldname','inversion.cost_functions','size',[1 num_costfunc],'values',[101:105 201 501:506 601:604]);
                         md = checkfield(md,'fieldname','inversion.cost_functions_coefficients','size',[md.mesh.numberofvertices num_costfunc],'>=',0);
@@ -84 +85 @@
                         fielddisplay(obj,'vel_obs','observed velocity magnitude [m/yr]');
                         fielddisplay(obj,'thickness_obs','observed thickness [m]');
+                        fielddisplay(obj,'surface_obs','observed surface elevation [m]');
                         disp('Available cost functions:');
                         disp('   101: SurfaceAbsVelMisfit');
@@ -115 +117 @@
                         end
                         WriteData(fid,'object',obj,'class','inversion','fieldname','thickness_obs','format','DoubleMat','mattype',mattype);
+                        WriteData(fid,'object',obj,'class','inversion','fieldname','surface_obs','format','DoubleMat','mattype',mattype);
 
                         %process control parameters
@@ -140 +143 @@
                         pos=find(obj.cost_functions==505); data(pos)=ThicknessAcrossGradientEnum();
                         pos=find(obj.cost_functions==506); data(pos)=BalancethicknessMisfitEnum();
+                        pos=find(obj.cost_functions==601); data(pos)=SurfaceAbsMisfitEnum();
                         WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum(),'format','DoubleMat','mattype',3);
                         WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer');

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -383 +383 @@
 def SteadystateSolutionEnum(): return StringToEnum("SteadystateSolution")[0]
 def SurfaceSlopeSolutionEnum(): return StringToEnum("SurfaceSlopeSolution")[0]
-def SmoothedSurfaceSlopeXAnalysisEnum(): return StringToEnum("SmoothedSurfaceSlopeXAnalysis")[0]
-def SmoothedSurfaceSlopeYAnalysisEnum(): return StringToEnum("SmoothedSurfaceSlopeYAnalysis")[0]
+def SmoothAnalysisEnum(): return StringToEnum("SmoothAnalysis")[0]
 def ThermalAnalysisEnum(): return StringToEnum("ThermalAnalysis")[0]
 def ThermalSolutionEnum(): return StringToEnum("ThermalSolution")[0]
@@ -439 +438 @@
 def InputToL2ProjectEnum(): return StringToEnum("InputToL2Project")[0]
 def InputToDepthaverageEnum(): return StringToEnum("InputToDepthaverage")[0]
+def InputToSmoothEnum(): return StringToEnum("InputToSmooth")[0]
 def IntParamEnum(): return StringToEnum("IntParam")[0]
 def IntVecParamEnum(): return StringToEnum("IntVecParam")[0]
@@ -546 +546 @@
 def HydrologyWaterVxEnum(): return StringToEnum("HydrologyWaterVx")[0]
 def HydrologyWaterVyEnum(): return StringToEnum("HydrologyWaterVy")[0]
+def DrivingStressXEnum(): return StringToEnum("DrivingStressX")[0]
+def DrivingStressYEnum(): return StringToEnum("DrivingStressY")[0]
 def SigmaNNEnum(): return StringToEnum("SigmaNN")[0]
 def StressTensorEnum(): return StringToEnum("StressTensor")[0]

issm/trunk-jpl/test/NightlyRun/test530.m

@@ -7 +7 @@
 
 %Fields and tolerances to track changes
-field_names     ={'SurfaceSlopeX','SurfaceSlopeX','Vel'};
+field_names     ={'DrivingStressX','DrivingStressX','Vel'};
 field_tolerances={1e-13,1e-13,1e-13};
 field_values={...
-        (md.results.BalancevelocitySolution.SurfaceSlopeX),...
-        (md.results.BalancevelocitySolution.SurfaceSlopeY),...
+        (md.results.BalancevelocitySolution.DrivingStressX),...
+        (md.results.BalancevelocitySolution.DrivingStressY),...
         (md.results.BalancevelocitySolution.Vel),...
         };

issm/trunk-jpl/test/NightlyRun/test530.py

@@ -16 +16 @@
 
 # Fields and tolerances to track changes
-field_names     =['SurfaceSlopeX','SurfaceSlopeY','Vel']
+field_names     =['DrivingStressX','DrivingStressY','Vel']
 field_tolerances=[1e-13,1e-13,1e-13]
 field_values=[\
-                md.results.BalancevelocitySolution.SurfaceSlopeX,\
-                md.results.BalancevelocitySolution.SurfaceSlopeY,\
+                md.results.BalancevelocitySolution.DrivingStressX,\
+                md.results.BalancevelocitySolution.DrivingStressY,\
                 md.results.BalancevelocitySolution.Vel,\
                 ]

issm/trunk-jpl/test/NightlyRun/test531.m

@@ -9 +9 @@
 
 %Fields and tolerances to track changes
-field_names     ={'SurfaceSlopeX','SurfaceSlopeX','Vel'};
+field_names     ={'DrivingStressX','DrivingStressX','Vel'};
 field_tolerances={1e-13,1e-13,1e-13};
 field_values={...
-        (md.results.BalancevelocitySolution.SurfaceSlopeX),...
-        (md.results.BalancevelocitySolution.SurfaceSlopeY),...
+        (md.results.BalancevelocitySolution.DrivingStressX),...
+        (md.results.BalancevelocitySolution.DrivingStressY),...
         (md.results.BalancevelocitySolution.Vel),...
         };

issm/trunk-jpl/test/NightlyRun/test531.py

@@ -18 +18 @@
 
 # Fields and tolerances to track changes
-field_names     =['SurfaceSlopeX','SurfaceSlopeY','Vel']
+field_names     =['DrivingStressX','DrivingStressY','Vel']
 field_tolerances=[1e-13,1e-13,1e-13]
 field_values=[\
-                md.results.BalancevelocitySolution.SurfaceSlopeX,\
-                md.results.BalancevelocitySolution.SurfaceSlopeY,\
+                md.results.BalancevelocitySolution.DrivingStressX,\
+                md.results.BalancevelocitySolution.DrivingStressY,\
                 md.results.BalancevelocitySolution.Vel,\
                 ]