Changeset 27902

Timestamp:

09/12/23 15:48:53 (18 months ago)

Author:

youngmc3

Message:

CHG: added cfdragcoeffabsgradtransient

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/classes/Cfdragcoeffabsgradtransient.cpp (added)
• c/classes/Cfdragcoeffabsgradtransient.h (added)
• c/classes/classes.h (modified) (1 diff)
• c/datastructures/DataSet.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (1 diff)
• 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) (4 diffs)
• m/classes/cfdragcoeffabsgradtransient.m (added)

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

@@ -91 +91 @@
         ./classes/Cfsurfacesquaretransient.cpp \
         ./classes/Cfdragcoeffabsgrad.cpp \
+        ./classes/Cfdragcoeffabsgradtransient.cpp \
         ./classes/Cfrheologybbarabsgrad.cpp \
         ./classes/Cfsurfacelogvel.cpp \

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

@@ -26 +26 @@
 #include "./Cfsurfacesquaretransient.h"
 #include "./Cfdragcoeffabsgrad.h"
+#include "./Cfdragcoeffabsgradtransient.h"
 #include "./Cfrheologybbarabsgrad.h"
 #include "./Cfsurfacelogvel.h"

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

@@ -276 +276 @@
                                 this->AddObject(cfdragcoeff);
                         }
+                        else if(obj_enum==CfdragcoeffabsgradtransientEnum){
+                                Cfdragcoeffabsgradtransient* cfdragcoeff=new Cfdragcoeffabsgradtransient();
+                                cfdragcoeff->Marshall(marshallhandle);
+                                this->AddObject(cfdragcoeff);
+                        }
                         else if(obj_enum==CfrheologybbarabsgradEnum){
                                 Cfrheologybbarabsgrad* cfrheologybbarabsgrad=new Cfrheologybbarabsgrad();

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

@@ -373 +373 @@
                                 /*}}}*/
                         }
