Changeset 26875

Timestamp:

02/10/22 11:03:42 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying calving rate

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (2 diffs)
• Tria.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2949 +2949 @@
                         break;
                 case CalvingMinthicknessEnum:
-                        lsf_slopex_input  = this->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
-                        if(dim==2) lsf_slopey_input  = this->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
-                        meltingrate_input = this->GetInput(CalvingMeltingrateEnum);     _assert_(meltingrate_input);
-                        break;
                 case CalvingHabEnum:
-                        lsf_slopex_input  = this->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
-                        if(dim==2) lsf_slopey_input  = this->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
-                        meltingrate_input = this->GetInput(CalvingMeltingrateEnum);     _assert_(meltingrate_input);
-                        break;
                 case CalvingCrevasseDepthEnum:
                         lsf_slopex_input  = this->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
@@ -3020 +3012 @@
 
                         case CalvingMinthicknessEnum:
-                                lsf_slopex_input->GetInputValue(&dlsf[0],&gauss);
-                                if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],&gauss);
-                                meltingrate_input->GetInputValue(&meltingrate,&gauss);
-
-                                norm_dlsf=0.;
-                                for(i=0;i<dim;i++) norm_dlsf+=pow(dlsf[i],2);
-                                norm_dlsf=sqrt(norm_dlsf);
-
-                                if(norm_dlsf>1.e-10)
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=meltingrate*dlsf[i]/norm_dlsf;
-                                 }
-                                else
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=0.;
-                                 }
-                                break;
-
                         case CalvingHabEnum:
-                                lsf_slopex_input->GetInputValue(&dlsf[0],&gauss);
-                                if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],&gauss);
-                                meltingrate_input->GetInputValue(&meltingrate,&gauss);
-
-                                norm_dlsf=0.;
-                                for(i=0;i<dim;i++) norm_dlsf+=pow(dlsf[i],2);
-                                norm_dlsf=sqrt(norm_dlsf);
-
-                                if(norm_dlsf>1.e-10)
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=meltingrate*dlsf[i]/norm_dlsf;
-                                 }
-                                else
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=0.;
-                                 }
-                                break;
-
                         case CalvingCrevasseDepthEnum:
                                 lsf_slopex_input->GetInputValue(&dlsf[0],&gauss);
                                 if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],&gauss);
                                 meltingrate_input->GetInputValue(&meltingrate,&gauss);
-
                                 if(groundedice<0) meltingrate = 0.;
 

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -4380 +4380 @@
                         break;
                 case CalvingMinthicknessEnum:
-                        lsf_slopex_input  = this->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
-                        if(dim==2) lsf_slopey_input  = this->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
-                        meltingrate_input = this->GetInput(CalvingMeltingrateEnum);     _assert_(meltingrate_input);
-                        break;
                 case CalvingHabEnum:
-                        lsf_slopex_input  = this->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
-                        if(dim==2) lsf_slopey_input  = this->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
-                        meltingrate_input = this->GetInput(CalvingMeltingrateEnum);     _assert_(meltingrate_input);
-                        break;
                 case CalvingCrevasseDepthEnum:
                         lsf_slopex_input  = this->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
@@ -4460 +4452 @@
 
                         case CalvingMinthicknessEnum:
-                                lsf_slopex_input->GetInputValue(&dlsf[0],&gauss);
-                                if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],&gauss);
-                                meltingrate_input->GetInputValue(&meltingrate,&gauss);
-
-                                norm_dlsf=0.;
-                                for(i=0;i<dim;i++) norm_dlsf+=pow(dlsf[i],2);
-                                norm_dlsf=sqrt(norm_dlsf);
-
-                                if(norm_dlsf>1.e-10)
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=meltingrate*dlsf[i]/norm_dlsf;
-                                 }
-                                else
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=0.;
-                                 }
-                                break;
-
                         case CalvingHabEnum:
-                                lsf_slopex_input->GetInputValue(&dlsf[0],&gauss);
-                                if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],&gauss);
-                                meltingrate_input->GetInputValue(&meltingrate,&gauss);
-
-                                norm_dlsf=0.;
-                                for(i=0;i<dim;i++) norm_dlsf+=pow(dlsf[i],2);
-                                norm_dlsf=sqrt(norm_dlsf);
-
-                                if(norm_dlsf>1.e-10)
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=meltingrate*dlsf[i]/norm_dlsf;
-                                 }
-                                else
-                                 for(i=0;i<dim;i++){
-                                         c[i]=0.;
-                                         m[i]=0.;
-                                 }
-                                break;
-
                         case CalvingCrevasseDepthEnum:
                                 lsf_slopex_input->GetInputValue(&dlsf[0],&gauss);
                                 if(dim==2) lsf_slopey_input->GetInputValue(&dlsf[1],&gauss);
                                 meltingrate_input->GetInputValue(&meltingrate,&gauss);
-
-                                if(groundedice<0) meltingrate = 0.;
 
                                 norm_dlsf=0.;