Changeset 9291

Timestamp:

08/11/11 13:48:07 (14 years ago)

Author:

Mathieu Morlighem

Message:

Put back Jesse's Params

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/Makefile.am (modified) (4 diffs)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• c/objects/Elements/Tria.cpp (modified) (1 diff)
• c/objects/IoModel.cpp (modified) (1 diff)
• c/objects/IoModel.h (modified) (1 diff)
• c/objects/Materials/Matpar.cpp (modified) (2 diffs)
• c/objects/Materials/Matpar.h (modified) (1 diff)
• c/objects/objects.h (modified) (1 diff)
• c/solutions/hydrology_core_step.cpp (modified) (1 diff)
• c/toolkits/petsc/patches/SolverEnum.h (moved) (moved from issm/trunk/src/c/objects/SolverEnum.h )
• c/toolkits/petsc/patches/petscpatches.h (modified) (2 diffs)
• m/classes/model.m (modified) (2 diffs)
• m/enum/WaterColumnPicardEnum.m (deleted)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h ¶

@@ -307 +307 @@
         Fake8Enum,
         WaterColumnOldEnum,
-        WaterColumnPicardEnum,
+        Fake34Enum,
         /*}}}*/
         /*Io{{{1*/

issm/trunk/src/c/Makefile.am ¶

@@ -151 +151 @@
                                         ./objects/OptArgs.h\
                                         ./objects/OptPars.h\
-                                        ./objects/SolverEnum.h\
                                         ./objects/Contour.h\
                                         ./objects/Contour.cpp\
@@ -369 +368 @@
                                         ./toolkits/petsc\
                                         ./toolkits/petsc/patches\
+                                        ./toolkits/petsc/patches/SolverEnum.h\
                                         ./toolkits/petsc/patches/petscpatches.h\
                                         ./toolkits/petsc/patches/MatlabMatrixToPetscMatrix.cpp\
@@ -845 +845 @@
                                         ./objects/Material.h\
                                         ./objects/Load.h\
-                                        ./objects/SolverEnum.h\
                                         ./objects/Contour.h\
                                         ./objects/Contour.cpp\
@@ -1063 +1062 @@
                                         ./toolkits/petsc\
                                         ./toolkits/petsc/patches\
+                                        ./toolkits/petsc/patches/SolverEnum.h\
                                         ./toolkits/petsc/patches/petscpatches.h\
                                         ./toolkits/petsc/patches/MatlabMatrixToPetscMatrix.cpp\

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp ¶

@@ -271 +271 @@
                 case Fake8Enum : return "Fake8";
                 case WaterColumnOldEnum : return "WaterColumnOld";
-                case WaterColumnPicardEnum : return "WaterColumnPicard";
+                case Fake34Enum : return "Fake34";
                 case IoGatherEnum : return "IoGather";
                 case MinVelEnum : return "MinVel";

issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp ¶

@@ -52 +52 @@
 
         elements->InputDuplicate(WatercolumnEnum,WaterColumnOldEnum);
-        elements->InputDuplicate(WatercolumnEnum,WaterColumnPicardEnum);
-        
         /*Free data: */
         xfree((void**)&iomodel->elements);

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp ¶

@@ -269 +269 @@
         else if (strcmp(name,"Fake8")==0) return Fake8Enum;
         else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
-        else if (strcmp(name,"WaterColumnPicard")==0) return WaterColumnPicardEnum;
+        else if (strcmp(name,"Fake34")==0) return Fake34Enum;
         else if (strcmp(name,"IoGather")==0) return IoGatherEnum;
         else if (strcmp(name,"MinVel")==0) return MinVelEnum;

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

@@ -3703 +3703 @@
         }
 
-        /*Now, we have to move the previous WaterColumn input  to Picard
-         * status, otherwise, we'll wipe them off: */
-        this->inputs->ChangeEnum(WatercolumnEnum,WaterColumnPicardEnum);
-
         /*Add input to the element: */
         this->inputs->AddInput(new TriaVertexInput(WatercolumnEnum,values));

issm/trunk/src/c/objects/IoModel.cpp ¶

@@ -224 +224 @@
         IoModelFetchData(&this->rheology_law,iomodel_handle,RheologyLawEnum);
 
