Changeset 23647

Timestamp:

01/21/19 06:36:46 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing materials now that matpar is gone

File:

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

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

@@ -274 +274 @@
         int materialstype;
         iomodel->FindConstant(&materialstype,"md.materials.type");
+
         switch(materialstype){
                 case MaticeEnum:
@@ -304 +305 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.materials.earth_density",MaterialsEarthDensityEnum));
                         break;
+                case MaterialsEnum:{
+                        int nnat,dummy;
+                        int* nature=NULL;
+                        iomodel->FetchData(&nature,&nnat,&dummy,"md.materials.nature");
+                        for(int i=0;i<nnat;i++){
+                                switch(IoCodeToEnumMaterials(nature[i])){
+                                        case MatlithoEnum:
+                                                break;
+                                        case MaticeEnum:
+                                        case MatdamageiceEnum:
+                                        case MatenhancediceEnum:
+                                        case MatestarEnum:
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.rho_ice",MaterialsRhoIceEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.rho_water",MaterialsRhoSeawaterEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.rho_freshwater",MaterialsRhoFreshwaterEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.mu_water",MaterialsMuWaterEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.heatcapacity",MaterialsHeatcapacityEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.thermalconductivity",MaterialsThermalconductivityEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.temperateiceconductivity",MaterialsTemperateiceconductivityEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.latentheat",MaterialsLatentheatEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.beta",MaterialsBetaEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.meltingpoint",MaterialsMeltingpointEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.constants.referencetemperature",ConstantsReferencetemperatureEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.mixed_layer_capacity",MaterialsMixedLayerCapacityEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.thermal_exchange_velocity",MaterialsThermalExchangeVelocityEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.constants.g",ConstantsGEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.rheology_law",MaterialsRheologyLawEnum));
+
+                                                /*gia: */
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.lithosphere_shear_modulus",MaterialsLithosphereShearModulusEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.lithosphere_density",MaterialsLithosphereDensityEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.mantle_shear_modulus",MaterialsMantleShearModulusEnum));
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.mantle_density",MaterialsMantleDensityEnum));
+
+                                                /*slr:*/
+                                                parameters->AddObject(iomodel->CopyConstantObject("md.materials.earth_density",MaterialsEarthDensityEnum));
+                                                break;
+                                }
+                        }
+                        break;
+
+        }
                 default:
                         _error_("Material "<< EnumToStringx(materialstype) <<" not supported yet");