Changeset 27733

Timestamp:

05/08/23 08:50:52 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: keeping only strings for what is really needed

Location:

issm/trunk-jpl/src

Files:

• c/datastructures/DataSet.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (7 diffs)
• m/classes/cfsurfacesquaretransient.m (modified) (5 diffs)

issm/trunk-jpl/src/c/datastructures/DataSet.cpp ¶

@@ -256 +256 @@
                                 this->AddObject(Cflevelset);
                         }
+                        else if(obj_enum==CfsurfacesquaretransientEnum){
+                                Cfsurfacesquaretransient* cfsurf=new Cfsurfacesquaretransient();
+                                cfsurf->Marshall(marshallhandle);
+                                this->AddObject(cfsurf);
+                        }
                         else if(obj_enum==CfsurfacesquareEnum){
                                 Cfsurfacesquare* cfsurf=new Cfsurfacesquare();

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp ¶

@@ -253 +253 @@
                                 char       **cfssqt_model_string_s        = NULL;
                                 IssmDouble **cfssqt_observations_s        = NULL;
-                                char       **cfssqt_observations_string_s = NULL;
                                 int         *cfssqt_observations_M_s      = NULL;
                                 int         *cfssqt_observations_N_s      = NULL;
@@ -259 +258 @@
                                 int         *cfssqt_weights_M_s           = NULL;
                                 int         *cfssqt_weights_N_s           = NULL;
-                                char       **cfssqt_weights_string_s      = NULL;
 
                                 /*Fetch name, model_string, observation, observation_string, etc ... (see src/m/classes/cfsurfacesquaretransient.m): */
@@ -266 +264 @@
                                 iomodel->FetchMultipleData(&cfssqt_model_string_s,&test,"md.cfsurfacesquaretransient.model_string"); _assert_(test==num_cfsurfacesquaretransients);
                                 iomodel->FetchMultipleData(&cfssqt_observations_s,&cfssqt_observations_M_s,&cfssqt_observations_N_s,&test, "md.cfsurfacesquaretransient.observations"); _assert_(test==num_cfsurfacesquaretransients);
-                                iomodel->FetchMultipleData(&cfssqt_observations_string_s, &test,"md.cfsurfacesquaretransient.observations_string"); _assert_(test==num_cfsurfacesquaretransients);
                                 iomodel->FetchMultipleData(&cfssqt_weights_s,&cfssqt_weights_M_s,&cfssqt_weights_N_s, &test,"md.cfsurfacesquaretransient.weights"); _assert_(test==num_cfsurfacesquaretransients);
-                                iomodel->FetchMultipleData(&cfssqt_weights_string_s,&test,"md.cfsurfacesquaretransient.weights_string"); _assert_(test==num_cfsurfacesquaretransients);
 
                                 for(j=0;j<num_cfsurfacesquaretransients;j++){
@@ -288 +284 @@
                                         for(Object* & object : elements->objects){
                                                 Element* element=xDynamicCast<Element*>(object);
-                                                element->DatasetInputAdd(StringToEnumx(cfssqt_definitionstring_s[j]),cfssqt_observations_s[j],inputs,iomodel,cfssqt_observations_M_s[j],cfssqt_observations_N_s[j],1,StringToEnumx(cfssqt_observations_string_s[j]),SurfaceObservationEnum);
-                                                element->DatasetInputAdd(StringToEnumx(cfssqt_definitionstring_s[j]),cfssqt_weights_s[j],inputs,iomodel,cfssqt_weights_M_s[j],cfssqt_weights_N_s[j],1,StringToEnumx(cfssqt_weights_string_s[j]),WeightsSurfaceObservationEnum);
-
-                                        }
-
+                                                element->DatasetInputAdd(StringToEnumx(cfssqt_definitionstring_s[j]),cfssqt_observations_s[j],inputs,iomodel,cfssqt_observations_M_s[j],cfssqt_observations_N_s[j],1,SurfaceObservationEnum,SurfaceObservationEnum);
+                                                element->DatasetInputAdd(StringToEnumx(cfssqt_definitionstring_s[j]),cfssqt_weights_s[j],inputs,iomodel,cfssqt_weights_M_s[j],cfssqt_weights_N_s[j],1,WeightsSurfaceObservationEnum,WeightsSurfaceObservationEnum);
+
+                                        }
                                 }
 
