Changeset 22822 for issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

Timestamp:

05/31/18 10:44:24 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22820

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)

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

@@ -291 +291 @@
 
         iomodel->FindConstant(&materialtype,"md.materials.type");
+        if(materialtype==MatdamageiceEnum || materialtype==MaticeEnum || materialtype==MatenhancediceEnum){
+                parameters->AddObject(iomodel->CopyConstantObject("md.materials.rho_ice",MaterialsRhoIceEnum));
+        }
         if(materialtype==MatdamageiceEnum){
                 iomodel->FindConstant(&requestedoutputs,&numoutputs,"md.damage.requested_outputs");