+        /*!Get hydrology parameters: */          
+        IoModelFetchData(&this->hydro_kn,iomodel_handle,HydroKnEnum);                    
+        IoModelFetchData(&this->hydro_p,iomodel_handle,HydroPEnum);              
+        IoModelFetchData(&this->hydro_q,iomodel_handle,HydroQEnum);              
+        IoModelFetchData(&this->hydro_CR,iomodel_handle,HydroCREnum);            
+        IoModelFetchData(&this->hydro_n,iomodel_handle,HydroNEnum); 
+
         /*qmu: */
         if(this->qmu_analysis){

issm/trunk/src/c/objects/IoModel.h ¶

@@ -215 +215 @@
                 int     loadcounter; //keep track of how many loads are being created in each analysis type
                 int     constraintcounter; //keep track of how many constraints are being created in each analysis type
+
+                /*hydrology parameters: */               
+                double hydro_kn;                 
+                double hydro_p;          
+                double hydro_q;          
+                double hydro_CR;                         
+                double hydro_n; 
                  /*}}}*/
                 /*Methods: {{{1*/

issm/trunk/src/c/objects/Materials/Matpar.cpp ¶

@@ -37 +37 @@
         this->thermal_exchange_velocity = iomodel->thermal_exchange_velocity;
         this->g                         = iomodel->g;
+
+        this->kn                        = iomodel->hydro_kn;                     
+        this->hydro_p                   = iomodel->hydro_p;              
+        this->hydro_q                   = iomodel->hydro_q;              
+        this->hydro_CR                  = iomodel->hydro_CR;                     
+        this->hydro_n                   = iomodel->hydro_n; 
 }
 /*}}}1*/
@@ -351 +357 @@
 }
 /*}}}1*/
+/*FUNCTION Matpar::GetKn {{{1*/          
+double Matpar::GetKn(){                  
+        return kn;               
+}                
+/*}}}1*/                         
+/*FUNCTION Matpar::GetHydroP {{{1*/                      
+double Matpar::GetHydroP(){              
+        return hydro_p;                  
+}                
+/*}}}1*/                         
+/*FUNCTION Matqar::GetHydroQ {{{1*/                      
+double Matpar::GetHydroQ(){              
+        return hydro_q;                  
+}                
+/*}}}1*/                         
+/*FUNCTION Matpar::GetHydroCR {{{1*/             
+double Matpar::GetHydroCR(){             
+        return hydro_CR;                 
+}                
+/*}}}1*/                         
+/*FUNCTION Matpar::GetHydroN {{{1*/                      
+double Matpar::GetHydroN(){              
+        return hydro_n;                  
+}                
+/*}}}1*/ 
 /*FUNCTION Matpar::TMeltingPoint {{{1*/
 double Matpar::TMeltingPoint(double pressure){

issm/trunk/src/c/objects/Materials/Matpar.h ¶

@@ -27 +27 @@
                 double  thermal_exchange_velocity;
                 double  g;
+
+                /*hydrology: */          
+                double  kn;                      
+                double  hydro_p;                 
+                double  hydro_q;                 
+                double  hydro_CR;                        
+                double  hydro_n; 
 
         public:

issm/trunk/src/c/objects/objects.h ¶

@@ -136 +136 @@
 /*C objects: */
 #include "./Contour.h"
-#include "./SolverEnum.h"
 #include "./FemModel.h"
 #include "./OptArgs.h"

issm/trunk/src/c/solutions/hydrology_core_step.cpp ¶

@@ -19 +19 @@
         femmodel->SetCurrentConfiguration(HydrologyAnalysisEnum);
         solver_nonlinear(femmodel,modify_loads);
-        //solver_linear(femmodel);
 
         /*transfer water column thickness to old water column thickness: */

issm/trunk/src/c/toolkits/petsc/patches/petscpatches.h ¶

@@ -11 +11 @@
 #include "petscsys.h"
 
+#include "./SolverEnum.h"
+
 class Parameters;
-
 
 #ifdef _SERIAL_
@@ -49 +50 @@
 Vec  SerialToVec(double* vector,int vector_size);
 
-
 #endif

issm/trunk/src/m/classes/model.m ¶

@@ -269 +269 @@
                  pressure                            = {NaN,true,'DoubleMat',1};
                  watercolumn                         = {NaN,true,'DoubleMat',1};
+
+                 %Hydrology
+                 hydro_n                             = {0,true,'Double'}; 
+                 hydro_CR                            = {0,true,'Double'};
+                 hydro_p                             = {0,true,'Double'};
+                 hydro_q                             = {0,true,'Double'};
+                 hydro_kn                            = {0,true,'Double'};
                  
                  %Parallelisation
@@ -842 +849 @@
                          md.alloc_cleanup=1;
 
+                         %hydrology:  from Johnson's 2002 thesis, section 3.5.4                  
+                         md.hydro_n=.02;                         
+                         md.hydro_CR=2;          
+                         md.hydro_p=2;           
+                         md.hydro_q=1;           
+                         md.hydro_kn=0;
+
                          %set petsc options for different analysis
                          md.petscoptions=petscoptions;