Changeset 5747
- Timestamp:
- 09/10/10 11:45:33 (15 years ago)
- Location:
- issm/trunk/src/c/objects/Elements
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r5746 r5747 556 556 557 557 /*Retrieve all inputs we will be needing: */ 558 Input* pressure_input=inputs->GetInput(PressureEnum); 559 Input* vx_input=inputs->GetInput(VxEnum); 560 Input* vy_input=inputs->GetInput(VyEnum); 561 Input* vz_input=inputs->GetInput(VzEnum); 558 Input* pressure_input=inputs->GetInput(PressureEnum); ISSMASSERT(pressure_input); 559 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 560 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 561 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 562 562 563 563 /* Start looping on the number of gaussian points: */ … … 2085 2085 Penta* pentabase=NULL; 2086 2086 2087 /*inputs: */2088 Input* vx_input=NULL;2089 Input* vy_input=NULL;2090 Input* vxold_input=NULL;2091 Input* vyold_input=NULL;2092 2093 2087 /*retrieve some parameters: */ 2094 2088 this->parameters->FindParam(&viscosity_overshoot,ViscosityOvershootEnum); … … 2107 2101 2108 2102 /*Retrieve all inputs we will be needing: */ 2109 vx_input=inputs->GetInput(VxEnum);2110 vy_input=inputs->GetInput(VyEnum);2111 vxold_input=inputs->GetInput(VxOldEnum);2112 vyold_input=inputs->GetInput(VyOldEnum);2103 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2104 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2105 Input* vxold_input=inputs->GetInput(VxOldEnum); ISSMASSERT(vxold_input); 2106 Input* vyold_input=inputs->GetInput(VyOldEnum); ISSMASSERT(vyold_input); 2113 2107 2114 2108 /* Start looping on the number of gaussian points: */ … … 2301 2295 Tria* tria=NULL; 2302 2296 Penta* pentabase=NULL; 2303 2304 /*inputs: */2305 2297 int approximation; 2306 Input* vx_input=NULL;2307 Input* vy_input=NULL;2308 Input* vxold_input=NULL;2309 Input* vyold_input=NULL;2310 2298 2311 2299 inputs->GetParameterValue(&approximation,ApproximationEnum); … … 2359 2347 2360 2348 /*Retrieve all inputs we will be needing: */ 2361 vx_input=inputs->GetInput(VxEnum);2362 vy_input=inputs->GetInput(VyEnum);2363 vxold_input=inputs->GetInput(VxOldEnum);2364 vyold_input=inputs->GetInput(VyOldEnum);2349 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2350 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2351 Input* vxold_input=inputs->GetInput(VxOldEnum); ISSMASSERT(vxold_input); 2352 Input* vyold_input=inputs->GetInput(VyOldEnum); ISSMASSERT(vyold_input); 2365 2353 2366 2354 /* Start looping on the number of gaussian points: */ … … 2479 2467 Tria* tria=NULL; 2480 2468 2481 /*inputs: */2482 Input* vx_input=NULL;2483 Input* vy_input=NULL;2484 Input* vxold_input=NULL;2485 Input* vyold_input=NULL;2486 2487 2469 /*retrieve some parameters: */ 2488 2470 this->parameters->FindParam(&viscosity_overshoot,ViscosityOvershootEnum); … … 2498 2480 2499 2481 /*Retrieve all inputs we will be needing: */ 2500 vx_input=inputs->GetInput(VxEnum);2501 vy_input=inputs->GetInput(VyEnum);2502 vxold_input=inputs->GetInput(VxOldEnum);2503 vyold_input=inputs->GetInput(VyOldEnum);2482 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2483 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2484 Input* vxold_input=inputs->GetInput(VxOldEnum); ISSMASSERT(vxold_input); 2485 Input* vyold_input=inputs->GetInput(VyOldEnum); ISSMASSERT(vyold_input); 2504 2486 2505 2487 /* Start looping on the number of gaussian points: */ … … 2618 2600 2619 2601 /*Retrieve all inputs we will be needing: */ 2620 Input* vx_input=inputs->GetInput(VxEnum); 2621 Input* vy_input=inputs->GetInput(VyEnum); 2622 Input* vz_input=inputs->GetInput(VzEnum); 2602 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2603 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2604 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 2623 2605 2624 2606 /* Start looping on the number of gaussian points: */ … … 2934 2916 Tria* tria=NULL; 2935 2917 2936 /*inputs: */2937 Input* vx_input=NULL;2938 Input* vy_input=NULL;2939 Input* vz_input=NULL;2940 2941 2918 /*If on water, skip: */ 2942 2919 if(IsOnWater())return; … … 2958 2935 this->parameters->FindParam(&epsvel,EpsVelEnum); 2959 2936 2960 vx_input=inputs->GetInput(VxEnum);2961 vy_input=inputs->GetInput(VyEnum);2962 vz_input=inputs->GetInput(VzEnum);2937 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2938 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2939 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 2963 2940 2964 2941 /* Start looping on the number of gaussian points: */ … … 3211 3188 3212 3189 //recover extra inputs 3213 Input* thickness_input=inputs->GetInput(ThicknessEnum); 3214 Input* surface_input=inputs->GetInput(SurfaceEnum); 3215 Input* slopex_input=inputs->GetInput(SurfaceSlopeXEnum); 3216 Input* slopey_input=inputs->GetInput(SurfaceSlopeYEnum); 3190 Input* thickness_input=inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 3191 Input* surface_input=inputs->GetInput(SurfaceEnum); ISSMASSERT(surface_input); 3192 Input* slopex_input=inputs->GetInput(SurfaceSlopeXEnum); ISSMASSERT(slopex_input); 3193 Input* slopey_input=inputs->GetInput(SurfaceSlopeYEnum); ISSMASSERT(slopey_input); 3217 3194 3218 3195 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 3334 3311 double pe_g_gaussian[numdof]; 3335 3312 3336 /*inputs: */3337 Input* surface_input=NULL;3338 Input* thickness_input=NULL;3339 3340 3313 /*If on water, skip load: */ 3341 3314 if(IsOnWater())return; … … 3348 3321 3349 3322 /*Retrieve all inputs we will be needing: */ 3350 thickness_input=inputs->GetInput(ThicknessEnum);3351 surface_input=inputs->GetInput(SurfaceEnum);3323 Input* thickness_input=inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 3324 Input* surface_input=inputs->GetInput(SurfaceEnum); ISSMASSERT(surface_input); 3352 3325 3353 3326 /* Start looping on the number of gaussian points: */ … … 3440 3413 /*inputs: */ 3441 3414 int approximation; 3442 Input* vx_input=NULL;3443 Input* vy_input=NULL;3444 Input* vz_input=NULL;3445 Input* bed_input=NULL;3446 3415 3447 3416 /*retrieve inputs :*/ … … 3464 3433 3465 3434 /*Retrieve all inputs we will be needing: */ 3466 vx_input=inputs->GetInput(VxEnum);3467 vy_input=inputs->GetInput(VyEnum);3468 vz_input=inputs->GetInput(VzEnum);3469 bed_input=inputs->GetInput(BedEnum);3435 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 3436 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 3437 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 3438 Input* bed_input=inputs->GetInput(BedEnum); ISSMASSERT(bed_input); 3470 3439 3471 3440 /* Start looping on the number of gaussian points: */ … … 3610 3579 double dv[3]; 3611 3580 double dudx,dvdy; 3612 3613 /*inputs: */3614 Input* vx_input=NULL;3615 Input* vy_input=NULL;3616 3581 3617 3582 /*If on water, skip: */ … … 3632 3597 3633 3598 /*Retrieve all inputs we will be needing: */ 3634 vx_input=inputs->GetInput(VxEnum);3635 vy_input=inputs->GetInput(VyEnum);3599 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 3600 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 3636 3601 3637 3602 /* Start looping on the number of gaussian points: */ … … 3770 3735 /*Collapsed formulation: */ 3771 3736 Tria* tria=NULL; 3772 3773 /*parameters: */3774 3737 double dt; 3775 3776 /*inputs: */3777 Input* vx_input=NULL;3778 Input* vy_input=NULL;3779 Input* vz_input=NULL;3780 Input* temperature_input=NULL;3781 3738 3782 3739 /*retrieve some parameters: */ … … 3799 3756 3800 3757 /*Retrieve all inputs we will be needing: */ 3801 vx_input=inputs->GetInput(VxEnum); 3802 vy_input=inputs->GetInput(VyEnum); 3803 vz_input=inputs->GetInput(VzEnum); 3804 if (dt) temperature_input=inputs->GetInput(TemperatureEnum); 3758 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 3759 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 3760 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 3761 Input* temperature_input=NULL; 3762 if (dt){ 3763 temperature_input=inputs->GetInput(TemperatureEnum); ISSMASSERT(inputs); 3764 } 3805 3765 3806 3766 /* Start looping on the number of gaussian points: */ … … 4503 4463 double xyz_list[NUMVERTICES][3]; 4504 4464 4505 Input *vz_input = NULL;4506 4465 double *vz_ptr = NULL; 4507 4466 Penta *penta = NULL; … … 4537 4496 4538 4497 /*Now Compute vel*/ 4539 vz_input=inputs->GetInput(VzEnum);4498 Input* vz_input=inputs->GetInput(VzEnum); 4540 4499 if (vz_input){ 4541 4500 if (vz_input->Enum()!=PentaVertexInputEnum) ISSMERROR("Cannot compute Vel as Vz is of type %s",EnumToString(vz_input->Enum())); … … 4595 4554 double xyz_list[NUMVERTICES][3]; 4596 4555 4597 Input *vz_input = NULL;4598 4556 double *vz_ptr = NULL; 4599 4557 Penta *penta = NULL; … … 4627 4585 4628 4586 /*Get Vz*/ 4629 vz_input=inputs->GetInput(VzEnum);4587 Input* vz_input=inputs->GetInput(VzEnum); 4630 4588 if (vz_input){ 4631 4589 if (vz_input->Enum()!=PentaVertexInputEnum){ … … 4686 4644 double rho_ice,g; 4687 4645 double xyz_list[NUMVERTICES][3]; 4688 4689 Input *vz_input = NULL;4690 4646 double *vz_ptr = NULL; 4691 4647 … … 4708 4664 4709 4665 /*Get Vz*/ 4710 vz_input=inputs->GetInput(VzEnum);4666 Input* vz_input=inputs->GetInput(VzEnum); 4711 4667 if (vz_input){ 4712 4668 if (vz_input->Enum()!=PentaVertexInputEnum){ … … 4765 4721 double rho_ice,g; 4766 4722 double xyz_list[NUMVERTICES][3]; 4767 4768 Input* vz_input=NULL;4769 4723 double* vz_ptr=NULL; 4770 4724 … … 4787 4741 4788 4742 /*Get Vz*/ 4789 vz_input=inputs->GetInput(VzEnum);4743 Input* vz_input=inputs->GetInput(VzEnum); 4790 4744 if (vz_input){ 4791 4745 if (vz_input->Enum()!=PentaVertexInputEnum){ … … 4845 4799 double xyz_list[NUMVERTICES][3]; 4846 4800 4847 Input* vx_input=NULL;4848 4801 double* vx_ptr=NULL; 4849 Input* vy_input=NULL;4850 4802 double* vy_ptr=NULL; 4851 4803 … … 4867 4819 4868 4820 /*Get Vx and Vy*/ 4869 vx_input=inputs->GetInput(VxEnum);4821 Input* vx_input=inputs->GetInput(VxEnum); 4870 4822 if (vx_input){ 4871 4823 if (vx_input->Enum()!=PentaVertexInputEnum) ISSMERROR("Cannot compute Vel as Vx is of type %s",EnumToString(vx_input->Enum())); … … 4875 4827 else for(i=0;i<NUMVERTICES;i++) vx[i]=0.0; 4876 4828 4877 vy_input=inputs->GetInput(VyEnum);4829 Input* vy_input=inputs->GetInput(VyEnum); 4878 4830 if (vy_input){ 4879 4831 if (vy_input->Enum()!=PentaVertexInputEnum) ISSMERROR("Cannot compute Vel as Vy is of type %s",EnumToString(vy_input->Enum())); -
issm/trunk/src/c/objects/Elements/Tria.cpp
r5746 r5747 647 647 this->parameters->FindParam(&control_type,ControlTypeEnum); 648 648 this->parameters->FindParam(&cm_noisedmp,CmNoiseDmpEnum); 649 Input* drag_input=inputs->GetInput(DragCoefficientEnum); 650 Input* dhdt_input=inputs->GetInput(DhDtEnum); 651 Input* Bbar_input=matice->inputs->GetInput(RheologyBbarEnum); 649 Input* drag_input=inputs->GetInput(DragCoefficientEnum); ISSMASSERT(drag_input); 650 Input* dhdt_input=inputs->GetInput(DhDtEnum); ISSMASSERT(dhdt_input); 651 Input* Bbar_input=matice->inputs->GetInput(RheologyBbarEnum); ISSMASSERT(Bbar_input); 652 652 653 653 /*If on water, return 0: */ … … 1005 1005 double epsilon[3]; /* epsilon=[exx,eyy,exy];*/ 1006 1006 1007 /*inputs: */1008 Input* vx_input=NULL;1009 Input* vy_input=NULL;1010 Input* adjointx_input=NULL;1011 Input* adjointy_input=NULL;1012 Input* dragcoefficient_input=NULL;1013 1014 1007 /*parameters: */ 1015 1008 double cm_noisedmp; 1016 1017 1009 int analysis_type; 1018 1010 … … 1035 1027 1036 1028 /*Retrieve all inputs we will be needing: */ 1037 adjointx_input=inputs->GetInput(AdjointxEnum);1038 adjointy_input=inputs->GetInput(AdjointyEnum);1039 vx_input=inputs->GetInput(VxEnum);1040 vy_input=inputs->GetInput(VyEnum);1041 dragcoefficient_input=inputs->GetInput(DragCoefficientEnum);1029 Input* adjointx_input=inputs->GetInput(AdjointxEnum); ISSMASSERT(adjointx_input); 1030 Input* adjointy_input=inputs->GetInput(AdjointyEnum); ISSMASSERT(adjointy_input); 1031 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 1032 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 1033 Input* dragcoefficient_input=inputs->GetInput(DragCoefficientEnum); ISSMASSERT(dragcoefficient_input); 1042 1034 1043 1035 /* Start looping on the number of gaussian points: */ … … 1544 1536 Input* thickness_input =inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 1545 1537 Input* thicknessobs_input=inputs->GetInput(ThicknessObsEnum);ISSMASSERT(thicknessobs_input); 1546 Input* weights_input =inputs->GetInput(WeightsEnum); ISSMASSERT(weights_input);1538 Input* weights_input =inputs->GetInput(WeightsEnum); ISSMASSERT(weights_input); 1547 1539 1548 1540 /* Start looping on the number of gaussian points: */ … … 2455 2447 /*Retrieve all inputs we will be needed*/ 2456 2448 if(dim==2){ 2457 vxaverage_input=inputs->GetInput(VxEnum); 2458 vyaverage_input=inputs->GetInput(VyEnum); 2449 vxaverage_input=inputs->GetInput(VxEnum); ISSMASSERT(vxaverage_input); 2450 vyaverage_input=inputs->GetInput(VyEnum); ISSMASSERT(vyaverage_input); 2459 2451 } 2460 2452 else{ 2461 vxaverage_input=inputs->GetInput(VxAverageEnum); 2462 vyaverage_input=inputs->GetInput(VyAverageEnum); 2453 vxaverage_input=inputs->GetInput(VxAverageEnum); ISSMASSERT(vxaverage_input); 2454 vyaverage_input=inputs->GetInput(VyAverageEnum); ISSMASSERT(vyaverage_input); 2463 2455 } 2464 2456 … … 2583 2575 int dim; 2584 2576 2585 /*inputs: */2586 Input* vx_input=NULL;2587 Input* vy_input=NULL;2588 2589 2577 /* Get node coordinates and dof list: */ 2590 2578 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 2593 2581 2594 2582 /*Retrieve all inputs we will be needed*/ 2595 if(dim==2){ 2596 vx_input=inputs->GetInput(VxEnum); 2597 vy_input=inputs->GetInput(VyEnum); 2598 } 2583 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2584 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2599 2585 2600 2586 /* Start looping on the number of gaussian points: */ … … 2685 2671 Input* vxaverage_input=NULL; 2686 2672 Input* vyaverage_input=NULL; 2687 Input* surface_input=NULL;2688 2673 bool artdiff; 2689 2674 … … 2697 2682 2698 2683 /*Retrieve all inputs we will be needed*/ 2699 surface_input=inputs->GetInput(SurfaceEnum);2684 Input* surface_input=inputs->GetInput(SurfaceEnum); ISSMASSERT(surface_input); 2700 2685 if(dim==2){ 2701 vxaverage_input=inputs->GetInput(VxEnum); 2702 vyaverage_input=inputs->GetInput(VyEnum); 2686 vxaverage_input=inputs->GetInput(VxEnum); ISSMASSERT(vxaverage_input); 2687 vyaverage_input=inputs->GetInput(VyEnum); ISSMASSERT(vyaverage_input); 2703 2688 } 2704 2689 else{ 2705 vxaverage_input=inputs->GetInput(VxAverageEnum); 2706 vyaverage_input=inputs->GetInput(VyAverageEnum); 2690 vxaverage_input=inputs->GetInput(VxAverageEnum); ISSMASSERT(vxaverage_input); 2691 vyaverage_input=inputs->GetInput(VyAverageEnum); ISSMASSERT(vyaverage_input); 2707 2692 } 2708 2693 … … 2849 2834 double thickness; 2850 2835 2851 /*inputs: */2852 Input* thickness_input=NULL;2853 Input* vx_input=NULL;2854 Input* vy_input=NULL;2855 Input* vxold_input=NULL;2856 Input* vyold_input=NULL;2857 2858 2836 /*retrieve some parameters: */ 2859 2837 this->parameters->FindParam(&viscosity_overshoot,ViscosityOvershootEnum); … … 2867 2845 2868 2846 /*Retrieve all inputs we will be needing: */ 2869 thickness_input=inputs->GetInput(ThicknessEnum);2870 vx_input=inputs->GetInput(VxEnum);2871 vy_input=inputs->GetInput(VyEnum);2872 vxold_input=inputs->GetInput(VxOldEnum);2873 vyold_input=inputs->GetInput(VyOldEnum);2847 Input* thickness_input=inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 2848 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2849 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2850 Input* vxold_input=inputs->GetInput(VxOldEnum); ISSMASSERT(vxold_input); 2851 Input* vyold_input=inputs->GetInput(VyOldEnum); ISSMASSERT(vyold_input); 2874 2852 2875 2853 /* Start looping on the number of gaussian points: */ … … 2973 2951 /*inputs: */ 2974 2952 int drag_type; 2975 Input* surface_input=NULL;2976 Input* vx_input=NULL;2977 Input* vy_input=NULL;2978 Input* vz_input=NULL;2979 2953 2980 2954 /*retrive parameters: */ … … 2983 2957 /*retrieve inputs :*/ 2984 2958 inputs->GetParameterValue(&drag_type,DragTypeEnum); 2985 surface_input=inputs->GetInput(SurfaceEnum);2986 vx_input=inputs->GetInput(VxEnum);2987 vy_input=inputs->GetInput(VyEnum);2988 vz_input=inputs->GetInput(VzEnum);2959 Input* surface_input=inputs->GetInput(SurfaceEnum); ISSMASSERT(surface_input); 2960 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 2961 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 2962 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 2989 2963 2990 2964 /* Get node coordinates and dof list: */ … … 3094 3068 /*inputs: */ 3095 3069 int drag_type; 3096 Input* surface_input=NULL;3097 Input* vx_input=NULL;3098 Input* vy_input=NULL;3099 Input* vz_input=NULL;3100 3070 3101 3071 /*retrive parameters: */ … … 3104 3074 /*retrieve inputs :*/ 3105 3075 inputs->GetParameterValue(&drag_type,DragTypeEnum); 3106 surface_input=inputs->GetInput(SurfaceEnum);3107 vx_input=inputs->GetInput(VxEnum);3108 vy_input=inputs->GetInput(VyEnum);3109 vz_input=inputs->GetInput(VzEnum);3076 Input* surface_input=inputs->GetInput(SurfaceEnum); ISSMASSERT(surface_input); 3077 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 3078 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 3079 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 3110 3080 3111 3081 /* Get node coordinates and dof list: */ … … 3212 3182 /*inputs: */ 3213 3183 int drag_type; 3214 Input* surface_input=NULL;3215 Input* vx_input=NULL;3216 Input* vy_input=NULL;3217 Input* vz_input=NULL;3218 3184 3219 3185 /*retrive parameters: */ … … 3222 3188 /*retrieve inputs :*/ 3223 3189 inputs->GetParameterValue(&drag_type,DragTypeEnum); 3224 surface_input=inputs->GetInput(SurfaceEnum);3225 vx_input=inputs->GetInput(VxEnum);3226 vy_input=inputs->GetInput(VyEnum);3227 vz_input=inputs->GetInput(VzEnum);3190 Input* surface_input=inputs->GetInput(SurfaceEnum); ISSMASSERT(surface_input); 3191 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 3192 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 3193 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 3228 3194 3229 3195 /* Get node coordinates and dof list: */ … … 3544 3510 /*Retrieve all inputs we will be needing: */ 3545 3511 if(dim==2){ 3546 vxaverage_input=inputs->GetInput(VxEnum); 3547 vyaverage_input=inputs->GetInput(VyEnum); 3512 vxaverage_input=inputs->GetInput(VxEnum); ISSMASSERT(vxaverage_input); 3513 vyaverage_input=inputs->GetInput(VyEnum); ISSMASSERT(vyaverage_input); 3548 3514 } 3549 3515 else{ 3550 vxaverage_input=inputs->GetInput(VxAverageEnum); 3551 vyaverage_input=inputs->GetInput(VyAverageEnum); 3516 vxaverage_input=inputs->GetInput(VxAverageEnum); ISSMASSERT(vxaverage_input); 3517 vyaverage_input=inputs->GetInput(VyAverageEnum); ISSMASSERT(vyaverage_input); 3552 3518 } 3553 3519 … … 3703 3669 /*Retrieve all inputs we will be needed*/ 3704 3670 if(dim==2){ 3705 vxaverage_input=inputs->GetInput(VxEnum); 3706 vyaverage_input=inputs->GetInput(VyEnum); 3671 vxaverage_input=inputs->GetInput(VxEnum); ISSMASSERT(vxaverage_input); 3672 vyaverage_input=inputs->GetInput(VyEnum); ISSMASSERT(vyaverage_input); 3707 3673 } 3708 3674 else{ 3709 vxaverage_input=inputs->GetInput(VxAverageEnum); 3710 vyaverage_input=inputs->GetInput(VyAverageEnum); 3675 vxaverage_input=inputs->GetInput(VxAverageEnum); ISSMASSERT(vxaverage_input); 3676 vyaverage_input=inputs->GetInput(VyAverageEnum); ISSMASSERT(vyaverage_input); 3711 3677 } 3712 3678 … … 3920 3886 double dhdt_g; 3921 3887 3922 /*inputs: */3923 Input* accumulation_input=NULL;3924 Input* melting_input=NULL;3925 Input* dhdt_input=NULL;3926 3927 3888 /* Get node coordinates and dof list: */ 3928 3889 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 3930 3891 3931 3892 /*retrieve inputs :*/ 3932 accumulation_input=inputs->GetInput(AccumulationRateEnum); ISSMASSERT(accumulation_input);3933 melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input);3934 dhdt_input=inputs->GetInput(DhDtEnum); ISSMASSERT(dhdt_input);3893 Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); ISSMASSERT(accumulation_input); 3894 Input* melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input); 3895 Input* dhdt_input=inputs->GetInput(DhDtEnum); ISSMASSERT(dhdt_input); 3935 3896 3936 3897 /* Start looping on the number of gaussian points: */ … … 3990 3951 double dhdt_g; 3991 3952 3992 /*inputs: */3993 Input* accumulation_input=NULL;3994 Input* melting_input=NULL;3995 Input* dhdt_input=NULL;3996 3997 3953 /* Get node coordinates and dof list: */ 3998 3954 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 4000 3956 4001 3957 /*Retrieve all inputs we will be needing: */ 4002 accumulation_input=inputs->GetInput(AccumulationRateEnum);4003 melting_input=inputs->GetInput(MeltingRateEnum);4004 dhdt_input=inputs->GetInput(DhDtEnum);3958 Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); ISSMASSERT(accumulation_input); 3959 Input* melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input); 3960 Input* dhdt_input=inputs->GetInput(DhDtEnum); ISSMASSERT(dhdt_input); 4005 3961 4006 3962 /* Start looping on the number of gaussian points: */ … … 4059 4015 double melting_g; 4060 4016 4061 /*inputs: */4062 Input* accumulation_input=NULL;4063 Input* melting_input=NULL;4064 4065 4017 /* Get node coordinates and dof list: */ 4066 4018 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 4068 4020 4069 4021 /*Retrieve all inputs we will be needing: */ 4070 accumulation_input=inputs->GetInput(AccumulationRateEnum);4071 melting_input=inputs->GetInput(MeltingRateEnum);4022 Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); ISSMASSERT(accumulation_input); 4023 Input* melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input); 4072 4024 4073 4025 /* Start looping on the number of gaussian points: */ … … 4133 4085 double dbdx,dbdy; 4134 4086 4135 /*inputs: */4136 Input* melting_input=NULL;4137 Input* vx_input=NULL;4138 Input* vy_input=NULL;4139 Input* bed_input=NULL;4140 4141 4087 /* Get node coordinates and dof list: */ 4142 4088 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 4144 4090 4145 4091 /*Retrieve all inputs we will be needing: */ 4146 melting_input=inputs->GetInput(MeltingRateEnum);4147 vx_input=inputs->GetInput(VxEnum);4148 vy_input=inputs->GetInput(VyEnum);4149 bed_input=inputs->GetInput(BedEnum);4092 Input* melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input); 4093 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 4094 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 4095 Input* bed_input=inputs->GetInput(BedEnum); ISSMASSERT(bed_input); 4150 4096 4151 4097 /*For icesheets: */ … … 4308 4254 double l1l2l3[3]; 4309 4255 4310 /*inputs: */4311 Input* thickness_input=NULL;4312 Input* thicknessobs_input=NULL;4313 Input* weights_input=NULL;4314 4315 4256 /* Get node coordinates and dof list: */ 4316 4257 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 4318 4259 4319 4260 /*Retrieve all inputs we will be needing: */ 4320 thickness_input =inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input);4321 thicknessobs_input=inputs->GetInput(ThicknessObsEnum);ISSMASSERT(thicknessobs_input);4322 weights_input =inputs->GetInput(WeightsEnum);ISSMASSERT(weights_input);4261 Input* thickness_input =inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 4262 Input* thicknessobs_input=inputs->GetInput(ThicknessObsEnum);ISSMASSERT(thicknessobs_input); 4263 Input* weights_input =inputs->GetInput(WeightsEnum); ISSMASSERT(weights_input); 4323 4264 4324 4265 /* Start looping on the number of gaussian points: */ … … 4808 4749 double slope2; 4809 4750 int connectivity; 4810 4811 /*flags: */4812 Input* slopex_input=NULL;4813 Input* slopey_input=NULL;4814 Input* thickness_input=NULL;4815 4751 GaussTria* gauss=NULL; 4816 4752 … … 4827 4763 4828 4764 /* Get slopes and thickness */ 4829 slopex_input=inputs->GetInput(SurfaceSlopeXEnum);4830 slopey_input=inputs->GetInput(SurfaceSlopeYEnum);4831 thickness_input=inputs->GetInput(ThicknessEnum);4765 Input* slopex_input=inputs->GetInput(SurfaceSlopeXEnum); ISSMASSERT(slopex_input); 4766 Input* slopey_input=inputs->GetInput(SurfaceSlopeYEnum); ISSMASSERT(slopey_input); 4767 Input* thickness_input=inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 4832 4768 4833 4769 /*Spawn 3 sing elements: */ … … 4888 4824 double melting_g; 4889 4825 double thickness_g; 4890 4891 /*inputs: */4892 4826 double dt; 4893 Input* accumulation_input=NULL;4894 Input* melting_input=NULL;4895 Input* thickness_input=NULL;4896 4827 4897 4828 /*retrieve some parameters: */ … … 4903 4834 4904 4835 /*Retrieve all inputs we will be needing: */ 4905 accumulation_input=inputs->GetInput(AccumulationRateEnum);4906 melting_input=inputs->GetInput(MeltingRateEnum);4907 thickness_input=inputs->GetInput(ThicknessEnum);4836 Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); ISSMASSERT(accumulation_input); 4837 Input* melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input); 4838 Input* thickness_input=inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 4908 4839 4909 4840 /* Start looping on the number of gaussian points: */ … … 4964 4895 double thickness_g; 4965 4896 double dt; 4966 Input* accumulation_input=NULL;4967 Input* melting_input=NULL;4968 Input* thickness_input=NULL;4969 4897 4970 4898 /*retrieve some parameters: */ … … 4976 4904 4977 4905 /*Retrieve all inputs we will be needing: */ 4978 accumulation_input=inputs->GetInput(AccumulationRateEnum);4979 melting_input=inputs->GetInput(MeltingRateEnum);4980 thickness_input=inputs->GetInput(ThicknessEnum);4906 Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); ISSMASSERT(accumulation_input); 4907 Input* melting_input=inputs->GetInput(MeltingRateEnum); ISSMASSERT(melting_input); 4908 Input* thickness_input=inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 4981 4909 4982 4910 /* Start looping on the number of gaussian points: */ … … 5048 4976 /*Retrieve all inputs we will be needing: */ 5049 4977 if ( (analysis_type==SurfaceSlopeXAnalysisEnum) || (analysis_type==SurfaceSlopeYAnalysisEnum)){ 5050 slope_input=inputs->GetInput(SurfaceEnum); 4978 slope_input=inputs->GetInput(SurfaceEnum); ISSMASSERT(slope_input); 5051 4979 } 5052 4980 if ( (analysis_type==BedSlopeXAnalysisEnum) || (analysis_type==BedSlopeYAnalysisEnum)){ 5053 slope_input=inputs->GetInput(BedEnum); 4981 slope_input=inputs->GetInput(BedEnum); ISSMASSERT(slope_input); 5054 4982 } 5055 4983 … … 5118 5046 double P_terms[numdof]={0.0}; 5119 5047 double l1l2l3[NUMVERTICES]; 5120 5121 5048 double t_pmp; 5122 5049 double scalar_ocean; 5123 5124 /*inputs: */5125 Input* pressure_input=NULL;5126 5050 5127 5051 /* Get node coordinates and dof list: */ … … 5144 5068 5145 5069 /*Retrieve all inputs we will be needing: */ 5146 pressure_input=inputs->GetInput(PressureEnum);5070 Input* pressure_input=inputs->GetInput(PressureEnum); ISSMASSERT(pressure_input); 5147 5071 5148 5072 /* Start looping on the number of gauss 2d (nodes on the bedrock) */ … … 5218 5142 parameters->FindParam(&analysis_type,AnalysisTypeEnum); 5219 5143 5220 /*inputs: */5221 Input* vx_input=NULL;5222 Input* vy_input=NULL;5223 Input* vz_input=NULL;5224 Input* geothermalflux_input=NULL;5225 5226 5144 /* Get node coordinates and dof list: */ 5227 5145 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); … … 5241 5159 5242 5160 /*Retrieve all inputs we will be needing: */ 5243 vx_input=inputs->GetInput(VxEnum);5244 vy_input=inputs->GetInput(VyEnum);5245 vz_input=inputs->GetInput(VzEnum);5246 geothermalflux_input=inputs->GetInput(GeothermalFluxEnum);5161 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 5162 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 5163 Input* vz_input=inputs->GetInput(VzEnum); ISSMASSERT(vz_input); 5164 Input* geothermalflux_input=inputs->GetInput(GeothermalFluxEnum); ISSMASSERT(geothermalflux_input); 5247 5165 5248 5166 /* Ice/ocean heat exchange flux on ice shelf base */
Note:
See TracChangeset
for help on using the changeset viewer.