Changeset 21577

Timestamp:

02/28/17 16:20:05 (8 years ago)

Author:

adhikari

Message:

CHG: GiaIvins switched back to Gia

Location:

issm/trunk-jpl/src/c/modules

Files:

• GiaDeflectionCorex (added)
• GiaDeflectionCorex/GiaDeflectionCorex.cpp (added)
• GiaDeflectionCorex/GiaDeflectionCorex.h (added)
• GiaDeflectionCorex/distme.f (added)
• GiaDeflectionCorex/freed.f (added)
• GiaDeflectionCorex/ojrule.f (added)
• GiaDeflectionCorex/pwise.f (added)
• GiaDeflectionCorex/qwise.f (added)
• GiaDeflectionCorex/stot.f (added)
• GiaDeflectionCorex/what0.f (added)
• GiaIvinsDeflectionCorex (deleted)
• ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• modules.h (modified) (1 diff)

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

@@ -77 +77 @@
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isthermal",TransientIsthermalEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isgroundingline",TransientIsgroundinglineEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.transient.isgiaivins",TransientIsgiaivinsEnum));
+                parameters->AddObject(iomodel->CopyConstantObject("md.transient.isgia",TransientIsgiaEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isesa",TransientIsesaEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isdamageevolution",TransientIsdamageevolutionEnum));
@@ -85 +85 @@
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.iscoupler",TransientIscouplerEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.materials.rheology_law",MaterialsRheologyLawEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.giaivins.cross_section_shape",GiaIvinsCrossSectionShapeEnum));
+                parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum));
 
                 /*For stress balance only*/

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

@@ -29 +29 @@
 #include "./GetVectorFromInputsx/GetVectorFromInputsx.h"
 #include "./GetVectorFromControlInputsx/GetVectorFromControlInputsx.h"
-#include "./GiaIvinsDeflectionCorex/GiaIvinsDeflectionCorex.h"
+#include "./GiaDeflectionCorex/GiaDeflectionCorex.h"
 #include "./SetControlInputsFromVectorx/SetControlInputsFromVectorx.h"
 #include "./SetActiveNodesLSMx/SetActiveNodesLSMx.h"