Changeset 20687

Timestamp:

06/01/16 22:55:21 (9 years ago)

Author:

felicity

Message:

CHG: renamed rheology Earl to Estar (Budd et al., 2013)

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• classes/Elements/Element.cpp (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (2 diffs)
• classes/Materials/Matearl.cpp (deleted)
• classes/Materials/Matearl.h (deleted)
• classes/Materials/Matestar.cpp (added)
• classes/Materials/Matestar.h (added)
• classes/Materials/Matpar.cpp (modified) (1 diff)
• classes/classes.h (modified) (1 diff)
• modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)
• shared/Elements/EarlComponents.cpp (deleted)
• shared/Elements/EstarComponents.cpp (added)
• shared/Elements/elements.h (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (1 diff)

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

@@ -61 +61 @@
                                         ./classes/Materials/Materials.cpp\
                                         ./classes/Materials/Matice.cpp\
-                                        ./classes/Materials/Matearl.cpp\
+                                        ./classes/Materials/Matestar.cpp\
                                         ./classes/Materials/Matpar.cpp\
                                         ./classes/Constraints/Constraints.cpp\
@@ -128 +128 @@
                                         ./shared/Elements/ComputeD18OTemperaturePrecipitationFromPD.cpp\
                                         ./shared/Elements/DrainageFunctionWaterfraction.cpp\
-                                        ./shared/Elements/EarlComponents.cpp\
+                                        ./shared/Elements/EstarComponents.cpp\
                                         ./shared/String/DescriptorIndex.cpp\
                                         ./toolkits/issm/IssmToolkitUtils.cpp\

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -283 +283 @@
                         dvmag[2]=1./(2*sqrt(vmag))*(2*vx*dvx[2]+2*vy*dvy[2]+2*vz*dvz[2]);
                 }
-                EarlStrainrateQuantities(&epso,&epsprime,vx,vy,vz,vmag,&dvx[0],&dvy[0],&dvz[0],&dvmag[0]);
-                lambdas[iv]=EarlLambdaS(epso,epsprime);
+                EstarStrainrateQuantities(&epso,&epsprime,vx,vy,vz,vmag,&dvx[0],&dvy[0],&dvz[0],&dvmag[0]);
+                lambdas[iv]=EstarLambdaS(epso,epsprime);
                 vorticityx[iv]=dvz[1]-dvy[2];
                 vorticityy[iv]=dvx[2]-dvz[0];

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2261 +2261 @@
                         if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
                         break;
-                case MatearlEnum:
+                case MatestarEnum:
                         this->InputDepthAverageAtBase(MaterialsRheologyKoEnum,MaterialsRheologyKobarEnum);
                         this->InputDepthAverageAtBase(MaterialsRheologyEcEnum,MaterialsRheologyEcbarEnum);
@@ -2279 +2279 @@
                         this->inputs->DeleteInput(DamageDbarEnum);
                         break;
-                case MatearlEnum:
+                case MatestarEnum:
                         break;
                 default:

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -82 +82 @@
                 case MaticeEnum:
                 case MatdamageiceEnum:
-                case MatearlEnum:
+                case MatestarEnum:
                         iomodel->FindConstant(&this->rho_ice,MaterialsRhoIceEnum);
                         iomodel->FindConstant(&this->rho_water,MaterialsRhoSeawaterEnum);

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

@@ -83 +83 @@
 #include "./Materials/Material.h"
 #include "./Materials/Matice.h"
-#include "./Materials/Matearl.h"
+#include "./Materials/Matestar.h"
 #include "./Materials/Matpar.h"
 

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

@@ -79 +79 @@
                         }
                         break;
-                case MatearlEnum:
+                case MatestarEnum:
                         iomodel->FetchDataToInput(elements,MaterialsRheologyKoEnum);
                         iomodel->FetchDataToInput(elements,MaterialsRheologyEcEnum);
                         iomodel->FetchDataToInput(elements,MaterialsRheologyEsEnum);
-                        for(i=0;i<iomodel->numberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matearl(i+1,i,iomodel));
+                        for(i=0;i<iomodel->numberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matestar(i+1,i,iomodel));
                         switch(iomodel->domaindim){
                                 case 2:

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -15 +15 @@
 IssmDouble LliboutryDuval(IssmDouble enthalpy, IssmDouble pressure, IssmDouble n, IssmDouble betaCC, IssmDouble referencetemperature, IssmDouble heatcapacity, IssmDouble latentheat);
 // IssmDouble LliboutryDuval(IssmDouble temperature, IssmDouble waterfraction, IssmDouble depth,IssmDouble n);
-IssmDouble EarlLambdaS(IssmDouble epso, IssmDouble epsprime_norm);
-void EarlOmega(IssmDouble* omega,IssmDouble vx,IssmDouble vy,IssmDouble vz,IssmDouble vmag,IssmDouble* dvx,IssmDouble* dvy,IssmDouble* dvz, IssmDouble* dvmag);
-void EarlStrainrateQuantities(IssmDouble *pepso, IssmDouble *pepsprime_norm, IssmDouble vx,IssmDouble vy,IssmDouble vz,IssmDouble vmag,IssmDouble* dvx,IssmDouble* dvy,IssmDouble* dvz,IssmDouble* dvmag);
+IssmDouble EstarLambdaS(IssmDouble epso, IssmDouble epsprime_norm);
+void EstarOmega(IssmDouble* omega,IssmDouble vx,IssmDouble vy,IssmDouble vz,IssmDouble vmag,IssmDouble* dvx,IssmDouble* dvy,IssmDouble* dvz, IssmDouble* dvmag);
+void EstarStrainrateQuantities(IssmDouble *pepso, IssmDouble *pepsprime_norm, IssmDouble vx,IssmDouble vy,IssmDouble vz,IssmDouble vmag,IssmDouble* dvx,IssmDouble* dvy,IssmDouble* dvz,IssmDouble* dvmag);
 IssmDouble PddSurfaceMassBalance(IssmDouble* monthlytemperatures,  IssmDouble* monthlyprec,
                                  IssmDouble* pdds, IssmDouble* pds, IssmDouble* melt, IssmDouble* accu, IssmDouble signorm, 

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

@@ -611 +611 @@
         MaticeEnum,
         MatdamageiceEnum,
-        MatearlEnum,
+        MatestarEnum,
         MatparEnum,
         NodeEnum,

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

@@ -601 +601 @@
                 case MaticeEnum : return "Matice";
                 case MatdamageiceEnum : return "Matdamageice";
-                case MatearlEnum : return "Matearl";
+                case MatestarEnum : return "Matestar";
                 case MatparEnum : return "Matpar";
                 case NodeEnum : return "Node";

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

@@ -613 +613 @@
               else if (strcmp(name,"Matice")==0) return MaticeEnum;
               else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum;
-              else if (strcmp(name,"Matearl")==0) return MatearlEnum;
+              else if (strcmp(name,"Matestar")==0) return MatestarEnum;
               else if (strcmp(name,"Matpar")==0) return MatparEnum;
               else if (strcmp(name,"Node")==0) return NodeEnum;