Changeset 25201 for issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

Timestamp:

07/03/20 06:23:13 (5 years ago)

Author:

Cheng Gong

Message:

NEW: add an inversion of the friciton coefficient in Schoof's friction law.
In order to reuse the default code of the Budd's law, the coefficient C in Schoof's law is changed to C=sqrt(C_old).
The name of the control_parameter in Schoof's law is called 'FrictionC'.

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -122 +122 @@
                         case ThicknessEnum:                           iomodel->FetchData(&independent,&M,&N,"md.geometry.thickness");                              break; 
                         case FrictionCoefficientEnum:                 iomodel->FetchData(&independent,&M,&N,"md.friction.coefficient");                            break; 
+                        case FrictionCEnum:                                                                      iomodel->FetchData(&independent,&M,&N,"md.friction.C");                                                            break; 
                         case FrictionAsEnum:                          iomodel->FetchData(&independent,&M,&N,"md.friction.As");                                     break; 
                         case BalancethicknessApparentMassbalanceEnum: iomodel->FetchData(&independent,&M,&N,"md.balancethickness.apparent_massbalance");           break; 
@@ -160 +161 @@
                         case ThicknessEnum:                           iomodel->DeleteData(1,"md.geometry.thickness"); break;
                         case FrictionCoefficientEnum:                 iomodel->DeleteData(1,"md.friction.coefficient"); break;
+                        case FrictionCEnum:                                        iomodel->DeleteData(1,"md.friction.C"); break;
                         case FrictionAsEnum:                          iomodel->DeleteData(1,"md.friction.As"); break;
                         case BalancethicknessApparentMassbalanceEnum: iomodel->DeleteData(1,"md.balancethickness.apparent_massbalance"); break;