Changeset 27020

Timestamp:

05/24/22 02:33:47 (3 years ago)

Author:

Cheng Gong

Message:

CHG: speedfactor to TranientParam in calvingTest

Location:

issm/trunk-jpl/src

Files:

• c/analyses/LevelsetAnalysis.cpp (modified) (3 diffs)
• c/classes/Elements/Element.cpp (modified) (1 diff)
• c/classes/Elements/Tria.cpp (modified) (1 diff)
• m/classes/calvingtest.m (added)

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

@@ -171 +171 @@
 
         int  calvinglaw;
+   IssmDouble *transparam = NULL;
+   IssmDouble  yts;
+   int         N,M;
+   bool        interp,cycle;
+
         iomodel->FindConstant(&calvinglaw,"md.calving.law");
         switch(calvinglaw){
@@ -192 +197 @@
                         break;
                 case CalvingTestEnum:
-                        parameters->AddObject(iomodel->CopyConstantObject("md.calving.speedfactor",CalvingTestSpeedfactorEnum));
+                        iomodel->FetchData(&transparam,&N,&M,"md.calving.speedfactor");
+                        iomodel->FindConstant(&interp,"md.timestepping.interp_forcing");
+                        iomodel->FindConstant(&cycle,"md.timestepping.cycle_forcing");
+                        if(N==1){
+                                _assert_(M==1);
+                                parameters->AddObject(new DoubleParam(CalvingTestSpeedfactorEnum,transparam[0]));
+         }
+         else{
+            _assert_(N==2);
+            parameters->AddObject(new TransientParam(CalvingTestSpeedfactorEnum,&transparam[0],&transparam[M],interp,cycle,M));
+         }
+                        xDelete<IssmDouble>(transparam);
                         break;
                 case CalvingParameterizationEnum:
@@ -209 +225 @@
         int melt_parameterization;
         iomodel->FindConstant(&melt_parameterization,"md.frontalforcings.parameterization");
-        int M,N;
-        IssmDouble* transparam = NULL;
         switch(melt_parameterization){
                 case FrontalForcingsDefaultEnum:

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

@@ -3556 +3556 @@
                                                                                                           case CalvingParameterizationEnum:
                                                                                                                   this->CalvingRateParameterization();
+                                                                                                                  break;
+                                                                                                          case CalvingTestEnum:
+                                                                                                                  this->CalvingRateTest();
                                                                                                                   break;
                                                                                                           default:

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

@@ -373 +373 @@
         IssmDouble  calvingrate[NUMVERTICES];
         IssmDouble  vx,vy;
+        IssmDouble  time;
+        IssmDouble  coeff;
 
         /*Retrieve all inputs and parameters we will need*/
-        IssmDouble coeff = parameters->FindParam(CalvingTestSpeedfactorEnum);
+        parameters->FindParam(&time,TimeEnum);
+        parameters->FindParam(&coeff,CalvingTestSpeedfactorEnum,time);
+
         Input* vx_input = this->GetInput(VxEnum); _assert_(vx_input);
         Input* vy_input = this->GetInput(VyEnum); _assert_(vy_input);