Changeset 27920

Timestamp:

Sep 21, 2023, 11:41:17 AM (3 years ago)

Author:

youngmc3

Message:

CHG: added Cfrheologybbarabsgradtransient

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/classes/Cfrheologybbarabsgrad.cpp (modified) (7 diffs)
• c/classes/Cfrheologybbarabsgrad.h (modified) (2 diffs)
• c/classes/Cfrheologybbarabsgradtransient.cpp (added)
• c/classes/Cfrheologybbarabsgradtransient.h (added)
• c/classes/classes.h (modified) (1 diff)
• c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (2 diffs)
• c/shared/Enum/Enum.vim (modified) (2 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/Enumjl.vim (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/cfrheologybbarabsgradtransient.m (added)

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

@@ -86 +86 @@
         ./classes/Cfdragcoeffabsgradtransient.cpp \
         ./classes/Cfrheologybbarabsgrad.cpp \
+        ./classes/Cfrheologybbarabsgradtransient.cpp \
         ./classes/Cfsurfacelogvel.cpp \
         ./classes/Cflevelsetmisfit.cpp \

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

@@ -29 +29 @@
         this->definitionenum = -1;
         this->name = NULL;
-        this->weights_enum = UNDEF;
-        this->timepassedflag = false;
         this->J = 0.;
+        this->firsttimepassed = false;
 }
 /*}}}*/
-Cfrheologybbarabsgrad::Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, int in_weights_enum){/*{{{*/
+Cfrheologybbarabsgrad::Cfrheologybbarabsgrad(char* in_name, int in_definitionenum){/*{{{*/
 
         this->definitionenum=in_definitionenum;
@@ -41 +40 @@
         xMemCpy<char>(this->name,in_name,strlen(in_name)+1);
 
-        this->weights_enum=in_weights_enum;
-        this->timepassedflag=false;
-
         this->J=0;
+        this->firsttimepassed = false;
 }
 /*}}}*/
-Cfrheologybbarabsgrad::Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, bool in_timepassedflag, IssmDouble in_J){/*{{{*/
+Cfrheologybbarabsgrad::Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, IssmDouble in_J){/*{{{*/
 
         this->definitionenum=in_definitionenum;
@@ -54 +51 @@
         xMemCpy<char>(this->name,in_name,strlen(in_name)+1);
 
-        this->weights_enum=in_weights_enum;
-        this->timepassedflag=in_timepassedflag;
+        this->J=in_J;
+        this->firsttimepassed = false;
+}
+/*}}}*/
+Cfrheologybbarabsgrad::Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, IssmDouble in_J, bool in_firsttimepassed){/*{{{*/
+
+        this->definitionenum=in_definitionenum;
+
+        this->name              = xNew<char>(strlen(in_name)+1);
+        xMemCpy<char>(this->name,in_name,strlen(in_name)+1);
 
         this->J=in_J;
+        this->firsttimepassed = in_firsttimepassed;
 }
 /*}}}*/
@@ -66 +72 @@
 /*Object virtual function resolutoin: */
 Object* Cfrheologybbarabsgrad::copy() {/*{{{*/
-        Cfrheologybbarabsgrad* mf = new Cfrheologybbarabsgrad(this->name,this->definitionenum, this->weights_enum,this->timepassedflag,this->J);
+        Cfrheologybbarabsgrad* mf = new Cfrheologybbarabsgrad(this->name,this->definitionenum, this->J, this->firsttimepassed);
         return (Object*) mf;
 }
@@ -76 +82 @@
 void Cfrheologybbarabsgrad::Echo(void){/*{{{*/
         _printf_(" Cfrheologybbarabsgrad: " << name << " " << this->definitionenum << "\n");
-        _printf_("    weights_enum: " << weights_enum << " " << EnumToStringx(weights_enum) << "\n");
-        _printf_("        timepassedflag: "<<timepassedflag<<"\n");
 }
 /*}}}*/
@@ -92 +96 @@
         marshallhandle->call(this->definitionenum);
         marshallhandle->call(this->name);
-        marshallhandle->call(this->weights_enum);
-        marshallhandle->call(this->timepassedflag);
         marshallhandle->call(this->J);
+        marshallhandle->call(this->firsttimepassed);
 } 
 /*}}}*/
@@ -119 +122 @@
         IssmDouble J_sum=0.;
 
