Changeset 23799

Timestamp:

03/14/19 15:58:58 (6 years ago)

Author:

tpelle

Message:

NEW: Add NR test for ISMIP6 basal melt rate parameteriztion. Made slight modifications to code to remove memory leaks for this parameterization

Location:

issm/trunk-jpl

Files:

• src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (3 diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• src/m/classes/basalforcingsismip6.m (modified) (1 diff)
• test/Archives/Archive472.arch (added)
• test/NightlyRun/test472.m (added)

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

@@ -88 +88 @@
         IssmDouble* areas_summed_cpu    = xNewZeroInit<IssmDouble>(num_basins);
 
-        /*TEST: Set tf=2 for all ice shelf elements*/
+        /*Get TF at each ice shelf point - linearly intepolate in depth and time*/
         for(int i=0;i<femmodel->elements->Size();i++){
                 Element* element     = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
@@ -130 +130 @@
                         }
                         else {
-                                /*get values between two times [offset:offset+1[, Interpolate linearly*/
+                                /*get values between two times [offset:offset+1], Interpolate linearly*/
                                 _assert_(depth>=tf_depths[offset] && depth<tf_depths[offset+1]);
                                 IssmDouble deltaz=tf_depths[offset+1]-tf_depths[offset];
@@ -145 +145 @@
                 xDelete<IssmDouble>(tf_test);
                 xDelete<IssmDouble>(depth_vertices);
+                delete gauss;
         }
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -228 +228 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsIsmp6NumBasinsEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_0",BasalforcingsIsmp6Gamma0Enum));
-                        iomodel->FindConstant(&temp_n,"md.basalforcings.num_basins");
-                        iomodel->FetchData(&transparam,NULL,&M,"md.basalforcings.delta_t");
-                        parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6DeltaTEnum,transparam,temp_n));
-                        xDelete<IssmDouble>(transparam);
-                        iomodel->FetchData(&transparam,NULL,NULL,"md.basalforcings.tf_depths");
-                        parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6TfDepthsEnum,transparam,3));
+                        iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.delta_t");
+                        parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6DeltaTEnum,transparam,N));
+                        xDelete<IssmDouble>(transparam);
+                        iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.tf_depths");
+                        parameters->AddObject(new DoubleVecParam(BasalforcingsIsmp6TfDepthsEnum,transparam,N));
                         xDelete<IssmDouble>(transparam);
                         break;

issm/trunk-jpl/src/m/classes/basalforcingsismip6.m

@@ -83 +83 @@
                         WriteData(fid,prefix,'object',self,'fieldname','num_basins','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','basin_id','data',self.basin_id-1,'name','md.basalforcings.basin_id','format','IntMat','mattype',2);   %0-indexed
-                        WriteData(fid,prefix,'object',self,'fieldname','gamma_0','format','Double');
+                        WriteData(fid,prefix,'object',self,'fieldname','gamma_0','format','Double','scale',1./yts);
                         WriteData(fid,prefix,'object',self,'fieldname','tf_depths','format','DoubleMat','name','md.basalforcings.tf_depths');
                         WriteData(fid,prefix,'object',self,'fieldname','tf','format','MatArray','name','md.basalforcings.tf','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);