Changeset 17895

Timestamp:

04/30/14 14:18:08 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: preparing m1qn3 inversion

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (3 diffs)
• src/c/cores/WrapperCorePointerFromSolutionEnum.cpp (modified) (3 diffs)
• src/c/cores/controlm1qn3_core.cpp (added)
• src/c/cores/cores.h (modified) (1 diff)
• src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (5 diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• src/m/classes/inversion.m (modified) (4 diffs)
• src/m/classes/inversion.py (modified) (3 diffs)
• src/m/classes/m1qn3inversion.m (added)
• src/m/classes/taoinversion.m (modified) (1 diff)
• src/m/contrib/dassflow/importgmsh.m (modified) (2 diffs)
• src/m/enum/EnumDefinitions.py (modified) (1 diff)
• src/m/enum/InversionTaoEnum.m (deleted)
• src/m/enum/InversionTypeEnum.m (added)

issm/trunk-jpl/m4/issm_options.m4

@@ -940 +940 @@
         fi
         dnl }}}
+        dnl m1qn3{{{
+        AC_ARG_WITH([m1qn3-dir],
+                AS_HELP_STRING([--with-m1qn3-dir=DIR], [m1qn3 root directory.]),
+                [M1QN3_ROOT=$withval],[M1QN3_ROOT="no"]) 
+
+        dnl Check whether m1qn3 is enabled
+        AC_MSG_CHECKING([for m1qn3])
+        if test "x$M1QN3_ROOT" = "xno" ; then
+                HAVE_M1QN3=no
+        else
+                HAVE_M1QN3=yes
+                if ! test -d "$M1QN3_ROOT"; then
+                        AC_MSG_ERROR([m1qn3 directory provided ($M1QN3_ROOT) does not exist]);
+                fi
+        fi
+        AC_MSG_RESULT($HAVE_M1QN3)
+        
+        dnl m1qn3 headers and libraries
+        if test "x$HAVE_M1QN3" == "xyes"; then
+          M1QN3LIB="$M1QN3_ROOT/libm1qn3.a $M1QN3_ROOT//libddot.a"
+          AC_DEFINE([_HAVE_M1QN3_],[1],[with M1QN3I in ISSM src])
+          AC_SUBST([M1QN3LIB])
+        fi
+        dnl }}}
         dnl slepc{{{
         AC_ARG_WITH([slepc-dir],

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

@@ -423 +423 @@
                                         ./cores/control_core.cpp\
                                         ./cores/controltao_core.cpp\
+                                        ./cores/controlm1qn3_core.cpp\
                                         ./cores/objectivefunction.cpp\
                                         ./cores/gradient_core.cpp\
@@ -874 +875 @@
 
 libISSMCore_la_SOURCES  = $(issm_sources)
-libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)   $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) 
+libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)   $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB) 
 libISSMCore_la_FFLAGS = $(AM_FFLAGS)
 endif
@@ -921 +922 @@
 
 #External packages
-LDADD += $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB)  $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
+LDADD += $(PETSCLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB)  $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
 
 if FORTRAN

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

@@ -21 +21 @@
 
         /*parameters: */
-        bool control_analysis=false;
-        bool tao_analysis=false;
-        bool dakota_analysis=false;
+        bool control_analysis;
+        bool dakota_analysis;
+        int  inversiontype;
 
         /* retrieve some parameters that tell us whether wrappers are allowed, or whether we return 
@@ -30 +30 @@
         parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         parameters->FindParam(&control_analysis,InversionIscontrolEnum);
-        parameters->FindParam(&tao_analysis,InversionTaoEnum);
+        parameters->FindParam(&inversiontype,InversionTypeEnum);
 
         if(nodakotacore)dakota_analysis=false;
@@ -42 +42 @@
         }
         else if(control_analysis){
-                if(tao_analysis) solutioncore=controltao_core;
-                else solutioncore=control_core;
+                switch(inversiontype){
+                        case 0: solutioncore=control_core; break;
+                        case 1: solutioncore=controltao_core; break;
+                        case 2: solutioncore=controlm1qn3_core; break;
+                        default: _error_("control type not supported");
+                }
         }
         else CorePointerFromSolutionEnum(&solutioncore,parameters,solutiontype);  /*This means we retrieve a core solution that is not a wrapper*/

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

@@ -29 +29 @@
 void control_core(FemModel* femmodel);
 void controltao_core(FemModel* femmodel);
+void controlm1qn3_core(FemModel* femmodel);
 void masstransport_core(FemModel* femmodel);
 void depthaverage_core(FemModel* femmodel);

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -10 +10 @@
 void CreateParametersControl(Parameters* parameters,IoModel* iomodel,int solution_type){
 
-        bool        control_analysis,tao_analysis;
+        bool        control_analysis;
+        int         inversiontype;
         int         nsteps;
         int         num_control_type;
@@ -22 +23 @@
         /*retrieve some parameters: */
         iomodel->Constant(&control_analysis,InversionIscontrolEnum);
-        iomodel->Constant(&tao_analysis,InversionTaoEnum);
+        iomodel->Constant(&inversiontype,InversionTypeEnum);
 
         if(control_analysis){
@@ -31 +32 @@
                 parameters->AddObject(iomodel->CopyConstantObject(InversionNstepsEnum));
                 parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum));