-        for(Object* & object : femmodel->elements->objects){
-                Element* element=xDynamicCast<Element*>(object);
-                J_part+=this->Cfrheologybbarabsgrad_Calculation(element,weights_enum);
+        if (!this->firsttimepassed){
+                for(Object* & object : femmodel->elements->objects){
+                        Element* element=xDynamicCast<Element*>(object);
+                        J_part+=this->Cfrheologybbarabsgrad_Calculation(element);
+                }
+
+                ISSM_MPI_Allreduce( (void*)&J_part,(void*)&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
+                this->J = J_sum;
+
+                this->firsttimepassed = true;
         }
-
-        ISSM_MPI_Allreduce( (void*)&J_part,(void*)&J_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
-        ISSM_MPI_Bcast(&J_sum,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
-
-        this->timepassedflag = true;
-        this->J = J_sum;
         return this->J;
 }/*}}}*/
-IssmDouble Cfrheologybbarabsgrad::Cfrheologybbarabsgrad_Calculation(Element* element, int weights_enum){/*{{{*/
+IssmDouble Cfrheologybbarabsgrad::Cfrheologybbarabsgrad_Calculation(Element* element){/*{{{*/
 
         int        domaintype,numcomponents;

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

@@ -19 +19 @@
                 int         definitionenum;
                 char*       name;
-                int         weights_enum;
-                bool                    timepassedflag;
+                bool                    firsttimepassed;
                 IssmDouble  J;
 
                 /*Cfrheologybbarabsgrad constructors, destructors :*/
                 Cfrheologybbarabsgrad();
-                Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, int in_weights_enum);
-                Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, int in_weights_enum,  bool in_timepassedflag, IssmDouble in_J);
+                Cfrheologybbarabsgrad(char* in_name, int in_definitionenum);
+                Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, IssmDouble in_J);
+                Cfrheologybbarabsgrad(char* in_name, int in_definitionenum, IssmDouble in_J, bool in_firsttimepassed);
                 ~Cfrheologybbarabsgrad();
 
@@ -41 +41 @@
                 char* Name();
                 IssmDouble Response(FemModel* femmodel);
-                IssmDouble Cfrheologybbarabsgrad_Calculation(Element* element, int weights_enum);
+                IssmDouble Cfrheologybbarabsgrad_Calculation(Element* element);
 };
 #endif  /* _CFRHEOLOGYBBARABSGRAD_H_ */

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

@@ -28 +28 @@
 #include "./Cfdragcoeffabsgradtransient.h"
 #include "./Cfrheologybbarabsgrad.h"
+#include "./Cfrheologybbarabsgradtransient.h"
 #include "./Cfsurfacelogvel.h"
 #include "./Cflevelsetmisfit.h"

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

@@ -384 +384 @@
                                 int*         cfdraggradt_weights_N_s                            = NULL;
 
-                                /*Fetch name, model_string, observation, observation_string, etc ... (see src/m/classes/cfdragcoeffabsgrad.m): */
+                                /*Fetch name, model_string, observation, observation_string, etc ... (see src/m/classes/cfdragcoeffabsgradtransient.m): */
                                 iomodel->FetchMultipleData(&cfdraggradt_name_s,&num_cfdragcoeffabsgradtransients,                                                        "md.cfdragcoeffabsgradtransient.name");
                                 iomodel->FetchMultipleData(&cfdraggradt_definitionstring_s,&num_cfdragcoeffabsgradtransients,                                            "md.cfdragcoeffabsgradtransient.definitionstring");
@@ -486 +486 @@
             xDelete<int>(cfrheologybbarabsgrad_weights_N_s);
             xDelete<char*>(cfrheologybbarabsgrad_weights_string_s);
+            /*}}}*/
+         }
+                        else if (output_definition_enums[i]==CfrheologybbarabsgradtransientEnum){
+                                /*Deal with cfrheologybbarabsgradtransient: {{{*/
+
+                                /*cfrheologybbarabsgrad variables: */
+                                int          num_cfrheologybbarabsgradtransients, test;
+                                char**       cfrheogradt_name_s                = NULL;
+                                char**       cfrheogradt_definitionstring_s    = NULL;
+                                IssmDouble** cfrheogradt_weights_s             = NULL;
+                                int*         cfrheogradt_weights_M_s           = NULL;
+                                int*         cfrheogradt_weights_N_s           = NULL;
+                                char**       cfrheogradt_weights_string_s      = NULL;
+
+                                /*Fetch name, model_string, observation, observation_string, etc ... (see src/m/classes/cfrheologybbarabsgradtransient.m): */
+                                iomodel->FetchMultipleData(&cfrheogradt_name_s,&num_cfrheologybbarabsgradtransients,                                                        "md.cfrheologybbarabsgradtransient.name");
+                                iomodel->FetchMultipleData(&cfrheogradt_definitionstring_s,&num_cfrheologybbarabsgradtransients,                                            "md.cfrheologybbarabsgradtransient.definitionstring");
+                                iomodel->FetchMultipleData(&cfrheogradt_weights_s,&cfrheogradt_weights_M_s,&cfrheogradt_weights_N_s,&test,             "md.cfrheologybbarabsgradtransient.weights");
+
+                                for(j=0;j<num_cfrheologybbarabsgradtransients;j++){
+
+                                        if (cfrheogradt_weights_M_s[j]!=iomodel->numberofvertices+1) _error_("weights should be a P1 time series");
+                                        
+                                        /*extract data times from last row of observations*/
+                                        IssmDouble *datatimes = xNew<IssmDouble>(cfrheogradt_weights_N_s[j]);
+                                        for(int k=0;k<cfrheogradt_weights_N_s[j];k++) datatimes[k] = (cfrheogradt_weights_s[j])[cfrheogradt_weights_N_s[j]*(cfrheogradt_weights_M_s[j]-1)+k];
+
+                                        /*First create a cfrheologybbarabsgradtransient object for that specific string:*/
+                                        output_definitions->AddObject(new Cfrheologybbarabsgradtransient(cfrheogradt_name_s[j],StringToEnumx(cfrheogradt_definitionstring_s[j]), cfrheogradt_weights_N_s[j], datatimes));
+
+                                        /*Now, for this particular cfrheologybbarabsgrad object, make sure we plug into the elements: the observation, and the weights.*/
+                                        for(Object* & object : elements->objects){
+
+                                                Element* element=xDynamicCast<Element*>(object);
+
+                                                element->DatasetInputAdd(StringToEnumx(cfrheogradt_definitionstring_s[j]),cfrheogradt_weights_s[j],inputs,iomodel,cfrheogradt_weights_M_s[j],cfrheogradt_weights_N_s[j],1,WeightsSurfaceObservationEnum,WeightsSurfaceObservationEnum);
+
+                                        }
+                                }
+                                
+                                /*Free resources:*/
+            for(j=0;j<num_cfrheologybbarabsgradtransients;j++){
+               char* string=NULL;
+               IssmDouble* matrix = NULL;
+
+               string = cfrheogradt_definitionstring_s[j];    xDelete<char>(string);
+               string = cfrheogradt_name_s[j];    xDelete<char>(string);
+               matrix = cfrheogradt_weights_s[j]; xDelete<IssmDouble>(matrix);
+            }
+            xDelete<char*>(cfrheogradt_name_s);
+            xDelete<char*>(cfrheogradt_definitionstring_s);
+            xDelete<IssmDouble*>(cfrheogradt_weights_s);
+            xDelete<int>(cfrheogradt_weights_M_s);
+            xDelete<int>(cfrheogradt_weights_N_s);
             /*}}}*/
          }

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

