Changeset 18528

Timestamp:

09/16/14 15:55:57 (10 years ago)

Author:

seroussi

Message:

NEW: added output for maximum local divergence

Location:

issm/trunk-jpl/src

Files:

• c/classes/FemModel.cpp (modified) (3 diffs)
• c/classes/FemModel.h (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/MaxDivergenceEnum.m (added)

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

@@ -489 +489 @@
 
                 case DivergenceEnum:               this->Divergencex(responses); break;
+                case MaxDivergenceEnum:            this->MaxDivergencex(responses); break;
                 case IceVolumeEnum:                this->IceVolumex(responses); break;
                 case IceVolumeAboveFloatationEnum: this->IceVolumeAboveFloatationx(responses); break;
@@ -563 +564 @@
                                 /*Scalar output*/
                                 case DivergenceEnum:               this->Divergencex(&double_result);               break;
+                                case MaxDivergenceEnum:            this->MaxDivergencex(&double_result);            break;
                                 case IceVolumeEnum:                this->IceVolumex(&double_result);                break;
                                 case IceVolumeAboveFloatationEnum: this->IceVolumeAboveFloatationx(&double_result); break;
@@ -1125 +1127 @@
 
 }/*}}}*/
+void FemModel::MaxDivergencex(IssmDouble* pdiv){/*{{{*/
+
+        IssmDouble local_divergence;
+        IssmDouble node_max_divergence;
+        IssmDouble max_divergence = -INFINITY;
+
+        for(int i=0;i<this->elements->Size();i++){
+                Element* element=xDynamicCast<Element*>(this->elements->GetObjectByOffset(i));
+                local_divergence=element->Divergence();
+                if(fabs(local_divergence)>max_divergence) max_divergence=fabs(local_divergence);
+        }
+        ISSM_MPI_Reduce(&max_divergence,&node_max_divergence,1,ISSM_MPI_DOUBLE,ISSM_MPI_MAX,0,IssmComm::GetComm() );
+        ISSM_MPI_Bcast(&node_max_divergence,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());
+        max_divergence=node_max_divergence;
+
+        /*Assign output pointers: */
+        *pdiv=max_divergence;
+
+}/*}}}*/
 void FemModel::GetInputLocalMinMaxOnNodesx(IssmDouble** pmin,IssmDouble** pmax,IssmDouble* ug){/*{{{*/
 

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

@@ -76 +76 @@
                 void TotalSmbx(IssmDouble* pSmb);
                 void Divergencex(IssmDouble* pdiv);
+                void MaxDivergencex(IssmDouble* pdiv);
                 void IceVolumex(IssmDouble* pV);
                 void IceVolumeAboveFloatationx(IssmDouble* pV);

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

@@ -580 +580 @@
         StrainRatezzEnum,
         DivergenceEnum,
+        MaxDivergenceEnum,
         GiaCrossSectionShapeEnum,
         GiadWdtEnum,

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

@@ -571 +571 @@
                 case StrainRatezzEnum : return "StrainRatezz";
                 case DivergenceEnum : return "Divergence";
+                case MaxDivergenceEnum : return "MaxDivergence";
                 case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape";
                 case GiadWdtEnum : return "GiadWdt";

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

@@ -583 +583 @@
               else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
               else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
+              else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
               else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
               else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
@@ -628 +629 @@
               else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
-              else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum;
+              if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
+              else if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum;
               else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
               else if (strcmp(name,"WeightsSurfaceObservation")==0) return WeightsSurfaceObservationEnum;
@@ -751 +752 @@
               else if (strcmp(name,"MaterialsTimeRelaxationStress")==0) return MaterialsTimeRelaxationStressEnum;
               else if (strcmp(name,"MaterialsTimeRelaxationDamage")==0) return MaterialsTimeRelaxationDamageEnum;
-              else if (strcmp(name,"MaterialsRidgingExponent")==0) return MaterialsRidgingExponentEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"MaterialsCohesion")==0) return MaterialsCohesionEnum;
+              if (strcmp(name,"MaterialsRidgingExponent")==0) return MaterialsRidgingExponentEnum;
+              else if (strcmp(name,"MaterialsCohesion")==0) return MaterialsCohesionEnum;
               else if (strcmp(name,"MaterialsInternalFrictionCoef")==0) return MaterialsInternalFrictionCoefEnum;
               else if (strcmp(name,"MaterialsCompressionCoef")==0) return MaterialsCompressionCoefEnum;

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -563 +563 @@
 def StrainRatezzEnum(): return StringToEnum("StrainRatezz")[0]
 def DivergenceEnum(): return StringToEnum("Divergence")[0]
+def MaxDivergenceEnum(): return StringToEnum("MaxDivergence")[0]
 def GiaCrossSectionShapeEnum(): return StringToEnum("GiaCrossSectionShape")[0]
 def GiadWdtEnum(): return StringToEnum("GiadWdt")[0]