Changeset 19388

Timestamp:

06/04/15 04:55:58 (10 years ago)

Author:

cborstad

Message:

NEW: module for handling analytical damage calculation

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/DamageEvolutionAnalysis.cpp (modified) (7 diffs)
• cores/damage_core.cpp (modified) (1 diff)
• modules/Damagex (added)
• modules/Damagex/Damagex.cpp (added)
• modules/Damagex/Damagex.h (added)
• modules/modules.h (modified) (1 diff)

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

@@ -367 +367 @@
 if DAMAGEEVOLUTION
 issm_sources += ./analyses/DamageEvolutionAnalysis.cpp
+issm_sources += ./modules/Damagex/Damagex.cpp
 endif
 if STRESSBALANCE

issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp

@@ -130 +130 @@
         IssmDouble damage,B,n,epseff;
         IssmDouble eps_xx,eps_yy,eps_xy,eps1,eps2,epstmp;
-        int domaintype,damagelaw;
+        int domaintype;
 
         /*Fetch number of vertices and allocate output*/
@@ -140 +140 @@
         element->FindParam(&stress_threshold,DamageStressThresholdEnum);
         element->FindParam(&domaintype,DomainTypeEnum);
-        element->FindParam(&damagelaw,DamageLawEnum);
 
         /*Compute stress tensor: */
@@ -202 +201 @@
         IssmDouble J2s,Chi,Psi,PosPsi,NegPsi;
         IssmDouble damage,tau_xx,tau_xy,tau_xz,tau_yy,tau_yz,tau_zz,stressMaxPrincipal;
-        int equivstress,domaintype,damagelaw,dim;
+        int equivstress,domaintype,dim;
 
         /*Fetch number of vertices and allocate output*/
@@ -215 +214 @@
         element->FindParam(&stress_threshold,DamageStressThresholdEnum);
         element->FindParam(&domaintype,DomainTypeEnum);
-        element->FindParam(&damagelaw,DamageLawEnum);
 
         /*Get problem dimension*/
@@ -291 +289 @@
                         Psi=Chi-stress_threshold;
                         NegPsi=max(-Chi,0.); /* healing only for compressive stresses */
-
-                        if(damagelaw==1){
-                                PosPsi=max(Psi,0.);
-                                f[i]= c1*(pow(PosPsi,c2) - healing*pow(NegPsi,c2))*pow((1./(1.-damage)),c3);
-                        }
-                        else if(damagelaw==2){
-                                PosPsi=max(Psi,1.);
-                                f[i]= c1*(pow(log10(PosPsi),c2) - healing*pow(NegPsi,c2))*pow((1./(1.-damage)),c3);
-                        }
-                        else _error_("damage law not supported");
+                        PosPsi=max(Psi,0.);
+                        f[i]= c1*(pow(PosPsi,c2) - healing*pow(NegPsi,c2))*pow((1./(1.-damage)),c3);
                 }
                 else{
@@ -312 +302 @@
                         Psi=Chi-stress_threshold;
                         NegPsi=max(-Chi,0.); /* healing only for compressive stresses */
-                        if(damagelaw==1){
-                                PosPsi=max(Psi,0.);
-                                f[i]= c1*(pow(PosPsi,c2) - healing*pow(NegPsi,c2))*pow((1./(1.-damage)),c3);
-                        }
-                        else if(damagelaw==2){
-                                PosPsi=max(Psi,1.);
-                                f[i]= c1*(pow(log10(PosPsi),c2) - healing*pow(NegPsi,c2))*pow((1./(1.-damage)),c3);
-                        }
-                        else _error_("damage law not supported");
+                        PosPsi=max(Psi,0.);
+                        f[i]= c1*(pow(PosPsi,c2) - healing*pow(NegPsi,c2))*pow((1./(1.-damage)),c3);
                 }
         }
@@ -534 +517 @@
                         break;
                 case 2:
-                        this->CreateDamageFInputPralong(element);
-                        break;
-                case 3:
                         this->CreateDamageFInputExp(element);
                         break;

issm/trunk-jpl/src/c/cores/damage_core.cpp

@@ -28 +28 @@
 
         if(VerboseSolution()) _printf0_("   computing damage\n");
+        Damagex(femmodel); /* optionally calculate damage analytically first */
         femmodel->SetCurrentConfiguration(DamageEvolutionAnalysisEnum);
         if(stabilization==4){

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

@@ -20 +20 @@
 #include "./CreateNodalConstraintsx/CreateNodalConstraintsx.h"
 #include "./CreateJacobianMatrixx/CreateJacobianMatrixx.h"
+#include "./Damagex/Damagex.h"
 #include "./DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h"
 #include "./ExpToLevelSetx/ExpToLevelSetx.h"