@@ -300 +295 @@
                                         IssmDouble* matrix = NULL;
                                         string = cfssqt_definitionstring_s[j];          xDelete<char>(string);
-                                        string = cfssqt_observations_string_s[j];       xDelete<char>(string);
                                         string = cfssqt_model_string_s[j];                      xDelete<char>(string);
-                                        string = cfssqt_weights_string_s[j];            xDelete<char>(string);
                                         string = cfssqt_name_s[j];    xDelete<char>(string);
                                         matrix = cfssqt_observations_s[j]; xDelete<IssmDouble>(matrix);
@@ -311 +304 @@
                                 xDelete<char*>(cfssqt_definitionstring_s);
                                 xDelete<IssmDouble*>(cfssqt_observations_s);
-                                xDelete<char*>(cfssqt_observations_string_s);
                                 xDelete<int>(cfssqt_observations_M_s);
                                 xDelete<int>(cfssqt_observations_N_s);
@@ -317 +309 @@
                                 xDelete<int>(cfssqt_weights_M_s);
                                 xDelete<int>(cfssqt_weights_N_s);
-                                xDelete<char*>(cfssqt_weights_string_s);
                                 /*}}}*/
                         }

issm/trunk-jpl/src/m/classes/cfsurfacesquaretransient.m ¶

@@ -6 +6 @@
 %                    'definitionstring','Outputdefinition1',... 
 %                                                       'model_string','Surface',...
-%                    'observations_string','SurfaceObservations',...
 %                    'observations',[md.geometry.surface;0],...
-%                    'weights',ones(md.mesh.numberofvertices+1,1),...
-%                    'weights_string','WeightsSurfaceObservations');
+%                    'weights',ones(md.mesh.numberofvertices+1,1));
 %
 %
@@ -20 +18 @@
                 model_string        = ''; %string for field that is modeled
                 observations        = NaN;%observed field that we compare the model against
-                observations_string = ''; %string for observed field.
                 weights             = NaN;%weight coefficients for every vertex
-                weights_string      = ''; %string to identify this particular set of weights
         end
         
@@ -46 +42 @@
                                 self.model_string        = getfieldvalue(options,'model_string');
                                 self.observations        = getfieldvalue(options,'observations',NaN);
-                                self.observations_string = getfieldvalue(options,'observations_string');
                                 self.weights             = getfieldvalue(options,'weights',NaN);
-                                self.weights_string      = getfieldvalue(options,'weights_string','');
                         end
                 end % }}}
@@ -75 +69 @@
                         fielddisplay(self,'model_string','string for field that is modeled');
                         fielddisplay(self,'observations','observed field that we compare the model against');
-                        fielddisplay(self,'observations_string','observations string');
                         fielddisplay(self,'weights','weights (at vertices) to apply to the cfsurfacesquaretransient');
-                        fielddisplay(self,'weights_string','string for weights for identification purposes');
 
                 end % }}}
@@ -86 +78 @@
                 WriteData(fid,prefix,'data',self.model_string,'name','md.cfsurfacesquaretransient.model_string','format','String');
                 WriteData(fid,prefix,'data',self.observations,'name','md.cfsurfacesquaretransient.observations','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                WriteData(fid,prefix,'data',self.observations_string,'name','md.cfsurfacesquaretransient.observations_string','format','String');
                 WriteData(fid,prefix,'data',self.weights,'name','md.cfsurfacesquaretransient.weights','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                WriteData(fid,prefix,'data',self.weights_string,'name','md.cfsurfacesquaretransient.weights_string','format','String');
                 end % }}}
         end