Changeset 18953 for issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

Timestamp:

12/05/14 16:46:55 (10 years ago)

Author:

srebuffi

Message:

NEW : Calving Pi model

File:

• issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (modified) (5 diffs)

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

@@ -63 +63 @@
                                 iomodel->FetchDataToInput(elements,CalvinglevermannCoeffEnum);
                                 iomodel->FetchDataToInput(elements,CalvinglevermannMeltingrateEnum);
+                                break;
+                        case CalvingPiEnum:
+                                iomodel->FetchDataToInput(elements,CalvingpiCoeffEnum);
+                                iomodel->FetchDataToInput(elements,CalvingpiMeltingrateEnum);
                                 break;
                         default:
@@ -208 +212 @@
                                 meltingrate_input = basalelement->GetInput(CalvinglevermannMeltingrateEnum);     _assert_(meltingrate_input);
                                 break;
+                        case CalvingPiEnum:
+                                if(domaintype==Domain2DhorizontalEnum){
+                                        calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input);
+                                        calvingratey_input=basalelement->GetInput(CalvingrateyEnum); _assert_(calvingratey_input);
+                                }
+                                else{
+                                        if(dim==1){
+                                                calvingratex_input=basalelement->GetInput(CalvingratexEnum); _assert_(calvingratex_input);
+                                        }
+                                        if(dim==2){
+                                                calvingratex_input=basalelement->GetInput(CalvingratexAverageEnum); _assert_(calvingratex_input);
+                                                calvingratey_input=basalelement->GetInput(CalvingrateyAverageEnum); _assert_(calvingratey_input);
+                                        }
+                                }
+                                meltingrate_input = basalelement->GetInput(CalvingpiMeltingrateEnum);     _assert_(meltingrate_input);
+                                break;
                         default:
                                 _error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
@@ -262 +282 @@
 
                                         break;
+
                                 case CalvingLevermannEnum:
                                         calvingratex_input->GetInputValue(&c[0],gauss); // in 3D case, add mesh velocity 
@@ -274 +295 @@
                                         
                                         break;
+
+                                case CalvingPiEnum:
+                                        calvingratex_input->GetInputValue(&c[0],gauss); // in 3D case, add mesh velocity
+                                        if(dim==2) calvingratey_input->GetInputValue(&c[1],gauss);
+                                        meltingrate_input->GetInputValue(&meltingrate,gauss);
+
+                                        norm_calving=0.;
+                                        for(i=0;i<dim;i++) norm_calving+=pow(c[i],2);
+                                        norm_calving=sqrt(norm_calving)+1.e-14;
+
+                                        for(i=0;i<dim;i++) m[i]=meltingrate*c[i]/norm_calving;
+
+                                        break;
+
                                 default:
                                         _error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
@@ -349 +384 @@
         xDelete<IssmDouble>(w);
         xDelete<IssmDouble>(c);
-        xDelete<IssmDouble>(m);
         xDelete<IssmDouble>(dlsf);
         delete gauss;