Changeset 25437
- Timestamp:
- 08/21/20 08:57:26 (5 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
r25379 r25437 614 614 /* Start looping on the number of gaussian points: */ 615 615 Gauss* gauss=element->NewGauss(4); 616 for(int ig=gauss->begin();ig<gauss->end();ig++){ 617 gauss->GaussPoint(ig); 616 while(gauss->next()){ 618 617 619 618 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 752 751 /* Start looping on the number of gaussian points: */ 753 752 Gauss* gauss=element->NewGaussBase(4); 754 for(int ig=gauss->begin();ig<gauss->end();ig++){ 755 gauss->GaussPoint(ig); 753 while(gauss->next()){ 756 754 757 755 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); … … 836 834 /* Start looping on the number of gaussian points: */ 837 835 Gauss* gauss=element->NewGauss(4); 838 for(int ig=gauss->begin();ig<gauss->end();ig++){ 839 gauss->GaussPoint(ig); 836 while(gauss->next()){ 840 837 841 838 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 964 961 Gauss* gauss=element->NewGaussBase(4); 965 962 Gauss* gaussup=element->NewGaussTop(4); 966 for(int ig=gauss->begin();ig<gauss->end();ig++){ 967 gauss->GaussPoint(ig); 968 gaussup->GaussPoint(ig); 963 while(gauss->next() && gaussup->next()){ 969 964 970 965 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); … … 1051 1046 /* Start looping on the number of gaussian points: */ 1052 1047 Gauss* gauss=element->NewGaussBase(4); 1053 for(int ig=gauss->begin();ig<gauss->end();ig++){ 1054 gauss->GaussPoint(ig); 1048 while(gauss->next()){ 1055 1049 1056 1050 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); -
issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp
r25379 r25437 259 259 /* Start looping on the number of gaussian points: */ 260 260 Gauss* gauss=element->NewGauss(2); 261 for(int ig=gauss->begin();ig<gauss->end();ig++){ 262 gauss->GaussPoint(ig); 261 while(gauss->next()){ 263 262 264 263 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 367 366 /* Start looping on the number of gaussian points: */ 368 367 Gauss* gauss=element->NewGauss(2); 369 for(int ig=gauss->begin();ig<gauss->end();ig++){ 370 gauss->GaussPoint(ig); 368 while(gauss->next()){ 371 369 372 370 element->JacobianDeterminant(&Jdet,xyz_list,gauss); -
issm/trunk-jpl/src/c/analyses/HydrologyShaktiAnalysis.cpp
r25392 r25437 196 196 /* Start looping on the number of gaussian points: */ 197 197 Gauss* gauss=element->NewGauss(1); 198 for(int ig=gauss->begin();ig<gauss->end();ig++){ 199 gauss->GaussPoint(ig); 198 while(gauss->next()){ 200 199 201 200 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 271 270 /* Start looping on the number of gaussian points: */ 272 271 Gauss* gauss=element->NewGauss(2); 273 for(int ig=gauss->begin();ig<gauss->end();ig++){ 274 gauss->GaussPoint(ig); 272 while(gauss->next()){ 275 273 276 274 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 509 507 /* Start looping on the number of gaussian points: */ 510 508 Gauss* gauss=element->NewGauss(2); 511 for(int ig=gauss->begin();ig<gauss->end();ig++){ 512 gauss->GaussPoint(ig); 509 while(gauss->next()){ 513 510 514 511 element->JacobianDeterminant(&Jdet,xyz_list,gauss); -
issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
r25436 r25437 1320 1320 /* Start looping on the number of gaussian points: */ 1321 1321 Gauss* gauss = basalelement->NewGauss(2); 1322 for(int ig=gauss->begin();ig<gauss->end();ig++){ 1323 gauss->GaussPoint(ig); 1322 while(gauss->next()){ 1324 1323 1325 1324 basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 2089 2088 Gauss* gauss = element->NewGauss(5); 2090 2089 Gauss* gauss_base = basalelement->NewGauss(); 2091 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2092 2093 gauss->GaussPoint(ig); 2090 while(gauss->next()){ 2094 2091 gauss->SynchronizeGaussBase(gauss_base); 2095 2092 … … 2175 2172 /* Start looping on the number of gaussian points: */ 2176 2173 Gauss* gauss=element->NewGauss(2); 2177 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2178 2179 gauss->GaussPoint(ig); 2180 2174 while(gauss->next()){ 2181 2175 element->JacobianDeterminant(&Jdet,xyz_list,gauss); 2182 2176 element->NodalFunctions(basis, gauss); … … 2232 2226 /*Start looping on Gaussian points*/ 2233 2227 Gauss* gauss=element->NewGauss(xyz_list,xyz_list_front,3); 2234 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2235 2236 gauss->GaussPoint(ig); 2228 while(gauss->next()){ 2237 2229 thickness_input->GetInputValue(&thickness,gauss); 2238 2230 base_input->GetInputValue(&bed,gauss); … … 2384 2376 /* Start looping on the number of gaussian points: */ 2385 2377 Gauss* gauss = element->NewGauss(5); 2386 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2387 gauss->GaussPoint(ig); 2378 while(gauss->next()){ 2388 2379 2389 2380 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 2482 2473 2483 2474 /* Start looping on the number of gaussian points: */ 2484 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2485 gauss->GaussPoint(ig); 2475 while(gauss->next()){ 2486 2476 2487 2477 friction->GetAlpha2(&alpha2,gauss); … … 2557 2547 /* Start looping on the number of gaussian points: */ 2558 2548 Gauss* gauss = element->NewGauss(5); 2559 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2560 gauss->GaussPoint(ig); 2549 while(gauss->next()){ 2561 2550 2562 2551 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 2629 2618 /* Start looping on the number of gaussian points: */ 2630 2619 Gauss* gauss=element->NewGauss(3); 2631 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2632 gauss->GaussPoint(ig); 2620 while(gauss->next()){ 2633 2621 2634 2622 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 2702 2690 /* Start looping on the number of gaussian points: */ 2703 2691 Gauss* gauss=element->NewGauss(3); 2704 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2705 gauss->GaussPoint(ig); 2692 while(gauss->next()){ 2706 2693 2707 2694 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 2769 2756 2770 2757 /* Start looping on the number of gaussian points: */ 2771 for(int ig=gauss->begin();ig<gauss->end();ig++){ 2772 2773 gauss->GaussPoint(ig); 2758 while(gauss->next()){ 2774 2759 surface_input->GetInputValue(&surface,gauss); 2775 2760 sealevel_input->GetInputValue(&sealevel,gauss); … … 3077 3062 /* Start looping on the number of gaussian points: */ 3078 3063 Gauss* gauss = element->NewGauss(5); 3079 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3080 gauss->GaussPoint(ig); 3064 while(gauss->next()){ 3081 3065 3082 3066 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 3198 3182 /* Start looping on the number of gaussian points: */ 3199 3183 gauss=element->NewGaussBase(3); 3200 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3201 gauss->GaussPoint(ig); 3184 while(gauss->next()){ 3202 3185 3203 3186 base_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); … … 3259 3242 /* Start looping on the number of gaussian points: */ 3260 3243 Gauss* gauss = element->NewGauss(5); 3261 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3262 gauss->GaussPoint(ig); 3244 while(gauss->next()){ 3263 3245 3264 3246 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 3356 3338 /* Start looping on the number of gaussian points: */ 3357 3339 Gauss* gauss = element->NewGauss(5); 3358 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3359 gauss->GaussPoint(ig); 3340 while(gauss->next()){ 3360 3341 3361 3342 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 3410 3391 /* Start looping on the number of gaussian points: */ 3411 3392 Gauss* gauss = element->NewGauss(5); 3412 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3413 gauss->GaussPoint(ig); 3393 while(gauss->next()){ 3414 3394 3415 3395 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 3483 3463 /* Start looping on the number of gaussian points: */ 3484 3464 Gauss* gauss = element->NewGauss(5); 3485 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3486 gauss->GaussPoint(ig); 3465 while(gauss->next()){ 3487 3466 3488 3467 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 3526 3505 delete gauss; 3527 3506 gauss = element->NewGaussBase(5); 3528 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3529 gauss->GaussPoint(ig); 3507 while(gauss->next()){ 3530 3508 3531 3509 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); … … 3608 3586 /* Start looping on the number of gaussian points: */ 3609 3587 Gauss* gauss = element->NewGauss(5); 3610 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3611 gauss->GaussPoint(ig); 3588 while(gauss->next()){ 3612 3589 3613 3590 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 3677 3654 /* Start looping on the number of gaussian points: */ 3678 3655 gauss=element->NewGaussBase(10); 3679 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3680 gauss->GaussPoint(ig); 3656 while(gauss->next()){ 3681 3657 3682 3658 x_coord=element->GetXcoord(xyz_list,gauss); … … 3752 3728 /* Start looping on the number of gaussian points: */ 3753 3729 gauss=element->NewGaussBase(3); 3754 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3755 gauss->GaussPoint(ig); 3730 while(gauss->next()){ 3756 3731 3757 3732 alpha2_input->GetInputValue(&alpha2, gauss); … … 3808 3783 /* Start looping on the number of gaussian points: */ 3809 3784 gauss=element->NewGaussBase(3); 3810 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3811 gauss->GaussPoint(ig); 3785 while(gauss->next()){ 3812 3786 3813 3787 sigmann_input->GetInputValue(&sigmann, gauss); … … 3866 3840 /* Start looping on the number of gaussian points: */ 3867 3841 Gauss* gauss=element->NewGauss(5); 3868 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3869 gauss->GaussPoint(ig); 3842 while(gauss->next()){ 3870 3843 3871 3844 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 3966 3939 3967 3940 /* Start looping on the number of gaussian points: */ 3968 for(int ig=gauss->begin();ig<gauss->end();ig++){ 3969 gauss->GaussPoint(ig); 3941 while(gauss->next()){ 3970 3942 3971 3943 friction->GetAlpha2(&alpha2,gauss); … … 4097 4069 /* Start looping on the number of gaussian points: */ 4098 4070 Gauss* gauss=element->NewGauss(5); 4099 for(int ig=gauss->begin();ig<gauss->end();ig++){ 4100 gauss->GaussPoint(ig); 4071 while(gauss->next()){ 4101 4072 4102 4073 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 4178 4149 4179 4150 /* Start looping on the number of gaussian points: */ 4180 for(int ig=gauss->begin();ig<gauss->end();ig++){ 4181 gauss->GaussPoint(ig); 4151 while(gauss->next()){ 4182 4152 4183 4153 element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss); … … 4241 4211 /* Start looping on the number of gaussian points: */ 4242 4212 Gauss* gauss=element->NewGaussBase(5); 4243 for(int ig=gauss->begin();ig<gauss->end();ig++){ 4244 gauss->GaussPoint(ig); 4213 while(gauss->next()){ 4245 4214 4246 4215 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); … … 4262 4231 IssmDouble dt,mb; 4263 4232 element->FindParam(&dt,TimesteppingTimeStepEnum); 4264 for(int ig=gauss->begin();ig<gauss->end();ig++){ 4265 gauss->GaussPoint(ig); 4233 while(gauss->next()){ 4266 4234 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); 4267 4235 element->NodalFunctionsVelocity(vbasis,gauss); … … 4314 4282 4315 4283 gauss=element->NewGauss(5); 4316 for(int ig=gauss->begin();ig<gauss->end();ig++){ 4317 gauss->GaussPoint(ig); 4284 while(gauss->next()){ 4318 4285 element->JacobianDeterminant(&Jdet,xyz_list,gauss); 4319 4286 … … 4337 4304 delete gauss; 4338 4305 gauss=element->NewGaussBase(5); 4339 for(int ig=gauss->begin();ig<gauss->end();ig++){ 4340 gauss->GaussPoint(ig); 4306 while(gauss->next()){ 4341 4307 4342 4308 element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss); … … 4448 4414 delete gauss; 4449 4415 gauss=element->NewGauss(5); 4450 for(int ig=gauss->begin();ig<gauss->end();ig++){ 4451 gauss->GaussPoint(ig); 4416 while(gauss->next()){ 4452 4417 element->JacobianDeterminant(&Jdet,xyz_list,gauss); 4453 4418 … … 5380 5345 5381 5346 Gauss* gauss=element->NewGauss(5); 5382 for(int ig=gauss->begin();ig<gauss->end();ig++){ 5383 gauss->GaussPoint(ig); 5347 while(gauss->next()){ 5384 5348 element->JacobianDeterminant(&Jdet,xyz_list,gauss); 5385 5349 element->NodalFunctionsTensor(tbasis,gauss); … … 5813 5777 /* Start looping on the number of gaussian points: */ 5814 5778 Gauss* gauss=element->NewGaussBase(2); 5815 for(int ig=gauss->begin();ig<gauss->end();ig++){ 5816 5817 gauss->GaussPoint(ig); 5779 while(gauss->next()){ 5818 5780 5819 5781 element->JacobianDeterminantBase(&Jdet2d,xyz_list_tria,gauss); … … 5932 5894 Gauss* gauss=element->NewGauss(5); 5933 5895 Gauss* gauss_tria=new GaussTria(); 5934 for(int ig=gauss->begin();ig<gauss->end();ig++){ 5935 5936 gauss->GaussPoint(ig); 5896 while(gauss->next()){ 5937 5897 gauss->SynchronizeGaussBase(gauss_tria); 5938 5898 … … 6034 5994 /* Start looping on the number of gaussian points: */ 6035 5995 Gauss* gauss=element->NewGaussBase(2); 6036 for(int ig=gauss->begin();ig<gauss->end();ig++){ 6037 6038 gauss->GaussPoint(ig); 5996 while(gauss->next()){ 6039 5997 6040 5998 /*Friction: */ … … 6118 6076 Gauss* gauss=element->NewGauss(5); 6119 6077 Gauss* gauss_tria=new GaussTria(); 6120 for(int ig=gauss->begin();ig<gauss->end();ig++){ 6121 6122 gauss->GaussPoint(ig); 6078 while(gauss->next()){ 6123 6079 gauss->SynchronizeGaussBase(gauss_tria); 6124 6080 … … 6276 6232 Gauss* gauss=element->NewGauss(5); 6277 6233 Gauss* gauss_tria=new GaussTria(); 6278 for(int ig=gauss->begin();ig<gauss->end();ig++){ 6279 6280 gauss->GaussPoint(ig); 6234 while(gauss->next()){ 6281 6235 gauss->SynchronizeGaussBase(gauss_tria); 6282 6236 … … 6381 6335 /* Start looping on the number of gauss 2d (nodes on the bedrock) */ 6382 6336 Gauss* gauss=element->NewGaussBase(2); 6383 for(int ig=gauss->begin();ig<gauss->end();ig++){ 6384 6385 gauss->GaussPoint(ig); 6337 while(gauss->next()){ 6386 6338 6387 6339 element->JacobianDeterminantBase(&Jdet2d,xyz_list_tria,gauss); … … 6457 6409 /* Start looping on the number of gaussian points: */ 6458 6410 Gauss* gauss=element->NewGauss(5); 6459 for(int ig=gauss->begin();ig<gauss->end();ig++){ 6460 6461 gauss->GaussPoint(ig); 6411 while(gauss->next()){ 6462 6412 6463 6413 element->JacobianDeterminant(&Jdet, xyz_list,gauss); … … 6548 6498 /* Start looping on the number of gauss 2d (nodes on the bedrock) */ 6549 6499 Gauss* gauss=element->NewGaussBase(2); 6550 for(int ig=gauss->begin();ig<gauss->end();ig++){ 6551 6552 gauss->GaussPoint(ig); 6500 while(gauss->next()){ 6553 6501 6554 6502 element->JacobianDeterminantBase(&Jdet2d,xyz_list_tria,gauss); … … 6623 6571 /* Start looping on the number of gaussian points: */ 6624 6572 Gauss* gauss=element->NewGauss(5); 6625 for(int ig=gauss->begin();ig<gauss->end();ig++){ 6626 6627 gauss->GaussPoint(ig); 6573 while(gauss->next()){ 6628 6574 element->JacobianDeterminant(&Jdet,xyz_list,gauss); 6629 6575 element->NodalFunctionsP1(&basis[0], gauss); -
issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp
r25379 r25437 209 209 Gauss* gauss = element->NewGaussBase(2); 210 210 element->NormalBase(&normal[0],xyz_list); 211 for(int ig=gauss->begin();ig<gauss->end();ig++){ 212 gauss->GaussPoint(ig); 211 while(gauss->next()){ 213 212 214 213 element->JacobianDeterminantBase(&Jdet,xyz_list,gauss); … … 246 245 Gauss* gauss = element->NewGaussTop(2); 247 246 element->NormalTop(&normal[0],xyz_list); 248 for(int ig=gauss->begin();ig<gauss->end();ig++){ 249 gauss->GaussPoint(ig); 247 while(gauss->next()){ 250 248 251 249 element->JacobianDeterminantTop(&Jdet,xyz_list,gauss); … … 281 279 /* Start looping on the number of gaussian points: */ 282 280 Gauss* gauss = element->NewGauss(2); 283 for(int ig=gauss->begin();ig<gauss->end();ig++){ 284 gauss->GaussPoint(ig); 281 while(gauss->next()){ 285 282 286 283 element->JacobianDeterminant(&Jdet,xyz_list,gauss); … … 360 357 /* Start looping on the number of gaussian points: */ 361 358 Gauss* gauss=element->NewGaussBase(2); 362 for(int ig=gauss->begin();ig<gauss->end();ig++){ 363 gauss->GaussPoint(ig); 359 while(gauss->next()){ 364 360 365 361 groundedice_melting_input->GetInputValue(&gmb,gauss); … … 424 420 /* Start looping on the number of gaussian points: */ 425 421 Gauss* gauss=element->NewGaussTop(2); 426 for(int ig=gauss->begin();ig<gauss->end();ig++){ 427 gauss->GaussPoint(ig); 422 while(gauss->next()){ 428 423 429 424 smb_input->GetInputValue(&smb,gauss); … … 477 472 /* Start looping on the number of gaussian points: */ 478 473 Gauss* gauss=element->NewGauss(2); 479 for(int ig=gauss->begin();ig<gauss->end();ig++){ 480 gauss->GaussPoint(ig); 474 while(gauss->next()){ 481 475 482 476 element->JacobianDeterminant(&Jdet,xyz_list,gauss); -
issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp
r25379 r25437 156 156 /* Start looping on the number of gaussian points: */ 157 157 Gauss* gauss=basalelement->NewGauss(2); 158 for(int ig=gauss->begin();ig<gauss->end();ig++){ 159 160 gauss->GaussPoint(ig); 158 while(gauss->next()){ 161 159 162 160 /* Get Jacobian determinant: */ -
issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp
r25435 r25437 2101 2101 // ERA5 new aIdx=1, swIdx=0 2102 2102 if (aIdx==1 && swIdx==0){ 2103 if ( abs(adThresh - 820) < Dtol){2103 if (fabs(adThresh - 820) < Dtol){ 2104 2104 // ERA5 new aIdx=1, swIdx=0, MODIS 820 2105 2105 M0 = max(1.8230 - (0.1645 * log(C)),0.25);
Note:
See TracChangeset
for help on using the changeset viewer.