-                if(!tao_analysis){
+                if(inversiontype==0){
                         parameters->AddObject(iomodel->CopyConstantObject(InversionCostFunctionThresholdEnum));
                 }
@@ -46 +47 @@
                 iomodel->FetchData(&control_type,NULL,&num_control_type,InversionControlParametersEnum);
                 iomodel->FetchData(&cm_responses,NULL,&num_cm_responses,InversionCostFunctionsEnum);
-                if(!tao_analysis){
+                if(inversiontype==0){
                         iomodel->FetchData(&cm_jump,&nsteps,NULL,InversionStepThresholdEnum);
                         iomodel->FetchData(&optscal,NULL,NULL,InversionGradientScalingEnum);
@@ -52 +53 @@
                 }
 
-                if(tao_analysis){
+                if(inversiontype!=0){
                         parameters->AddObject(new IntVecParam(InversionControlParametersEnum,control_type,num_control_type));
                         parameters->AddObject(new IntVecParam(InversionCostFunctionsEnum,cm_responses,num_cm_responses));

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -76 +76 @@
         parameters->AddObject(iomodel->CopyConstantObject(QmuIsdakotaEnum));
         parameters->AddObject(iomodel->CopyConstantObject(InversionIscontrolEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(InversionTaoEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(InversionTypeEnum));
         parameters->AddObject(iomodel->CopyConstantObject(GiaCrossSectionShapeEnum));
 

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

@@ -135 +135 @@
         InversionGradientScalingEnum,
         InversionIscontrolEnum,
-        InversionTaoEnum,
+        InversionTypeEnum,
         InversionIncompleteAdjointEnum,
         InversionMaxParametersEnum,

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

@@ -143 +143 @@
                 case InversionGradientScalingEnum : return "InversionGradientScaling";
                 case InversionIscontrolEnum : return "InversionIscontrol";
-                case InversionTaoEnum : return "InversionTao";
+                case InversionTypeEnum : return "InversionType";
                 case InversionIncompleteAdjointEnum : return "InversionIncompleteAdjoint";
                 case InversionMaxParametersEnum : return "InversionMaxParameters";

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

@@ -146 +146 @@
               else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
               else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
-              else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
+              else if (strcmp(name,"InversionType")==0) return InversionTypeEnum;
               else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
               else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;

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

@@ -7 +7 @@
         properties (SetAccess=public) 
                 iscontrol                   = 0
-                tao                         = 0
                 incomplete_adjoint          = 0
                 control_parameters          = NaN
@@ -80 +79 @@
                                                 obj=inversion();
                                                 obj.iscontrol                   = in.iscontrol;
-                                                obj.tao                         = 1;rsion to inve
                                                 obj.incomplete_adjoint          = in.incomplete_adjoint;
                                                 obj.control_parameters          = in.control_parameters;
@@ -152 +150 @@
 
                         md = checkfield(md,'fieldname','inversion.iscontrol','values',[0 1]);
-                        md = checkfield(md,'fieldname','inversion.tao','values',[0 1]);
                         md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0 1]);
                         md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',...
@@ -214 +211 @@
                         yts=365.0*24.0*3600.0;
 
+                        WriteData(fid,'enum',InversionTypeEnum(),'data',0,'format','Integer');
                         WriteData(fid,'object',obj,'fieldname','iscontrol','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','tao','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','incomplete_adjoint','format','Boolean');
                         if ~obj.iscontrol, return; end

issm/trunk-jpl/src/m/classes/inversion.py

@@ -17 +17 @@
         def __init__(self): # {{{
                 self.iscontrol                   = 0
-                self.tao                         = 0
                 self.incomplete_adjoint          = 0
                 self.control_parameters          = float('NaN')
@@ -117 +116 @@
 
                 md = checkfield(md,'fieldname','inversion.iscontrol','values',[0,1])
-                md = checkfield(md,'fieldname','inversion.tao','values',[0,1])
                 md = checkfield(md,'fieldname','inversion.incomplete_adjoint','values',[0,1])
                 md = checkfield(md,'fieldname','inversion.control_parameters','cell',1,'values',['BalancethicknessThickeningRate','FrictionCoefficient','MaterialsRheologyBbar','DamageDbar','Vx','Vy'])
@@ -146 +144 @@
                 yts=365.0*24.0*3600.0
 
+                WriteData(fid,'enum',InversionTypeEnum(),'data',0,'format','Integer')
                 WriteData(fid,'object',self,'fieldname','iscontrol','format','Boolean')
-                WriteData(fid,'object',self,'fieldname','tao','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','incomplete_adjoint','format','Boolean')
                 if not self.iscontrol:

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

@@ -124 +124 @@
 
                         WriteData(fid,'object',obj,'class','inversion','fieldname','iscontrol','format','Boolean');
-                        WriteData(fid,'enum',InversionTaoEnum(),'data',true,'format','Boolean');
+                        WriteData(fid,'enum',InversionTypeEnum(),'data',1,'format','Integer');
                         if ~obj.iscontrol, return; end
                         WriteData(fid,'object',obj,'class','inversion','fieldname','incomplete_adjoint','format','Boolean');

issm/trunk-jpl/src/m/contrib/dassflow/importgmsh.m

@@ -98 +98 @@
                         end
                 case 15, %point
+                        A=fscanf(fid,'%i',1);
                         continue;
                 otherwise,
@@ -126 +127 @@
 
 %Create model
-if 0, %2d triangles
+if dim==2, %2d triangles
         md=meshconvert(model,index,x,y);
         md.mesh=mesh2dvertical(md.mesh);

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

@@ -135 +135 @@
 def InversionGradientScalingEnum(): return StringToEnum("InversionGradientScaling")[0]
 def InversionIscontrolEnum(): return StringToEnum("InversionIscontrol")[0]
-def InversionTaoEnum(): return StringToEnum("InversionTao")[0]
+def InversionTypeEnum(): return StringToEnum("InversionType")[0]
 def InversionIncompleteAdjointEnum(): return StringToEnum("InversionIncompleteAdjoint")[0]
 def InversionMaxParametersEnum(): return StringToEnum("InversionMaxParameters")[0]