Changeset 18959

Timestamp:

12/15/14 02:28:48 (10 years ago)

Author:

jbondzio

Message:

CHG: extrapolate thickness for Levelset-Method, and add computed calvingrate to results

Location:

issm/trunk-jpl/src/c

Files:

• analyses/LevelsetAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (1 diff)
• cores/transient_core.cpp (modified) (1 diff)

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

@@ -105 +105 @@
         if(save_results){
                 if(VerboseSolution()) _printf0_("   saving results\n");
-                int outputs = MaskIceLevelsetEnum;
-                femmodel->RequestedOutputsx(&femmodel->results,&outputs,1);
+                int outputs[2] = {MaskIceLevelsetEnum, CalvingCalvingrateEnum};
+                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);
         }
 }/*}}}*/

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

@@ -1371 +1371 @@
                                 int calvinglaw;
                                 this->FindParam(&calvinglaw,CalvingLawEnum);
-                                switch(calvinglaw){
-                                                 case CalvingLevermannEnum:
-                                                                        this->CalvingRateLevermann();
-                                                                        break;
-                                                                case CalvingPiEnum:
-                                                                        this->CalvingRatePi();
-                                                                        break;
-                                                                default:
-                                                                        _error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
+                                        switch(calvinglaw){
+                                                case DefaultCalvingEnum:
+                                                        //do nothing
+                                                        break;
+                                                case CalvingLevermannEnum:
+                                                        this->CalvingRateLevermann();
+                                                        break;
+                                                case CalvingPiEnum:
+                                                        this->CalvingRatePi();
+                                                        break;
+                                                default:
+                                                        _error_("Calving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
                                 }
                                 input=this->inputs->GetInput(output_enum);

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -120 +120 @@
                         /* extrapolate velocities onto domain with no ice */
                         Analysis* extanalysis = new ExtrapolationAnalysis();
-                        const int nvars=2;
-                        int vars[nvars] = {VxEnum, VyEnum};
+                        const int nvars=3;
+                        int vars[nvars] = {VxEnum, VyEnum, ThicknessEnum};
                         for(int iv=0;iv<nvars;iv++){
                                 femmodel->parameters->SetParam(vars[iv],ExtrapolationVariableEnum);