Changeset 24021

Timestamp:

06/17/19 01:14:12 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not load TF in ISMIP6 forcing if element is not on base to limit RAM requirements

Location:

issm/trunk-jpl/src/c

Files:

• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (2 diffs)

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

@@ -180 +180 @@
                         break;
                 case BasalforcingsIsmip6Enum:{
-                        //iomodel->FetchDataToInput(elements,"md.basalforcings.tf",BasalforcingsIsmp6TfEnum);
                         iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum);
-                        IssmDouble** array3d = NULL;
-                        int* Ms = NULL;
-                        int* Ns = NULL;
-                        int K;
+                        IssmDouble** array3d = NULL; int* Ms = NULL; int* Ns = NULL; int K;
                         iomodel->FetchData(&array3d,&Ms,&Ns,&K,"md.basalforcings.tf");
                         if(!array3d) _error_("md.basalforcings.tf not found in binary file");
                         for(int i=0;i<elements->Size();i++){
                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+                                if(!element->IsOnBase()) continue;
                                 for(int kk=0;kk<K;kk++){
                                         element->DatasetInputAdd(BasalforcingsIsmp6TfEnum,array3d[kk],iomodel,Ms[kk],Ns[kk],1,BasalforcingsIsmp6TfEnum,7,kk);
                                 }
                         }
-                        xDelete<int>(Ms);
-                        xDelete<int>(Ns);
+                        xDelete<int>(Ms); xDelete<int>(Ns);
                         for(int i=0;i<K;i++) xDelete<IssmDouble>(array3d[i]);
                         xDelete<IssmDouble*>(array3d);

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

@@ -364 +364 @@
         if(!IsOnBase()){
                 //put zero
-                sigma_b->SetValue(id-1,0.0,INS_VAL);
+                //sigma_b->SetValue(id-1,0.0,INS_VAL);
                 return;
         }
@@ -416 +416 @@
 
         /*Add value to output*/
-        sigma_b->SetValue(id-1,value,INS_VAL);
+        //sigma_b->SetValue(id-1,value,INS_VAL);
 }
 /*}}}*/