Index: /issm/trunk-jpl/src/c/analyses/EsaAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EsaAnalysis.cpp (revision 25138) +++ /issm/trunk-jpl/src/c/analyses/EsaAnalysis.cpp (revision 25139) @@ -73,6 +73,6 @@ /*love numbers: */ - iomodel->FetchData(&love_h,&nl,NULL,"md.esa.love_h"); - iomodel->FetchData(&love_l,&nl,NULL,"md.esa.love_l"); + iomodel->FetchData(&love_h,&nl,NULL,"md.solidearth.love.h"); + iomodel->FetchData(&love_l,&nl,NULL,"md.solidearth.love.l"); /*compute elastic green function for a range of angles*/ Index: /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (revision 25138) +++ /issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (revision 25139) @@ -281,4 +281,7 @@ IssmDouble* love_k=NULL; IssmDouble* love_l=NULL; + IssmDouble* love_th=NULL; + IssmDouble* love_tk=NULL; + IssmDouble* love_tl=NULL; int dslmodel=0; @@ -345,18 +348,18 @@ /*Deal with elasticity {{{*/ /*love numbers: */ - iomodel->FetchData(&lovemodel,"md.solidearth.love.model"); - if(lovemodel==1){ - iomodel->FetchData(&love_h,&nl,NULL,"md.solidearth.love.h"); - iomodel->FetchData(&love_k,&nl,NULL,"md.solidearth.love.k"); - iomodel->FetchData(&love_l,&nl,NULL,"md.solidearth.love.l"); - parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.th",TidalLoveHEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.tk",TidalLoveKEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.tk2secular",TidalLoveK2SecularEnum)); - } - else{ - parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.h",TidalLoveHEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.k",TidalLoveKEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.k2secular",TidalLoveK2SecularEnum)); - } + iomodel->FetchData(&love_h,&nl,NULL,"md.solidearth.love.h"); + iomodel->FetchData(&love_k,&nl,NULL,"md.solidearth.love.k"); + iomodel->FetchData(&love_l,&nl,NULL,"md.solidearth.love.l"); + iomodel->FetchData(&love_th,&nl,NULL,"md.solidearth.love.th"); + iomodel->FetchData(&love_tk,&nl,NULL,"md.solidearth.love.tk"); + iomodel->FetchData(&love_tl,&nl,NULL,"md.solidearth.love.tl"); + parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.tk2secular",TidalLoveK2SecularEnum)); + + parameters->AddObject(new DoubleMatParam(LoadLoveHEnum,love_h,nl,1)); + parameters->AddObject(new DoubleMatParam(LoadLoveKEnum,love_k,nl,1)); + parameters->AddObject(new DoubleMatParam(LoadLoveLEnum,love_l,nl,1)); + parameters->AddObject(new DoubleMatParam(TidalLoveHEnum,love_th,nl,1)); + parameters->AddObject(new DoubleMatParam(TidalLoveKEnum,love_tk,nl,1)); + parameters->AddObject(new DoubleMatParam(TidalLoveLEnum,love_tl,nl,1)); /*compute elastic green function for a range of angles*/ @@ -474,4 +477,7 @@ xDelete(love_k); xDelete(love_l); + xDelete(love_th); + xDelete(love_tk); + xDelete(love_tl); xDelete(G_rigid); xDelete(G_rigid_local); Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 25138) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 25139) @@ -4794,6 +4794,9 @@ bool spherical=true; IssmDouble* RSLg_old=NULL; - IssmDouble tide_love_h, tide_love_k, fluid_love, moi_e, moi_p, omega, g; - IssmDouble load_love_k2 = -0.30922675; //degree 2 load Love number + IssmDouble* tide_love_h = NULL; + IssmDouble* tide_love_k = NULL; + IssmDouble* load_love_k = NULL; + IssmDouble tide_love_k2secular; + IssmDouble moi_e, moi_p, omega, g; IssmDouble m1, m2, m3; IssmDouble lati, longi, radi, value; @@ -4824,7 +4827,8 @@ /*pull out some useful parameters: */ - parameters->FindParam(&tide_love_h,TidalLoveHEnum); - parameters->FindParam(&tide_love_k,TidalLoveKEnum); - parameters->FindParam(&fluid_love,TidalLoveK2SecularEnum); + parameters->FindParam(&load_love_k,NULL,NULL,LoadLoveKEnum); + parameters->FindParam(&tide_love_h,NULL,NULL,TidalLoveHEnum); + parameters->FindParam(&tide_love_k,NULL,NULL,TidalLoveKEnum); + parameters->FindParam(&tide_love_k2secular,TidalLoveK2SecularEnum); parameters->FindParam(&moi_e,RotationalEquatorialMoiEnum); parameters->FindParam(&moi_p,RotationalPolarMoiEnum); @@ -4832,7 +4836,7 @@ /*compute perturbation terms for angular velocity vector: */ - m1 = 1/(1-tide_love_k/fluid_love) * (1+load_love_k2)/(moi_p-moi_e) * moi_list[0]; - m2 = 1/(1-tide_love_k/fluid_love) * (1+load_love_k2)/(moi_p-moi_e) * moi_list[1]; - m3 = -(1+load_love_k2)/moi_p * moi_list[2]; // term associated with fluid number (3-order-of-magnitude smaller) is negelected + m1 = 1/(1-tide_love_k[2]/tide_love_k2secular) * (1+load_love_k[2])/(moi_p-moi_e) * moi_list[0]; + m2 = 1/(1-tide_love_k[2]/tide_love_k2secular) * (1+load_love_k[2])/(moi_p-moi_e) * moi_list[1]; + m3 = -(1+load_love_k[2])/moi_p * moi_list[2]; // term associated with fluid number (3-order-of-magnitude smaller) is negelected /*recover lat,long and radius vectors from vertices: */ @@ -4853,5 +4857,5 @@ /*only first order terms are considered now: */ - value=((1.0+tide_love_k-tide_love_h)/9.81)*pow(omega*radi,2.0)* + value=((1.0+tide_love_k[2]-tide_love_h[2])/9.81)*pow(omega*radi,2.0)* (-m3/6.0 + 0.5*m3*cos(2.0*lati) - 0.5*sin(2.*lati)*(m1*cos(longi)+m2*sin(longi))); @@ -4868,4 +4872,8 @@ xDelete(latitude); xDelete(longitude); + xDelete(tide_love_h); + xDelete(tide_love_k); + xDelete(load_love_k); + xDelete(radius); Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 25138) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 25139) @@ -315,5 +315,11 @@ syn keyword cConstant SealevelriseGeometryDoneEnum syn keyword cConstant RotationalEquatorialMoiEnum +syn keyword cConstant TidalLoveHEnum +syn keyword cConstant TidalLoveKEnum +syn keyword cConstant TidalLoveLEnum syn keyword cConstant TidalLoveK2SecularEnum +syn keyword cConstant LoadLoveHEnum +syn keyword cConstant LoadLoveKEnum +syn keyword cConstant LoadLoveLEnum syn keyword cConstant SealevelriseGRigidEnum syn keyword cConstant SealevelriseGElasticEnum @@ -330,6 +336,4 @@ syn keyword cConstant SolidearthSettingsRotationEnum syn keyword cConstant SealevelriseRunCountEnum -syn keyword cConstant TidalLoveHEnum -syn keyword cConstant TidalLoveKEnum syn keyword cConstant SealevelriseTransitionsEnum syn keyword cConstant SealevelriseUElasticEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 25138) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 25139) @@ -309,5 +309,11 @@ SealevelriseGeometryDoneEnum, RotationalEquatorialMoiEnum, + TidalLoveHEnum, + TidalLoveKEnum, + TidalLoveLEnum, TidalLoveK2SecularEnum, + LoadLoveHEnum, + LoadLoveKEnum, + LoadLoveLEnum, SealevelriseGRigidEnum, SealevelriseGElasticEnum, @@ -324,6 +330,4 @@ SolidearthSettingsRotationEnum, SealevelriseRunCountEnum, - TidalLoveHEnum, - TidalLoveKEnum, SealevelriseTransitionsEnum, SealevelriseUElasticEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 25138) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 25139) @@ -317,5 +317,11 @@ case SealevelriseGeometryDoneEnum : return "SealevelriseGeometryDone"; case RotationalEquatorialMoiEnum : return "RotationalEquatorialMoi"; + case TidalLoveHEnum : return "TidalLoveH"; + case TidalLoveKEnum : return "TidalLoveK"; + case TidalLoveLEnum : return "TidalLoveL"; case TidalLoveK2SecularEnum : return "TidalLoveK2Secular"; + case LoadLoveHEnum : return "LoadLoveH"; + case LoadLoveKEnum : return "LoadLoveK"; + case LoadLoveLEnum : return "LoadLoveL"; case SealevelriseGRigidEnum : return "SealevelriseGRigid"; case SealevelriseGElasticEnum : return "SealevelriseGElastic"; @@ -332,6 +338,4 @@ case SolidearthSettingsRotationEnum : return "SolidearthSettingsRotation"; case SealevelriseRunCountEnum : return "SealevelriseRunCount"; - case TidalLoveHEnum : return "TidalLoveH"; - case TidalLoveKEnum : return "TidalLoveK"; case SealevelriseTransitionsEnum : return "SealevelriseTransitions"; case SealevelriseUElasticEnum : return "SealevelriseUElastic"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 25138) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 25139) @@ -323,5 +323,11 @@ else if (strcmp(name,"SealevelriseGeometryDone")==0) return SealevelriseGeometryDoneEnum; else if (strcmp(name,"RotationalEquatorialMoi")==0) return RotationalEquatorialMoiEnum; + else if (strcmp(name,"TidalLoveH")==0) return TidalLoveHEnum; + else if (strcmp(name,"TidalLoveK")==0) return TidalLoveKEnum; + else if (strcmp(name,"TidalLoveL")==0) return TidalLoveLEnum; else if (strcmp(name,"TidalLoveK2Secular")==0) return TidalLoveK2SecularEnum; + else if (strcmp(name,"LoadLoveH")==0) return LoadLoveHEnum; + else if (strcmp(name,"LoadLoveK")==0) return LoadLoveKEnum; + else if (strcmp(name,"LoadLoveL")==0) return LoadLoveLEnum; else if (strcmp(name,"SealevelriseGRigid")==0) return SealevelriseGRigidEnum; else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum; @@ -338,6 +344,4 @@ else if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum; else if (strcmp(name,"SealevelriseRunCount")==0) return SealevelriseRunCountEnum; - else if (strcmp(name,"TidalLoveH")==0) return TidalLoveHEnum; - else if (strcmp(name,"TidalLoveK")==0) return TidalLoveKEnum; else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum; else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum; @@ -379,12 +383,12 @@ else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum; else if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum; - else if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum; else if (strcmp(name,"SmbIsprecipscaled")==0) return SmbIsprecipscaledEnum; else if (strcmp(name,"SmbIssetpddfac")==0) return SmbIssetpddfacEnum; else if (strcmp(name,"SmbIsshortwave")==0) return SmbIsshortwaveEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum; + else if (strcmp(name,"SmbIstemperaturescaled")==0) return SmbIstemperaturescaledEnum; else if (strcmp(name,"SmbIsthermal")==0) return SmbIsthermalEnum; else if (strcmp(name,"SmbIsturbulentflux")==0) return SmbIsturbulentfluxEnum; @@ -502,12 +506,12 @@ else if (strcmp(name,"BasalforcingsPicoSubShelfOceanTemp")==0) return BasalforcingsPicoSubShelfOceanTempEnum; else if (strcmp(name,"BasalStressx")==0) return BasalStressxEnum; - else if (strcmp(name,"BasalStressy")==0) return BasalStressyEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"BasalStressy")==0) return BasalStressyEnum; else if (strcmp(name,"BasalStress")==0) return BasalStressEnum; else if (strcmp(name,"Base")==0) return BaseEnum; else if (strcmp(name,"BaseOld")==0) return BaseOldEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"BaseSlopeX")==0) return BaseSlopeXEnum; + else if (strcmp(name,"BaseSlopeX")==0) return BaseSlopeXEnum; else if (strcmp(name,"BaseSlopeY")==0) return BaseSlopeYEnum; else if (strcmp(name,"Bed")==0) return BedEnum; @@ -625,12 +629,12 @@ else if (strcmp(name,"HydrologyDrainageRate")==0) return HydrologyDrainageRateEnum; else if (strcmp(name,"HydrologyEnglacialInput")==0) return HydrologyEnglacialInputEnum; - else if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum; + else stage=6; + } + if(stage==6){ + if (strcmp(name,"HydrologyGapHeight")==0) return HydrologyGapHeightEnum; else if (strcmp(name,"HydrologyHead")==0) return HydrologyHeadEnum; else if (strcmp(name,"HydrologyHeadOld")==0) return HydrologyHeadOldEnum; else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum; - else stage=6; - } - if(stage==6){ - if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum; + else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum; else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum; else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum; @@ -748,12 +752,12 @@ else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum; else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum; - else if (strcmp(name,"SmbEC")==0) return SmbECEnum; + else stage=7; + } + if(stage==7){ + if (strcmp(name,"SmbEC")==0) return SmbECEnum; else if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum; else if (strcmp(name,"SmbECini")==0) return SmbECiniEnum; else if (strcmp(name,"SmbEla")==0) return SmbElaEnum; - else stage=7; - } - if(stage==7){ - if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum; + else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum; else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum; else if (strcmp(name,"SmbGdn")==0) return SmbGdnEnum; @@ -871,12 +875,12 @@ else if (strcmp(name,"Vz")==0) return VzEnum; else if (strcmp(name,"VzFS")==0) return VzFSEnum; - else if (strcmp(name,"VzHO")==0) return VzHOEnum; + else stage=8; + } + if(stage==8){ + if (strcmp(name,"VzHO")==0) return VzHOEnum; else if (strcmp(name,"VzMesh")==0) return VzMeshEnum; else if (strcmp(name,"VzSSA")==0) return VzSSAEnum; else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; - else stage=8; - } - if(stage==8){ - if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; + else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; else if (strcmp(name,"WaterfractionDrainage")==0) return WaterfractionDrainageEnum; else if (strcmp(name,"WaterfractionDrainageIntegrated")==0) return WaterfractionDrainageIntegratedEnum; @@ -994,12 +998,12 @@ else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum; else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum; - else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; + else stage=9; + } + if(stage==9){ + if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum; else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum; else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum; - else stage=9; - } - if(stage==9){ - if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; + else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum; else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum; @@ -1117,12 +1121,12 @@ else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum; - else if (strcmp(name,"Hook")==0) return HookEnum; + else stage=10; + } + if(stage==10){ + if (strcmp(name,"Hook")==0) return HookEnum; else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum; else if (strcmp(name,"HydrologyDCInefficientAnalysis")==0) return HydrologyDCInefficientAnalysisEnum; else if (strcmp(name,"HydrologyGlaDSAnalysis")==0) return HydrologyGlaDSAnalysisEnum; - else stage=10; - } - if(stage==10){ - if (strcmp(name,"HydrologyGlaDS")==0) return HydrologyGlaDSEnum; + else if (strcmp(name,"HydrologyGlaDS")==0) return HydrologyGlaDSEnum; else if (strcmp(name,"HydrologyPismAnalysis")==0) return HydrologyPismAnalysisEnum; else if (strcmp(name,"HydrologyShaktiAnalysis")==0) return HydrologyShaktiAnalysisEnum; @@ -1240,12 +1244,12 @@ else if (strcmp(name,"P1DG")==0) return P1DGEnum; else if (strcmp(name,"P1P1")==0) return P1P1Enum; - else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; + else stage=11; + } + if(stage==11){ + if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; - else stage=11; - } - if(stage==11){ - if (strcmp(name,"P1xP3")==0) return P1xP3Enum; + else if (strcmp(name,"P1xP3")==0) return P1xP3Enum; else if (strcmp(name,"P1xP4")==0) return P1xP4Enum; else if (strcmp(name,"P2")==0) return P2Enum; @@ -1363,12 +1367,12 @@ else if (strcmp(name,"CalvingdevCoeff")==0) return CalvingdevCoeffEnum; else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum; - else if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum; + else stage=12; + } + if(stage==12){ + if (strcmp(name,"EtaAbsGradient")==0) return EtaAbsGradientEnum; else if (strcmp(name,"MeshZ")==0) return MeshZEnum; else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; else if (strcmp(name,"OutputdefinitionList")==0) return OutputdefinitionListEnum; - else stage=12; - } - if(stage==12){ - if (strcmp(name,"SealevelObs")==0) return SealevelObsEnum; + else if (strcmp(name,"SealevelObs")==0) return SealevelObsEnum; else if (strcmp(name,"SealevelWeights")==0) return SealevelWeightsEnum; else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;