Changeset 3332 for issm/trunk/src/c/objects/Riftfront.cpp

Timestamp:

03/24/10 16:53:27 (15 years ago)

Author:

Mathieu Morlighem

Message:

Do not use throw ErrorException -> ISSMERROR macro
Removed all FUNCT definitions (now useless)

File:

• issm/trunk/src/c/objects/Riftfront.cpp (modified) (26 diffs)

issm/trunk/src/c/objects/Riftfront.cpp

@@ -202 +202 @@
 /*Object functions*/
 /*FUNCTION Riftfront::Configure {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::Configure"
 void  Riftfront::Configure(void* pelementsin,void* pnodesin,void* pmaterialsin){
 
@@ -224 +222 @@
 #define _ZIGZAGCOUNTER_
 
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::Constrain"
 int   Riftfront::Constrain(int* punstable, void* vinputs, int analysis_type){
 
@@ -249 +245 @@
         /*First recover parameter inputs: */
         found=inputs->Recover("velocity",&vxvy_list[0][0],2,dofs,numgrids,(void**)nodes);
-        if(!found)throw ErrorException(__FUNCT__," could not find velocity in inputs!");
+        if(!found)ISSMERROR(" could not find velocity in inputs!");
 
 
@@ -294 +290 @@
 /*}}}1*/
 /*FUNCTION Riftfront::CreateKMatrix {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::CreateKMatrix"
 void  Riftfront::CreateKMatrix(Mat Kgg,void* inputs,int analysis_type,int sub_analysis_type){
         /*do nothing: */
@@ -301 +295 @@
 /*}}}1*/
 /*FUNCTION Riftfront::CreatePVector {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::CreatePVector"
 void  Riftfront::CreatePVector(Vec pg, void* inputs, int analysis_type,int sub_analysis_type){
         /*do nothing: */
@@ -373 +365 @@
 /*}}}1*/
 /*FUNCTION Riftfront::GetDofList {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::GetDofList"
 
 void  Riftfront::GetDofList(int* doflist,int* pnumberofdofspernode){
@@ -402 +392 @@
 /*}}}1*/
 /*FUNCTION Riftfront::IsMaterialStable {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::IsMaterialStable"
 int   Riftfront::IsMaterialStable(void* vinputs, int analysis_type){
 
@@ -413 +401 @@
 
         found=inputs->Recover("converged",&converged);
-        if(!found)throw ErrorException(__FUNCT__," could not find converged flag  in inputs!");
+        if(!found)ISSMERROR(" could not find converged flag  in inputs!");
 
         if(converged){
@@ -426 +414 @@
 /*}}}1*/
 /*FUNCTION Riftfront::MaxPenetration {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::MaxPenetration"
 int   Riftfront::MaxPenetration(double* ppenetration, void* vinputs, int analysis_type){
 
@@ -445 +431 @@
 
         found=inputs->Recover("velocity",&vxvy_list[0][0],2,dofs,numgrids,(void**)nodes);
-        if(!found)throw ErrorException(__FUNCT__," could not find velocity in inputs!");
+        if(!found)ISSMERROR(" could not find velocity in inputs!");
 
         /*Grid 1 faces grid2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */
@@ -468 +454 @@
 /*}}}1*/
 /*FUNCTION Riftfront::OutputProperties {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::OutputProperties"
 void  Riftfront::OutputProperties(Vec riftproperties){
 
@@ -484 +468 @@
 /*}}}1*/
 /*FUNCTION Riftfront::PenaltyCreateKMatrix {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::PenaltyCreateKMatrix"
 void  Riftfront::PenaltyCreateKMatrix(Mat Kgg,void* vinputs,double kmax,int analysis_type,int sub_analysis_type){
 
@@ -519 +501 @@
                 /*Recover input parameters: */
                 inputs->Recover("thickness",&h[0],1,dofs,MAX_RIFTFRONT_GRIDS,(void**)nodes);
-                if (h[0]!=h[1])throw ErrorException(__FUNCT__," different thicknesses not supported for rift fronts");
+                if (h[0]!=h[1])ISSMERROR(" different thicknesses not supported for rift fronts");
                 thickness=h[0];
 