@@ -1421 +1421 @@
 syn keyword cConstant CfdragcoeffabsgradtransientEnum
 syn keyword cConstant CfrheologybbarabsgradEnum
+syn keyword cConstant CfrheologybbarabsgradtransientEnum
 syn keyword cConstant CfsurfacelogvelEnum
 syn keyword cConstant CfsurfacesquareEnum
@@ -1800 +1801 @@
 syn keyword cType Cflevelsetmisfit
 syn keyword cType Cfrheologybbarabsgrad
+syn keyword cType Cfrheologybbarabsgradtransient
 syn keyword cType Cfsurfacelogvel
 syn keyword cType Cfsurfacesquare

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

@@ -1420 +1420 @@
         CfdragcoeffabsgradtransientEnum,
         CfrheologybbarabsgradEnum,
+        CfrheologybbarabsgradtransientEnum,
         CfsurfacelogvelEnum,
         CfsurfacesquareEnum,

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

@@ -1423 +1423 @@
                 case CfdragcoeffabsgradtransientEnum : return "Cfdragcoeffabsgradtransient";
                 case CfrheologybbarabsgradEnum : return "Cfrheologybbarabsgrad";
+                case CfrheologybbarabsgradtransientEnum : return "Cfrheologybbarabsgradtransient";
                 case CfsurfacelogvelEnum : return "Cfsurfacelogvel";
                 case CfsurfacesquareEnum : return "Cfsurfacesquare";

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

@@ -1414 +1414 @@
 syn keyword juliaConstC CfdragcoeffabsgradtransientEnum
 syn keyword juliaConstC CfrheologybbarabsgradEnum
+syn keyword juliaConstC CfrheologybbarabsgradtransientEnum
 syn keyword juliaConstC CfsurfacelogvelEnum
 syn keyword juliaConstC CfsurfacesquareEnum

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

@@ -1456 +1456 @@
               else if (strcmp(name,"Cfdragcoeffabsgradtransient")==0) return CfdragcoeffabsgradtransientEnum;
               else if (strcmp(name,"Cfrheologybbarabsgrad")==0) return CfrheologybbarabsgradEnum;
+              else if (strcmp(name,"Cfrheologybbarabsgradtransient")==0) return CfrheologybbarabsgradtransientEnum;
               else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum;
               else if (strcmp(name,"Cfsurfacesquare")==0) return CfsurfacesquareEnum;