Changeset 21431

Timestamp:

12/05/16 03:51:12 (8 years ago)

Author:

bdef

Message:

BUG: syntax fix

Location:

issm/trunk-jpl/src/c/analyses

Files:

• HydrologyDCEfficientAnalysis.cpp (modified) (9 diffs)
• HydrologyDCInefficientAnalysis.cpp (modified) (2 diffs)

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

@@ -405 +405 @@
         bool     active_element;
         int      domaintype;
-        Element* basalelement;
+        Element* basalelement=NULL;
 
         /*Get basal element*/
@@ -414 +414 @@
                         break;
                 case Domain3DEnum:
-                        if(!element->IsOnBase()) return NULL;
+                        if(!element->IsOnBase()) return;
                         basalelement = element->SpawnBasalElement();
                         break;
@@ -437 +437 @@
 
         /*Use the dof list to index into the solution vector: */
-        for(i=0;i<numnodes;i++){
+        for(int i=0;i<numnodes;i++){
                 eplHeads[i]=solution[doflist[i]];
                 if(xIsNan<IssmDouble>(eplHeads[i])) _error_("NaN found in solution vector");
@@ -653 +653 @@
 
         bool        active_element;
-        int         i,j;
         int         domaintype;
         IssmDouble  h_max;
         IssmDouble  sedheadmin;
-        Element*    basalelement;
+        Element*    basalelement=NULL;
 
         /*Get basal element*/
@@ -666 +665 @@
                         break;
                 case Domain3DEnum:
-                        if(!element->IsOnBase()) return NULL;
+                        if(!element->IsOnBase()) return;
                         basalelement = element->SpawnBasalElement();
                         break;
@@ -693 +692 @@
         /*Get minimum sediment head of the element*/
         sedheadmin=sedhead[0];
-        for(i=1;i<numnodes;i++) if(sedhead[i]<=sedheadmin)sedheadmin=sedhead[i];
-        for(i=0;i<numnodes;i++){
+        for(int i=1;i<numnodes;i++) if(sedhead[i]<=sedheadmin)sedheadmin=sedhead[i];
+        for(int i=0;i<numnodes;i++){
                 /*If node is now closed bring its thickness back to initial*/
                 if (old_active[i]==0.){
@@ -718 +717 @@
                 GetHydrologyDCInefficientHmax(&h_max,basalelement,basalelement->nodes[i]);
                 if(eplhead[i]>=h_max && active_element){
-                        for(j=0;j<numnodes;j++){
+                        for(int j=0;j<numnodes;j++){
                                 /*Increase of the domain is on the downstream node in term of sediment head*/
                                 if(sedhead[j] == sedheadmin){
@@ -743 +742 @@
         /*Constants*/
         int      domaintype;
-        Element*   basalelement;
+        Element*   basalelement=NULL;
 
         /*Get basal element*/
@@ -752 +751 @@
                         break;
                 case Domain3DEnum:
-                        if(!element->IsOnBase()) return NULL;
+                        if(!element->IsOnBase()) return;
                         basalelement = element->SpawnBasalElement();
                         break;

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

@@ -425 +425 @@
         /*Intermediaries*/
         int                                             domaintype;
-        Element*                        basalelement;
+        Element*                        basalelement=NULL;
         bool                                    converged;
         int*                                    doflist =       NULL;
@@ -436 +436 @@
                         break;
                 case Domain3DEnum:
-                        if(!element->IsOnBase()) return NULL;
+                        if(!element->IsOnBase()) return;
                         basalelement = element->SpawnBasalElement();
                         break;