Changeset 27709

Timestamp:

04/26/23 17:17:41 (23 months ago)

Author:

Mathieu Morlighem

Message:

CHG: adding new transient cost function, not finished just yet

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/Cfsurfacesquaretransient.cpp (added)
• classes/Cfsurfacesquaretransient.h (added)
• classes/IoModel.cpp (modified) (1 diff)
• classes/IoModel.h (modified) (1 diff)
• classes/classes.h (modified) (1 diff)
• modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (1 diff)
• shared/Enum/Enum.vim (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/Enumjl.vim (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -89 +89 @@
         ./classes/Misfit.cpp \
         ./classes/Cfsurfacesquare.cpp \
+        ./classes/Cfsurfacesquaretransient.cpp \
         ./classes/Cfdragcoeffabsgrad.cpp \
         ./classes/Cfrheologybbarabsgrad.cpp \

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -2385 +2385 @@
         /*Assign output pointers: */
         *pstrings=strings;
-        *pnumstrings=num_instances;
+        if(pnumstrings) *pnumstrings=num_instances;
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/IoModel.h

@@ -154 +154 @@
                 void        FetchMultipleData(int*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,const char* data_name);
                 void        FetchMultipleData(int** pvector, int* pnum_instances,const char* data_name);
-                void        FetchMultipleData(IssmDouble** pvector, int* pnum_instances,const char* data_name);
+                void        FetchMultipleData(IssmDouble** pvector, int* pM,const char* data_name);
                 fpos_t*     SetFilePointersToData(int** pcodes,int** pvector_types, int* pnum_instances, const char* data_name);
                 FILE*       SetFilePointerToData(int* pcode,int* pvector_type, const char* data_name);

issm/trunk-jpl/src/c/classes/classes.h

@@ -24 +24 @@
 #include "./Numberedcostfunction.h"
 #include "./Cfsurfacesquare.h"
+#include "./Cfsurfacesquaretransient.h"
 #include "./Cfdragcoeffabsgrad.h"
 #include "./Cfrheologybbarabsgrad.h"

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

@@ -244 +244 @@
                                 /*}}}*/
                         }
+                        else if (output_definition_enums[i]==CfsurfacesquaretransientEnum){
+                                /*Deal with cfsurfacesquaretransient: {{{*/
+
+                                /*cfsurfacesquaretransient variables: */
+                                int          num_cfsurfacesquaretransients,test;
+                                char       **cfssqt_name_s                = NULL;
+                                char       **cfssqt_definitionstring_s    = NULL;
+                                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;
+                                IssmDouble **cfssqt_weights_s             = NULL;
+                                int         *cfssqt_weights_M_s           = NULL;
+                                int         *cfssqt_weights_N_s           = NULL;
+                                char       **cfssqt_weights_string_s      = NULL;
+                                IssmDouble **cfssqt_datatimes_s           = NULL;
+            int         *cfssqt_datatimes_M_s         = NULL;
+            int         *cfssqt_datatimes_N_s         = NULL;
+
+                                /*Fetch name, model_string, observation, observation_string, etc ... (see src/m/classes/cfsurfacesquaretransient.m): */
+                                iomodel->FetchMultipleData(&cfssqt_name_s,&num_cfsurfacesquaretransients,"md.cfsurfacesquaretransient.name");
+                                iomodel->FetchMultipleData(&cfssqt_definitionstring_s,&test,"md.cfsurfacesquaretransient.definitionstring"); _assert_(test==num_cfsurfacesquaretransients);
+                                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,NULL, "md.cfsurfacesquaretransient.observations");
+                                iomodel->FetchMultipleData(&cfssqt_observations_string_s, NULL,"md.cfsurfacesquaretransient.observation_string");
+                                iomodel->FetchMultipleData(&cfssqt_weights_s,&cfssqt_weights_M_s,&cfssqt_weights_N_s,NULL,"md.cfsurfacesquaretransient.weights");
+                                iomodel->FetchMultipleData(&cfssqt_weights_string_s,NULL,"md.cfsurfacesquaretransient.weights_string");
+                                iomodel->FetchMultipleData(&cfssqt_datatimes_s,&cfssqt_datatimes_M_s,&cfssqt_datatimes_N_s,NULL,"md.cfsurfacesquaretransient.datatimes"); 
+
+                                for(j=0;j<num_cfsurfacesquaretransients;j++){
+
+               /*Check that we can use P1 inputs*/
+                                        if (cfssqt_observations_M_s[j]==iomodel->numberofvertices) _error_("only P1 fields are allowed for now");
+               if (cfssqt_observations_M_s[j]==cfssqt_weights_M_s[j]) _error_("observations and weights do not have the same number of rows");
+               if (cfssqt_observations_N_s[j]==cfssqt_weights_N_s[j]) _error_("observations and weights do not have the same number of columns");
+               if (cfssqt_datatimes_M_s[j]==1) _error_("datatime should have only one row");
+               if (cfssqt_datatimes_N_s[j]==cfssqt_weights_N_s[j]) _error_("datatime should have the same number of columns as the observations");
+
+                                        /*First create a cfsurfacesquaretransient object for that specific string (cfssqt_model_string_s[j]):*/
+                                        output_definitions->AddObject(new Cfsurfacesquaretransient(cfssqt_name_s[j], StringToEnumx(cfssqt_definitionstring_s[j]), StringToEnumx(cfssqt_model_string_s[j]), cfssqt_datatimes_N_s[j], cfssqt_datatimes_s[j]));
+
+                                        /*Now, for this particular cfsurfacesquaretransient object, make sure we plug into the elements: the observation, and the weights.*/
+                                        for(Object* & object : elements->objects){
+                                                Element* element=xDynamicCast<Element*>(object);
+                                                _error_("need to implement transient inputs?");
+                                                //element->DatasetInputAdd(StringToEnumx(cfssqt_definitionstring_s[j]),cfssqt_observations_s[j],inputs,iomodel,cfssqt_observations_M_s[j],cfssqt_observations_N_s[j],obs_vector_type,StringToEnumx(cfssqt_observations_string_s[j]),7,SurfaceObservationEnum);
+                                                //element->DatasetInputAdd(StringToEnumx(cfssqt_definitionstring_s[j]),cfssqt_weights_s[j],inputs,iomodel,cfssqt_weights_M_s[j],cfssqt_weights_N_s[j],weight_vector_type,StringToEnumx(cfssqt_weights_string_s[j]),7,WeightsSurfaceObservationEnum);
+
+                                        }
+
+                                }
+
+                                /*Free resources:*/
+                                for(j=0;j<num_cfsurfacesquaretransients;j++){
+                                        char* string=NULL;
+                                        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);
+                                        matrix = cfssqt_weights_s[j]; xDelete<IssmDouble>(matrix);
+                                }
+                                xDelete<char*>(cfssqt_name_s);
+                                xDelete<char*>(cfssqt_model_string_s);
+                                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);
+                                xDelete<IssmDouble*>(cfssqt_weights_s);
+                                xDelete<int>(cfssqt_weights_M_s);
+                                xDelete<int>(cfssqt_weights_N_s);
+                                xDelete<char*>(cfssqt_weights_string_s);
+                                xDelete<IssmDouble>(cfssqt_datatimes_s);
+                                /*}}}*/
+                        }
                         else if (output_definition_enums[i]==CfdragcoeffabsgradEnum){
                                 /*Deal with cfdragcoeffabsgrad: {{{*/

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -1396 +1396 @@
 syn keyword cConstant CfsurfacelogvelEnum
 syn keyword cConstant CfsurfacesquareEnum
+syn keyword cConstant CfsurfacesquaretransientEnum
 syn keyword cConstant CflevelsetmisfitEnum
 syn keyword cConstant ChannelEnum

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -1395 +1395 @@
         CfsurfacelogvelEnum,
         CfsurfacesquareEnum,
+        CfsurfacesquaretransientEnum,
         CflevelsetmisfitEnum,
         ChannelEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -1398 +1398 @@
                 case CfsurfacelogvelEnum : return "Cfsurfacelogvel";
                 case CfsurfacesquareEnum : return "Cfsurfacesquare";
+                case CfsurfacesquaretransientEnum : return "Cfsurfacesquaretransient";
                 case CflevelsetmisfitEnum : return "Cflevelsetmisfit";
                 case ChannelEnum : return "Channel";

issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim

@@ -1389 +1389 @@
 syn keyword juliaConstC CfsurfacelogvelEnum
 syn keyword juliaConstC CfsurfacesquareEnum
+syn keyword juliaConstC CfsurfacesquaretransientEnum
 syn keyword juliaConstC CflevelsetmisfitEnum
 syn keyword juliaConstC ChannelEnum

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -1431 +1431 @@
               else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum;
               else if (strcmp(name,"Cfsurfacesquare")==0) return CfsurfacesquareEnum;
+              else if (strcmp(name,"Cfsurfacesquaretransient")==0) return CfsurfacesquaretransientEnum;
               else if (strcmp(name,"Cflevelsetmisfit")==0) return CflevelsetmisfitEnum;
               else if (strcmp(name,"Channel")==0) return ChannelEnum;
@@ -1489 +1490 @@
               else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
               else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
-              else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
          else stage=13;
    }
    if(stage==13){
-              if (strcmp(name,"FemModel")==0) return FemModelEnum;
+              if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
+              else if (strcmp(name,"FemModel")==0) return FemModelEnum;
               else if (strcmp(name,"FileParam")==0) return FileParamEnum;
               else if (strcmp(name,"FixedTimestepping")==0) return FixedTimesteppingEnum;
@@ -1612 +1613 @@
               else if (strcmp(name,"Mathydro")==0) return MathydroEnum;
               else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
-              else if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum;
          else stage=14;
    }
    if(stage==14){
-              if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
+              if (strcmp(name,"MaxAbsVx")==0) return MaxAbsVxEnum;
+              else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
               else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
               else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
@@ -1735 +1736 @@
               else if (strcmp(name,"StressIntensityFactor")==0) return StressIntensityFactorEnum;
               else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
-              else if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum;
          else stage=15;
    }
    if(stage==15){
-              if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
+              if (strcmp(name,"StressbalanceConvergenceNumSteps")==0) return StressbalanceConvergenceNumStepsEnum;
+              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
               else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
               else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;