Changeset 22802

Timestamp:

05/24/18 10:27:21 (7 years ago)

Author:

seroussi

Message:

BUG: fixed problem with materials in solid earth tests

File:

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

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

@@ -105 +105 @@
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.iscoupler",TransientIscouplerEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.isoceancoupling",TransientIsoceancouplingEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.materials.rho_ice",MaterialsRhoIceEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.transient.amr_frequency",TransientAmrFrequencyEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum));
@@ -292 +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");