Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 22415) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 22416) @@ -122,4 +122,5 @@ bool isgroundingline; bool ismovingfront; + bool isoceancoupling; bool issmb; @@ -129,4 +130,5 @@ iomodel->FindConstant(&isgroundingline,"md.transient.isgroundingline"); iomodel->FindConstant(&ismovingfront,"md.transient.ismovingfront"); + iomodel->FindConstant(&isoceancoupling,"md.transient.isoceancoupling"); iomodel->FindConstant(&issmb,"md.transient.issmb"); @@ -158,4 +160,8 @@ iomodel->FetchDataToInput(elements,"md.initialization.vy",VyEnum); + if(isoceancoupling){ + iomodel->FetchDataToInput(elements,"md.mesh.lat",MeshLatEnum); + iomodel->FetchDataToInput(elements,"md.mesh.long",MeshLongEnum); + } if(!issmb){ iomodel->FetchDataToInput(elements,"md.smb.mass_balance",SmbMassBalanceEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 22415) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 22416) @@ -107,4 +107,5 @@ parameters->AddObject(iomodel->CopyConstantObject("md.transient.isslr",TransientIsslrEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.transient.iscoupler",TransientIscouplerEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.transient.isoceancoupling",TransientIsoceancouplingEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.transient.amr_frequency",TransientAmrFrequencyEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22415) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22416) @@ -305,4 +305,6 @@ MaterialsEarthDensityEnum, MeshAverageVertexConnectivityEnum, + MeshLatEnum, + MeshLongEnum, MeshXEnum, MeshYEnum, @@ -377,4 +379,5 @@ TransientIssmbEnum, TransientIscouplerEnum, + TransientIsoceancouplingEnum, TransientIsstressbalanceEnum, TransientIsgroundinglineEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22415) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22416) @@ -311,4 +311,6 @@ case MaterialsEarthDensityEnum : return "MaterialsEarthDensity"; case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity"; + case MeshLatEnum : return "MeshLat"; + case MeshLongEnum : return "MeshLong"; case MeshXEnum : return "MeshX"; case MeshYEnum : return "MeshY"; @@ -383,4 +385,5 @@ case TransientIssmbEnum : return "TransientIssmb"; case TransientIscouplerEnum : return "TransientIscoupler"; + case TransientIsoceancouplingEnum : return "TransientIsoceancoupling"; case TransientIsstressbalanceEnum : return "TransientIsstressbalance"; case TransientIsgroundinglineEnum : return "TransientIsgroundingline"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22415) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22416) @@ -317,4 +317,6 @@ else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum; else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; + else if (strcmp(name,"MeshLat")==0) return MeshLatEnum; + else if (strcmp(name,"MeshLong")==0) return MeshLongEnum; else if (strcmp(name,"MeshX")==0) return MeshXEnum; else if (strcmp(name,"MeshY")==0) return MeshYEnum; @@ -381,10 +383,10 @@ else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum; else if (strcmp(name,"Thickness")==0) return ThicknessEnum; - else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; - else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; + if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; + else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; + else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; @@ -392,4 +394,5 @@ else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum; else if (strcmp(name,"TransientIscoupler")==0) return TransientIscouplerEnum; + else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum; else if (strcmp(name,"TransientIsstressbalance")==0) return TransientIsstressbalanceEnum; else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum; @@ -503,11 +506,11 @@ else if (strcmp(name,"SmbHref")==0) return SmbHrefEnum; else if (strcmp(name,"SmbSmbref")==0) return SmbSmbrefEnum; - else if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum; - else if (strcmp(name,"SmbBNeg")==0) return SmbBNegEnum; - else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum; + if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum; + else if (strcmp(name,"SmbBNeg")==0) return SmbBNegEnum; + else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum; + else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum; else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum; else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum; @@ -626,11 +629,11 @@ else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum; - else if (strcmp(name,"J")==0) return JEnum; - else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; - else if (strcmp(name,"Step")==0) return StepEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"Time")==0) return TimeEnum; + if (strcmp(name,"J")==0) return JEnum; + else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; + else if (strcmp(name,"Step")==0) return StepEnum; + else if (strcmp(name,"Time")==0) return TimeEnum; else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum; @@ -749,11 +752,11 @@ else if (strcmp(name,"AugmentedLagrangianRhop")==0) return AugmentedLagrangianRhopEnum; else if (strcmp(name,"AugmentedLagrangianRlambda")==0) return AugmentedLagrangianRlambdaEnum; - else if (strcmp(name,"AugmentedLagrangianRholambda")==0) return AugmentedLagrangianRholambdaEnum; - else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum; - else if (strcmp(name,"None")==0) return NoneEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum; + if (strcmp(name,"AugmentedLagrangianRholambda")==0) return AugmentedLagrangianRholambdaEnum; + else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum; + else if (strcmp(name,"None")==0) return NoneEnum; + else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum; else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; @@ -872,11 +875,11 @@ else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum; else if (strcmp(name,"EsaHemisphere")==0) return EsaHemisphereEnum; - else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum; - else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum; - else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum; + if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum; + else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum; + else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum; + else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum; else if (strcmp(name,"EsaDeltathickness")==0) return EsaDeltathicknessEnum; else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum; @@ -995,11 +998,11 @@ else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum; - else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; - else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; - else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum; + if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; + else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; + else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum; + else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum; else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum; else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; @@ -1118,8 +1121,11 @@ else if (strcmp(name,"Contours")==0) return ContoursEnum; else if (strcmp(name,"Parameters")==0) return ParametersEnum; - else if (strcmp(name,"Vertices")==0) return VerticesEnum; + else stage=10; + } + if(stage==10){ + if (strcmp(name,"Vertices")==0) return VerticesEnum; else if (strcmp(name,"Results")==0) return ResultsEnum; else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum; - else stage=10; + else stage=11; } /*If we reach this point, the string provided has not been found*/