Changeset 26047 for issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

Timestamp:

03/08/21 17:46:39 (4 years ago)

Author:

Eric.Larour

Message:

CHG: huge commit on solid earth capability rewrite. Complete cleanup of the sea level core.
New mass transport capabilities for ocean and tws. No more giacore. GiaIvins folded into
the sea level core. Debugging of Materials.

File:

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

issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

@@ -38 +38 @@
         femmodel->parameters->FindParam(&variable_partitions_nt,NULL,NULL,QmuVariablePartitionsNtEnum);
 
-
         /*Go through all dakota descriptors, ex: "rho_ice","thermal_conductivity","thickness1","thickness2", etc ..., and
          * for each descriptor, take the variable value and plug it into the inputs (more or less :)):
@@ -169 +168 @@
 
 
-                if (femmodel->inputs->GetInputObjectEnum(SurfaceloadIceThicknessRateEnum)==DatasetInputEnum)
-                        MmeToInput(femmodel,distributed_values,variable_partition,npart,SurfaceloadIceThicknessRateEnum, P0Enum);
+                if (femmodel->inputs->GetInputObjectEnum(MasstransportSpcthicknessEnum)==DatasetInputEnum)
+                        MmeToInput(femmodel,distributed_values,variable_partition,npart,MasstransportSpcthicknessEnum, P0Enum);
 
                 if (femmodel->inputs->GetInputObjectEnum(MaskIceLevelsetEnum)==DatasetInputEnum)