+                        else if (output_definition_enums[i]==CfdragcoeffabsgradtransientEnum){
+                                /*Deal with cfdragcoeffabsgradtransient: {{{*/
+
+                                /*cfdragcoeffabsgrad variables: */
+                                int          num_cfdragcoeffabsgradtransients, test;
+                                char**       cfdraggradt_name_s                                         = NULL;    
+                                char**           cfdraggradt_definitionstring_s         = NULL;    
+                                IssmDouble** cfdraggradt_weights_s                                      = NULL;
+                                int*         cfdraggradt_weights_M_s                            = NULL;
+                                int*         cfdraggradt_weights_N_s                            = NULL;
+
+                                /*Fetch name, model_string, observation, observation_string, etc ... (see src/m/classes/cfdragcoeffabsgrad.m): */
+                                iomodel->FetchMultipleData(&cfdraggradt_name_s,&num_cfdragcoeffabsgradtransients,                                                        "md.cfdragcoeffabsgradtransient.name");
+                                iomodel->FetchMultipleData(&cfdraggradt_definitionstring_s,&num_cfdragcoeffabsgradtransients,                                            "md.cfdragcoeffabsgradtransient.definitionstring");
+                                iomodel->FetchMultipleData(&cfdraggradt_weights_s,&cfdraggradt_weights_M_s,&cfdraggradt_weights_N_s,&test,             "md.cfdragcoeffabsgradtransient.weights");
+                                        
+                                for(j=0;j<num_cfdragcoeffabsgradtransients;j++){
+               
+                                        /*Check that we can use P1 inputs*/
+                                        if (cfdraggradt_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>(cfdraggradt_weights_N_s[j]);
+                                        for(int k=0;k<cfdraggradt_weights_N_s[j];k++) datatimes[k] = (cfdraggradt_weights_s[j])[cfdraggradt_weights_N_s[j]*(cfdraggradt_weights_M_s[j]-1)+k];
+
+                                         /*First create a cfdragcoeffabsgradtransient object for that specific string:*/
+                                        output_definitions->AddObject(new Cfdragcoeffabsgradtransient(cfdraggradt_name_s[j],StringToEnumx(cfdraggradt_definitionstring_s[j]), cfdraggradt_weights_N_s[j], datatimes));
+
+                                        /*Now, for this particular cfdragcoeffabsgrad 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(cfdraggradt_definitionstring_s[j]),cfdraggradt_weights_s[j],inputs,iomodel,cfdraggradt_weights_M_s[j],cfdraggradt_weights_N_s[j],1,WeightsSurfaceObservationEnum,WeightsSurfaceObservationEnum);
+
+                                        }
+                                }
+
+                                /*Free resources:*/
+                                for(j=0;j<num_cfdragcoeffabsgradtransients;j++){
+                                        char* string=NULL;
+                                        IssmDouble* matrix = NULL;
+
+                                        string = cfdraggradt_definitionstring_s[j];             xDelete<char>(string);
+                                        string = cfdraggradt_name_s[j];    xDelete<char>(string);
+                                        matrix = cfdraggradt_weights_s[j]; xDelete<IssmDouble>(matrix);
+                                }
+                                xDelete<char*>(cfdraggradt_name_s);
+                                xDelete<char*>(cfdraggradt_definitionstring_s);
+                                xDelete<IssmDouble*>(cfdraggradt_weights_s);
+                                xDelete<int>(cfdraggradt_weights_M_s);
+                                xDelete<int>(cfdraggradt_weights_N_s);
+                                /*}}}*/
+                        }
                         else if (output_definition_enums[i]==CfrheologybbarabsgradEnum){
                                 /*Deal with cfrheologybbarabsgrad: {{{*/

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

@@ -1418 +1418 @@
 syn keyword cConstant CalvingPollardEnum
 syn keyword cConstant CfdragcoeffabsgradEnum
+syn keyword cConstant CfdragcoeffabsgradtransientEnum
 syn keyword cConstant CfrheologybbarabsgradEnum
 syn keyword cConstant CfsurfacelogvelEnum
@@ -1795 +1796 @@
 syn keyword cType BoolParam
 syn keyword cType Cfdragcoeffabsgrad
+syn keyword cType Cfdragcoeffabsgradtransient
 syn keyword cType Cflevelsetmisfit
 syn keyword cType Cfrheologybbarabsgrad

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

@@ -1417 +1417 @@
         CalvingPollardEnum,
         CfdragcoeffabsgradEnum,
+        CfdragcoeffabsgradtransientEnum,
         CfrheologybbarabsgradEnum,
         CfsurfacelogvelEnum,

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

@@ -1420 +1420 @@
                 case CalvingPollardEnum : return "CalvingPollard";
                 case CfdragcoeffabsgradEnum : return "Cfdragcoeffabsgrad";
+                case CfdragcoeffabsgradtransientEnum : return "Cfdragcoeffabsgradtransient";
                 case CfrheologybbarabsgradEnum : return "Cfrheologybbarabsgrad";
                 case CfsurfacelogvelEnum : return "Cfsurfacelogvel";

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

@@ -1411 +1411 @@
 syn keyword juliaConstC CalvingPollardEnum
 syn keyword juliaConstC CfdragcoeffabsgradEnum
+syn keyword juliaConstC CfdragcoeffabsgradtransientEnum
 syn keyword juliaConstC CfrheologybbarabsgradEnum
 syn keyword juliaConstC CfsurfacelogvelEnum

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

@@ -1453 +1453 @@
               else if (strcmp(name,"CalvingPollard")==0) return CalvingPollardEnum;
               else if (strcmp(name,"Cfdragcoeffabsgrad")==0) return CfdragcoeffabsgradEnum;
+              else if (strcmp(name,"Cfdragcoeffabsgradtransient")==0) return CfdragcoeffabsgradtransientEnum;
               else if (strcmp(name,"Cfrheologybbarabsgrad")==0) return CfrheologybbarabsgradEnum;
               else if (strcmp(name,"Cfsurfacelogvel")==0) return CfsurfacelogvelEnum;
@@ -1489 +1490 @@
               else if (strcmp(name,"DependentObject")==0) return DependentObjectEnum;
               else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum;
-              else if (strcmp(name,"DeviatoricStressErrorEstimator")==0) return DeviatoricStressErrorEstimatorEnum;
          else stage=13;
    }
    if(stage==13){
-              if (strcmp(name,"Divergence")==0) return DivergenceEnum;
+              if (strcmp(name,"DeviatoricStressErrorEstimator")==0) return DeviatoricStressErrorEstimatorEnum;
+              else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
               else if (strcmp(name,"Domain3Dsurface")==0) return Domain3DsurfaceEnum;
               else if (strcmp(name,"DoubleArrayInput")==0) return DoubleArrayInputEnum;
@@ -1612 +1613 @@
               else if (strcmp(name,"LoveKt")==0) return LoveKtEnum;
               else if (strcmp(name,"LoveLf")==0) return LoveLfEnum;
-              else if (strcmp(name,"LoveLt")==0) return LoveLtEnum;
          else stage=14;
    }
    if(stage==14){
-              if (strcmp(name,"LoveTidalHt")==0) return LoveTidalHtEnum;
+              if (strcmp(name,"LoveLt")==0) return LoveLtEnum;
+              else if (strcmp(name,"LoveTidalHt")==0) return LoveTidalHtEnum;
               else if (strcmp(name,"LoveTidalKt")==0) return LoveTidalKtEnum;
               else if (strcmp(name,"LoveTidalLt")==0) return LoveTidalLtEnum;
@@ -1735 +1736 @@
               else if (strcmp(name,"SealevelAbsolute")==0) return SealevelAbsoluteEnum;
               else if (strcmp(name,"SealevelEmotion")==0) return SealevelEmotionEnum;
-              else if (strcmp(name,"SealevelchangePolarMotionX")==0) return SealevelchangePolarMotionXEnum;
          else stage=15;
    }
    if(stage==15){
-              if (strcmp(name,"SealevelchangePolarMotionY")==0) return SealevelchangePolarMotionYEnum;
+              if (strcmp(name,"SealevelchangePolarMotionX")==0) return SealevelchangePolarMotionXEnum;
+              else if (strcmp(name,"SealevelchangePolarMotionY")==0) return SealevelchangePolarMotionYEnum;
               else if (strcmp(name,"SealevelchangePolarMotionZ")==0) return SealevelchangePolarMotionZEnum;
               else if (strcmp(name,"SealevelchangePolarMotion")==0) return SealevelchangePolarMotionEnum;