@@ -583 +565 @@
 /*}}}1*/
 /*FUNCTION Riftfront::PenaltyCreatePVector {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::PenaltyCreatePVector"
 void  Riftfront::PenaltyCreatePVector(Vec pg,void* vinputs,double kmax,int analysis_type,int sub_analysis_type){
 
@@ -632 +612 @@
                 /*get thickness: */
                 inputs->Recover("thickness",&h[0],1,dofs,MAX_RIFTFRONT_GRIDS,(void**)nodes);
-                if (h[0]!=h[1])throw ErrorException(__FUNCT__," different thicknesses not supported for rift fronts");
+                if (h[0]!=h[1])ISSMERROR(" different thicknesses not supported for rift fronts");
                 thickness=h[0];
 
                 inputs->Recover("bed",&b[0],1,dofs,MAX_RIFTFRONT_GRIDS,(void**)nodes);
-                if (b[0]!=b[1])throw ErrorException(__FUNCT__," different beds not supported for rift fronts");
+                if (b[0]!=b[1])ISSMERROR(" different beds not supported for rift fronts");
                 bed=b[0];
 
@@ -658 +638 @@
                 else if(fill==MelangeEnum()){ //icefront finding itself against another icefront (pressure imbalance is fully compensated, ice vs ice)
                         
-                        if(!shelf) throw ErrorException(__FUNCT__,exprintf("%s%s%i%s",__FUNCT__," error message: fill type ",fill," not supported on ice sheets yet."));
+                        if(!shelf) ISSMERROR(exprintf("%s%i%s","fill type ",fill," not supported on ice sheets yet."));
 
                         pressure_litho=rho_ice*gravity*pow(thickness,(double)2)/(double)2;
@@ -668 +648 @@
                 }
                 else{
-                        throw ErrorException(__FUNCT__,exprintf("%s%s%i%s",__FUNCT__," error message: fill type ",fill," not supported yet."));
+                        ISSMERROR(exprintf("%s%i%s","fill type ",fill," not supported yet."));
                 }
 
@@ -690 +670 @@
 /*}}}1*/
 /*FUNCTION Riftfront::Penetration {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::Penetration"
 int   Riftfront::Penetration(double* ppenetration, void* vinputs, int analysis_type){
 
@@ -707 +685 @@
 
         found=inputs->Recover("velocity",&vxvy_list[0][0],2,dofs,numgrids,(void**)nodes);
-        if(!found)throw ErrorException(__FUNCT__," could not find velocity in inputs!");
+        if(!found)ISSMERROR(" could not find velocity in inputs!");
 
         /*Grid 1 faces grid2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */
@@ -722 +700 @@
 /*FUNCTION Riftfront::PotentialUnstableC
  * nstraint {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::PotentialUnstableConstraint"
 int   Riftfront::PotentialUnstableConstraint(int* punstable, void* vinputs, int analysis_type){
 
@@ -741 +717 @@
 
         found=inputs->Recover("velocity",&vxvy_list[0][0],2,dofs,numgrids,(void**)nodes);
-        if(!found)throw ErrorException(__FUNCT__," could not find velocity in inputs!");
+        if(!found)ISSMERROR(" could not find velocity in inputs!");
 
         /*Grid 1 faces grid2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */
@@ -764 +740 @@
 /*}}}1*/
 /*FUNCTION Riftfront::PreConstrain {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::PreConstrain"
 int   Riftfront::PreConstrain(int* punstable, void* vinputs, int analysis_type){
 
@@ -780 +754 @@
         /*First recover velocity: */
         found=inputs->Recover("velocity",&vxvy_list[0][0],2,dofs,numgrids,(void**)nodes);
-        if(!found)throw ErrorException(__FUNCT__," could not find velocity in inputs!");
+        if(!found)ISSMERROR(" could not find velocity in inputs!");
         
         /*Grid 1 faces grid2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */
@@ -828 +802 @@
 /*}}}1*/
 /*FUNCTION Riftfront::UpdateFromInputs {{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::UpdateFromInputs"
 void  Riftfront::UpdateFromInputs(void* vinputs){
 
@@ -844 +816 @@
 /*}}}1*/
 /*FUNCTION Riftfront::FreezeConstraints{{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::FreezeConstraints"
 void   Riftfront::FreezeConstraints(void* vinputs, int analysis_type){
 
@@ -854 +824 @@
 /*}}}1*/
 /*FUNCTION Riftfront::IsFrozen{{{1*/
-#undef __FUNCT__ 
-#define __FUNCT__ "Riftfront::IsFrozen"
 bool   Riftfront::IsFrozen(void){