Changeset 25446 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

08/21/20 20:09:49 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing loop on gauss points

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (9 diffs)

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

@@ -990 +990 @@
                 /* Start  looping on the number of gaussian points: */
                 Gauss* gauss=element->NewGauss(2);
-                for(int ig=gauss->begin();ig<gauss->end();ig++){
-
-                        gauss->GaussPoint(ig);
+                while(gauss->next()){
 
                         /* Get Jacobian determinant: */
@@ -2080 +2078 @@
                 /* Start  looping on the number of gaussian points: */
                 Gauss* gauss=element->NewGauss(2);
-                for(int ig=gauss->begin();ig<gauss->end();ig++){
-
-                        gauss->GaussPoint(ig);
+                while(gauss->next()){
 
                         /* Get Jacobian determinant: */
@@ -2138 +2134 @@
                 /* Start  looping on the number of gaussian points: */
                 Gauss* gauss=element->NewGauss(2);
-                for(int ig=gauss->begin();ig<gauss->end();ig++){
-
-                        gauss->GaussPoint(ig);
+                while(gauss->next()){
 
                         /* Get Jacobian determinant: */
@@ -2697 +2691 @@
                  /* Start  looping on the number of gaussian points: */
                  Gauss* gauss=element->NewGauss(2);
-                 for(int ig=gauss->begin();ig<gauss->end();ig++){
-
-                         gauss->GaussPoint(ig);
+                 while(gauss->next()){
 
                          /* Get Jacobian determinant: */
@@ -2752 +2744 @@
                 /* Start  looping on the number of gaussian points: */
                 Gauss* gauss=element->NewGauss(2);
-                for(int ig=gauss->begin();ig<gauss->end();ig++){
-
-                        gauss->GaussPoint(ig);
+                while(gauss->next()){
 
                         /* Get Jacobian determinant: */
@@ -2871 +2861 @@
                 /* Start  looping on the number of gaussian points: */
                 Gauss* gauss=element->NewGauss(2);
-                for(int ig=gauss->begin();ig<gauss->end();ig++){
-
-                        gauss->GaussPoint(ig);
+                while(gauss->next()){
 
                         /* Get Jacobian determinant: */
@@ -4148 +4136 @@
                 Gauss* gauss=element->NewGauss(2);
         error=0.;
-                for(int ig=gauss->begin();ig<gauss->end();ig++){
-        gauss->GaussPoint(ig);
+                while(gauss->next()){
                         element->JacobianDeterminant(&Jdet,xyz_list,gauss);
                         element->NodalFunctions(basis,gauss);
@@ -4212 +4199 @@
       /*Get the gradient of thickness at the center point (in fact, GradH is constante over the element)*/
       Gauss* gauss=element->NewGauss(1);
-      gauss->GaussPoint(gauss->begin());
+      gauss->GaussPoint(0);
       element->ValueP1DerivativesOnGauss(GradH,H,xyz_list,gauss);
 
@@ -4295 +4282 @@
       /*Get the gradient of thickness*/
       Gauss* gaussH=element->NewGauss(1);
-      gaussH->GaussPoint(gaussH->begin());
+      gaussH->GaussPoint(0);
       element->ValueP1DerivativesOnGauss(GradH,H,xyz_list,gaussH);
       /*Integrate*/
       Gauss* gauss=element->NewGauss(2);
       error=0.;
-      for(int ig=gauss->begin();ig<gauss->end();ig++){
-         gauss->GaussPoint(ig);
+                while(gauss->next()){
          element->JacobianDeterminant(&Jdet,xyz_list,gauss);
          element->NodalFunctions(basis,gauss);