Changeset 22416


Ignore:
Timestamp:
02/12/18 14:48:40 (7 years ago)
Author:
seroussi
Message:

CHG: recover lat/long if ocean coupling is activated

Location:
issm/trunk-jpl/src/c
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

    r21900 r22416  
    122122        bool   isgroundingline;
    123123        bool   ismovingfront;
     124        bool   isoceancoupling;
    124125        bool   issmb;
    125126
    … …  
    129130        iomodel->FindConstant(&isgroundingline,"md.transient.isgroundingline");
    130131        iomodel->FindConstant(&ismovingfront,"md.transient.ismovingfront");
     132        iomodel->FindConstant(&isoceancoupling,"md.transient.isoceancoupling");
    131133        iomodel->FindConstant(&issmb,"md.transient.issmb");
    132134
    … …  
    158160        iomodel->FetchDataToInput(elements,"md.initialization.vy",VyEnum);
    159161
     162        if(isoceancoupling){
     163                iomodel->FetchDataToInput(elements,"md.mesh.lat",MeshLatEnum);
     164                iomodel->FetchDataToInput(elements,"md.mesh.long",MeshLongEnum);
     165        }
    160166        if(!issmb){
    161167                iomodel->FetchDataToInput(elements,"md.smb.mass_balance",SmbMassBalanceEnum);

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

    r22382 r22416  
    107107                parameters->AddObject(iomodel->CopyConstantObject("md.transient.isslr",TransientIsslrEnum));
    108108                parameters->AddObject(iomodel->CopyConstantObject("md.transient.iscoupler",TransientIscouplerEnum));
     109                parameters->AddObject(iomodel->CopyConstantObject("md.transient.isoceancoupling",TransientIsoceancouplingEnum));
    109110                parameters->AddObject(iomodel->CopyConstantObject("md.transient.amr_frequency",TransientAmrFrequencyEnum));
    110111                parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum));

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r22404 r22416  
    305305        MaterialsEarthDensityEnum,
    306306        MeshAverageVertexConnectivityEnum,
     307        MeshLatEnum,
     308        MeshLongEnum,
    307309        MeshXEnum,
    308310        MeshYEnum,
    … …  
    377379        TransientIssmbEnum,
    378380        TransientIscouplerEnum,
     381        TransientIsoceancouplingEnum,
    379382        TransientIsstressbalanceEnum,
    380383        TransientIsgroundinglineEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r22405 r22416  
    311311                case MaterialsEarthDensityEnum : return "MaterialsEarthDensity";
    312312                case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity";
     313                case MeshLatEnum : return "MeshLat";
     314                case MeshLongEnum : return "MeshLong";
    313315                case MeshXEnum : return "MeshX";
    314316                case MeshYEnum : return "MeshY";
    … …  
    383385                case TransientIssmbEnum : return "TransientIssmb";
    384386                case TransientIscouplerEnum : return "TransientIscoupler";
     387                case TransientIsoceancouplingEnum : return "TransientIsoceancoupling";
    385388                case TransientIsstressbalanceEnum : return "TransientIsstressbalance";
    386389                case TransientIsgroundinglineEnum : return "TransientIsgroundingline";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r22406 r22416  
    317317              else if (strcmp(name,"MaterialsEarthDensity")==0) return MaterialsEarthDensityEnum;
    318318              else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
     319              else if (strcmp(name,"MeshLat")==0) return MeshLatEnum;
     320              else if (strcmp(name,"MeshLong")==0) return MeshLongEnum;
    319321              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    320322              else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    … …  
    381383              else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
    382384              else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
    383               else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
    384               else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
     388              if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
     389              else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
     390              else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    389391              else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
    390392              else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
    … …  
    392394              else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum;
    393395              else if (strcmp(name,"TransientIscoupler")==0) return TransientIscouplerEnum;
     396              else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
    394397              else if (strcmp(name,"TransientIsstressbalance")==0) return TransientIsstressbalanceEnum;
    395398              else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
    … …  
    503506              else if (strcmp(name,"SmbHref")==0) return SmbHrefEnum;
    504507              else if (strcmp(name,"SmbSmbref")==0) return SmbSmbrefEnum;
    505               else if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum;
    506               else if (strcmp(name,"SmbBNeg")==0) return SmbBNegEnum;
    507               else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
     511              if (strcmp(name,"SmbBPos")==0) return SmbBPosEnum;
     512              else if (strcmp(name,"SmbBNeg")==0) return SmbBNegEnum;
     513              else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
     514              else if (strcmp(name,"SMBcomponents")==0) return SMBcomponentsEnum;
    512515              else if (strcmp(name,"SmbAccumulation")==0) return SmbAccumulationEnum;
    513516              else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum;
    … …  
    626629              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
    627630              else if (strcmp(name,"IntMatExternalResult")==0) return IntMatExternalResultEnum;
    628               else if (strcmp(name,"J")==0) return JEnum;
    629               else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
    630               else if (strcmp(name,"Step")==0) return StepEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"Time")==0) return TimeEnum;
     634              if (strcmp(name,"J")==0) return JEnum;
     635              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
     636              else if (strcmp(name,"Step")==0) return StepEnum;
     637              else if (strcmp(name,"Time")==0) return TimeEnum;
    635638              else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
    636639              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    … …  
    749752              else if (strcmp(name,"AugmentedLagrangianRhop")==0) return AugmentedLagrangianRhopEnum;
    750753              else if (strcmp(name,"AugmentedLagrangianRlambda")==0) return AugmentedLagrangianRlambdaEnum;
    751               else if (strcmp(name,"AugmentedLagrangianRholambda")==0) return AugmentedLagrangianRholambdaEnum;
    752               else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
    753               else if (strcmp(name,"None")==0) return NoneEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
     757              if (strcmp(name,"AugmentedLagrangianRholambda")==0) return AugmentedLagrangianRholambdaEnum;
     758              else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
     759              else if (strcmp(name,"None")==0) return NoneEnum;
     760              else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
    758761              else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
    759762              else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
    … …  
    872875              else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum;
    873876              else if (strcmp(name,"EsaHemisphere")==0) return EsaHemisphereEnum;
    874               else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
    875               else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
    876               else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
     880              if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
     881              else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
     882              else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum;
     883              else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
    881884              else if (strcmp(name,"EsaDeltathickness")==0) return EsaDeltathicknessEnum;
    882885              else if (strcmp(name,"EsaUElastic")==0) return EsaUElasticEnum;
    … …  
    995998              else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
    996999              else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
    997               else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
    998               else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
    999               else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
     1003              if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
     1004              else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
     1005              else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;
     1006              else if (strcmp(name,"StressbalanceSolution")==0) return StressbalanceSolutionEnum;
    10041007              else if (strcmp(name,"StressbalanceVerticalAnalysis")==0) return StressbalanceVerticalAnalysisEnum;
    10051008              else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
    … …  
    11181121              else if (strcmp(name,"Contours")==0) return ContoursEnum;
    11191122              else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    1120               else if (strcmp(name,"Vertices")==0) return VerticesEnum;
     1123         else stage=10;
     1124   }
     1125   if(stage==10){
     1126              if (strcmp(name,"Vertices")==0) return VerticesEnum;
    11211127              else if (strcmp(name,"Results")==0) return ResultsEnum;
    11221128              else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
    1123          else stage=10;
     1129         else stage=11;
    11241130   }
    11251131        /*If we reach this point, the string provided has not been found*/
Note: See TracChangeset for help on using the changeset viewer.