Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 21528) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 21529) @@ -453,16 +453,16 @@ endif #}}} -#Gia sources {{{ -if GIA -issm_sources += ./cores/gia_core.cpp\ - ./analyses/GiaAnalysis.cpp\ - ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp\ - ./modules/GiaDeflectionCorex/distme.f\ - ./modules/GiaDeflectionCorex/freed.f\ - ./modules/GiaDeflectionCorex/ojrule.f\ - ./modules/GiaDeflectionCorex/pwise.f\ - ./modules/GiaDeflectionCorex/qwise.f\ - ./modules/GiaDeflectionCorex/stot.f\ - ./modules/GiaDeflectionCorex/what0.f +#GiaIvins sources {{{ +if GIAIVINS +issm_sources += ./cores/giaivins_core.cpp\ + ./analyses/GiaIvinsAnalysis.cpp\ + ./modules/GiaIvinsDeflectionCorex/GiaIvinsDeflectionCorex.cpp\ + ./modules/GiaIvinsDeflectionCorex/distme.f\ + ./modules/GiaIvinsDeflectionCorex/freed.f\ + ./modules/GiaIvinsDeflectionCorex/ojrule.f\ + ./modules/GiaIvinsDeflectionCorex/pwise.f\ + ./modules/GiaIvinsDeflectionCorex/qwise.f\ + ./modules/GiaIvinsDeflectionCorex/stot.f\ + ./modules/GiaIvinsDeflectionCorex/what0.f endif #}}} Index: /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp (revision 21529) @@ -104,6 +104,6 @@ case UzawaPressureAnalysisEnum : return new UzawaPressureAnalysis(); #endif - #ifdef _HAVE_GIA_ - case GiaAnalysisEnum : return new GiaAnalysis(); + #ifdef _HAVE_GIAIVINS_ + case GiaIvinsAnalysisEnum : return new GiaIvinsAnalysis(); #endif #ifdef _HAVE_ESA_ Index: /issm/trunk-jpl/src/c/analyses/analyses.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/analyses.h (revision 21528) +++ /issm/trunk-jpl/src/c/analyses/analyses.h (revision 21529) @@ -23,5 +23,5 @@ #include "./FreeSurfaceBaseAnalysis.h" #include "./FreeSurfaceTopAnalysis.h" -#include "./GiaAnalysis.h" +#include "./GiaIvinsAnalysis.h" #include "./EsaAnalysis.h" #include "./HydrologyDCEfficientAnalysis.h" Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 21529) @@ -1562,6 +1562,6 @@ name==EsaEmotionEnum || name==EsaDeltathicknessEnum || - name==GiaWEnum || - name==GiadWdtEnum || + name==GiaIvinsWEnum || + name==GiaIvinsdWdtEnum || name==SedimentHeadEnum || name==EplHeadEnum || Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 21529) @@ -294,6 +294,6 @@ virtual void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0; - #ifdef _HAVE_GIA_ - virtual void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y)=0; + #ifdef _HAVE_GIAIVINS_ + virtual void GiaIvinsDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y)=0; #endif #ifdef _HAVE_ESA_ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 21529) @@ -3536,7 +3536,7 @@ /*}}}*/ -#ifdef _HAVE_GIA_ -void Penta::GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){/*{{{*/ - _error_("GIA deflection not implemented yet!"); +#ifdef _HAVE_GIAIVINS_ +void Penta::GiaIvinsDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){/*{{{*/ + _error_("GIAIVINS deflection not implemented yet!"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 21529) @@ -182,6 +182,6 @@ #endif - #ifdef _HAVE_GIA_ - void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); + #ifdef _HAVE_GIAIVINS_ + void GiaIvinsDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); #endif #ifdef _HAVE_ESA_ Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 21529) @@ -165,6 +165,6 @@ IssmDouble GetAreaSpherical(void){_error_("not implemented yet!");}; -#ifdef _HAVE_GIA_ - void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");}; +#ifdef _HAVE_GIAIVINS_ + void GiaIvinsDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");}; #endif #ifdef _HAVE_ESA_ Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 21529) @@ -172,6 +172,6 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); -#ifdef _HAVE_GIA_ - void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");}; +#ifdef _HAVE_GIAIVINS_ + void GiaIvinsDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");}; #endif #ifdef _HAVE_ESA_ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21529) @@ -15,6 +15,6 @@ #include "../classes.h" #include "../../shared/shared.h" -#ifdef _HAVE_GIA_ -#include "../../modules/GiaDeflectionCorex/GiaDeflectionCorex.h" +#ifdef _HAVE_GIAIVINS_ +#include "../../modules/GiaIvinsDeflectionCorex/GiaIvinsDeflectionCorex.h" #endif /*}}}*/ @@ -3453,6 +3453,6 @@ /*}}}*/ -#ifdef _HAVE_GIA_ -void Tria::GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x, IssmDouble* y){/*{{{*/ +#ifdef _HAVE_GIAIVINS_ +void Tria::GiaIvinsDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x, IssmDouble* y){/*{{{*/ int i; @@ -3492,6 +3492,6 @@ IssmDouble dwidt; - /*arguments to GiaDeflectionCorex: */ - GiaDeflectionCoreArgs arguments; + /*arguments to GiaIvinsDeflectionCorex: */ + GiaIvinsDeflectionCoreArgs arguments; /*how many dofs are we working with here? */ @@ -3500,5 +3500,5 @@ /*recover gia solution parameters: */ - this->parameters->FindParam(&cross_section_shape,GiaCrossSectionShapeEnum); + this->parameters->FindParam(&cross_section_shape,GiaIvinsCrossSectionShapeEnum); /*what time is it? :*/ @@ -3518,10 +3518,10 @@ /*recover mantle viscosity: */ - mantle_viscosity_input=inputs->GetInput(GiaMantleViscosityEnum); + mantle_viscosity_input=inputs->GetInput(GiaIvinsMantleViscosityEnum); if (!mantle_viscosity_input)_error_("mantle viscosity input needed to compute gia deflection!"); mantle_viscosity_input->GetInputAverage(&mantle_viscosity); /*recover lithosphere thickness: */ - lithosphere_thickness_input=inputs->GetInput(GiaLithosphereThicknessEnum); + lithosphere_thickness_input=inputs->GetInput(GiaIvinsLithosphereThicknessEnum); if (!lithosphere_thickness_input)_error_("lithosphere thickness input needed to compute gia deflection!"); lithosphere_thickness_input->GetInputAverage(&lithosphere_thickness); @@ -3538,5 +3538,5 @@ y0=(xyz_list[0][1]+xyz_list[1][1]+xyz_list[2][1])/3.0; - /*start loading GiaDeflectionCore arguments: */ + /*start loading GiaIvinsDeflectionCore arguments: */ arguments.re=re; arguments.hes=hes; @@ -3564,5 +3564,5 @@ /*for this Tria, compute contribution to rebound at vertex i: */ - GiaDeflectionCorex(&wi,&dwidt,&arguments); + GiaIvinsDeflectionCorex(&wi,&dwidt,&arguments); /*plug value into solution vector: */ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 21528) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 21529) @@ -141,6 +141,6 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); - #ifdef _HAVE_GIA_ - void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); + #ifdef _HAVE_GIAIVINS_ + void GiaIvinsDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); #endif #ifdef _HAVE_ESA_ Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 21529) @@ -630,6 +630,6 @@ break; - case GiaSolutionEnum: - analyses_temp[numanalyses++]=GiaAnalysisEnum; + case GiaIvinsSolutionEnum: + analyses_temp[numanalyses++]=GiaIvinsAnalysisEnum; break; @@ -651,5 +651,5 @@ case TransientSolutionEnum:{ - bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr,isesa,isgia; + bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr,isesa,isgiaivins; iomodel->FindConstant(&isSIA,"md.flowequation.isSIA"); iomodel->FindConstant(&isFS,"md.flowequation.isFS"); @@ -665,5 +665,5 @@ iomodel->FindConstant(&isslr,"md.transient.isslr"); iomodel->FindConstant(&isesa,"md.transient.isesa"); - iomodel->FindConstant(&isgia,"md.transient.isgia"); + iomodel->FindConstant(&isgiaivins,"md.transient.isgiaivins"); if(isstressbalance){ int fe_FS; @@ -712,6 +712,6 @@ analyses_temp[numanalyses++]=EsaAnalysisEnum; } - if(isgia){ - analyses_temp[numanalyses++]=GiaAnalysisEnum; + if(isgiaivins){ + analyses_temp[numanalyses++]=GiaIvinsAnalysisEnum; } @@ -2319,5 +2319,5 @@ /*}}}*/ #endif -#ifdef _HAVE_GIA_ +#ifdef _HAVE_GIAIVINS_ void FemModel::Deflection(Vector* wg,Vector* dwgdt, IssmDouble* x, IssmDouble* y){ /*{{{*/ @@ -2325,5 +2325,5 @@ for(int i=0;iSize();i++){ Element* element=xDynamicCast(elements->GetObjectByOffset(i)); - element->GiaDeflection(wg,dwgdt, x,y); + element->GiaIvinsDeflection(wg,dwgdt, x,y); } } Index: /issm/trunk-jpl/src/c/classes/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.h (revision 21528) +++ /issm/trunk-jpl/src/c/classes/FemModel.h (revision 21529) @@ -117,5 +117,5 @@ void ThicknessAbsGradientx( IssmDouble* pJ); void ThicknessPositivex(IssmDouble* pJ); - #ifdef _HAVE_GIA_ + #ifdef _HAVE_GIAIVINS_ void Deflection(Vector* wg,Vector* dwgdt, IssmDouble* x, IssmDouble* y); #endif Index: /issm/trunk-jpl/src/c/classes/classes.h =================================================================== --- /issm/trunk-jpl/src/c/classes/classes.h (revision 21528) +++ /issm/trunk-jpl/src/c/classes/classes.h (revision 21529) @@ -126,5 +126,5 @@ #include "./Update.h" #include "./FemModel.h" -#include "./GiaDeflectionCoreArgs.h" +#include "./GiaIvinsDeflectionCoreArgs.h" #include "./RiftStruct.h" Index: /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 21529) @@ -65,9 +65,9 @@ solutioncore=&esa_core; break; - case GiaSolutionEnum: - #if _HAVE_GIA_ - solutioncore=&gia_core; + case GiaIvinsSolutionEnum: + #if _HAVE_GIAIVINS_ + solutioncore=&giaivins_core; #else - _error_("ISSM not compiled with Gia capability"); + _error_("ISSM not compiled with Gia Ivins capability"); #endif break; Index: /issm/trunk-jpl/src/c/cores/cores.h =================================================================== --- /issm/trunk-jpl/src/c/cores/cores.h (revision 21528) +++ /issm/trunk-jpl/src/c/cores/cores.h (revision 21529) @@ -46,5 +46,5 @@ void adgradient_core(FemModel* femmodel); void dummy_core(FemModel* femmodel); -void gia_core(FemModel* femmodel); +void giaivins_core(FemModel* femmodel); void esa_core(FemModel* femmodel); void smb_core(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 21529) @@ -21,5 +21,5 @@ /*parameters: */ IssmDouble finaltime,dt,yts; - bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology; + bool isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgiaivins,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology; bool save_results,dakota_analysis; bool time_adapt; @@ -53,5 +53,5 @@ femmodel->parameters->FindParam(&issmb,TransientIssmbEnum); femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum); - femmodel->parameters->FindParam(&isgia,TransientIsgiaEnum); + femmodel->parameters->FindParam(&isgiaivins,TransientIsgiaivinsEnum); femmodel->parameters->FindParam(&isslr,TransientIsslrEnum); femmodel->parameters->FindParam(&iscoupler,TransientIscouplerEnum); @@ -130,8 +130,8 @@ FloatingiceMeltingRatex(femmodel); - if(isgia){ + if(isgiaivins){ if(VerboseSolution()) _printf0_(" computing glacial isostatic adjustment\n"); - #ifdef _HAVE_GIA_ - gia_core(femmodel); + #ifdef _HAVE_GIAIVINS_ + giaivins_core(femmodel); #else _error_("ISSM was not compiled with gia capabilities. Exiting"); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 21529) @@ -77,5 +77,5 @@ parameters->AddObject(iomodel->CopyConstantObject("md.transient.isthermal",TransientIsthermalEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.transient.isgroundingline",TransientIsgroundinglineEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.transient.isgia",TransientIsgiaEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.transient.isgiaivins",TransientIsgiaivinsEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.transient.isesa",TransientIsesaEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.transient.isdamageevolution",TransientIsdamageevolutionEnum)); @@ -85,5 +85,5 @@ parameters->AddObject(iomodel->CopyConstantObject("md.transient.iscoupler",TransientIscouplerEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.materials.rheology_law",MaterialsRheologyLawEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.gia.cross_section_shape",GiaCrossSectionShapeEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.giaivins.cross_section_shape",GiaIvinsCrossSectionShapeEnum)); /*For stress balance only*/ Index: /issm/trunk-jpl/src/c/modules/modules.h =================================================================== --- /issm/trunk-jpl/src/c/modules/modules.h (revision 21528) +++ /issm/trunk-jpl/src/c/modules/modules.h (revision 21529) @@ -29,5 +29,5 @@ #include "./GetVectorFromInputsx/GetVectorFromInputsx.h" #include "./GetVectorFromControlInputsx/GetVectorFromControlInputsx.h" -#include "./GiaDeflectionCorex/GiaDeflectionCorex.h" +#include "./GiaIvinsDeflectionCorex/GiaIvinsDeflectionCorex.h" #include "./SetControlInputsFromVectorx/SetControlInputsFromVectorx.h" #include "./SetActiveNodesLSMx/SetActiveNodesLSMx.h" Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21528) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21529) @@ -331,6 +331,6 @@ ThermalNumRequestedOutputsEnum, ThermalRequestedOutputsEnum, - GiaMantleViscosityEnum, - GiaLithosphereThicknessEnum, + GiaIvinsMantleViscosityEnum, + GiaIvinsLithosphereThicknessEnum, ThicknessEnum, TimesteppingStartTimeEnum, @@ -346,5 +346,5 @@ TransientIsmasstransportEnum, TransientIsthermalEnum, - TransientIsgiaEnum, + TransientIsgiaivinsEnum, TransientIsesaEnum, TransientIsdamageevolutionEnum, @@ -564,7 +564,7 @@ DivergenceEnum, MaxDivergenceEnum, - GiaCrossSectionShapeEnum, - GiadWdtEnum, - GiaWEnum, + GiaIvinsCrossSectionShapeEnum, + GiaIvinsdWdtEnum, + GiaIvinsWEnum, /*}}}*/ /*Results{{{*/ @@ -927,6 +927,6 @@ TransientSolutionEnum, UzawaPressureAnalysisEnum, - GiaSolutionEnum, - GiaAnalysisEnum, + GiaIvinsSolutionEnum, + GiaIvinsAnalysisEnum, EsaSolutionEnum, EsaAnalysisEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21529) @@ -337,6 +337,6 @@ case ThermalNumRequestedOutputsEnum : return "ThermalNumRequestedOutputs"; case ThermalRequestedOutputsEnum : return "ThermalRequestedOutputs"; - case GiaMantleViscosityEnum : return "GiaMantleViscosity"; - case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness"; + case GiaIvinsMantleViscosityEnum : return "GiaIvinsMantleViscosity"; + case GiaIvinsLithosphereThicknessEnum : return "GiaIvinsLithosphereThickness"; case ThicknessEnum : return "Thickness"; case TimesteppingStartTimeEnum : return "TimesteppingStartTime"; @@ -352,5 +352,5 @@ case TransientIsmasstransportEnum : return "TransientIsmasstransport"; case TransientIsthermalEnum : return "TransientIsthermal"; - case TransientIsgiaEnum : return "TransientIsgia"; + case TransientIsgiaivinsEnum : return "TransientIsgiaivins"; case TransientIsesaEnum : return "TransientIsesa"; case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution"; @@ -562,7 +562,7 @@ case DivergenceEnum : return "Divergence"; case MaxDivergenceEnum : return "MaxDivergence"; - case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape"; - case GiadWdtEnum : return "GiadWdt"; - case GiaWEnum : return "GiaW"; + case GiaIvinsCrossSectionShapeEnum : return "GiaIvinsCrossSectionShape"; + case GiaIvinsdWdtEnum : return "GiaIvinsdWdt"; + case GiaIvinsWEnum : return "GiaIvinsW"; case SaveResultsEnum : return "SaveResults"; case BoolExternalResultEnum : return "BoolExternalResult"; @@ -897,6 +897,6 @@ case TransientSolutionEnum : return "TransientSolution"; case UzawaPressureAnalysisEnum : return "UzawaPressureAnalysis"; - case GiaSolutionEnum : return "GiaSolution"; - case GiaAnalysisEnum : return "GiaAnalysis"; + case GiaIvinsSolutionEnum : return "GiaIvinsSolution"; + case GiaIvinsAnalysisEnum : return "GiaIvinsAnalysis"; case EsaSolutionEnum : return "EsaSolution"; case EsaAnalysisEnum : return "EsaAnalysis"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21528) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21529) @@ -343,6 +343,6 @@ else if (strcmp(name,"ThermalNumRequestedOutputs")==0) return ThermalNumRequestedOutputsEnum; else if (strcmp(name,"ThermalRequestedOutputs")==0) return ThermalRequestedOutputsEnum; - else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum; - else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum; + else if (strcmp(name,"GiaIvinsMantleViscosity")==0) return GiaIvinsMantleViscosityEnum; + else if (strcmp(name,"GiaIvinsLithosphereThickness")==0) return GiaIvinsLithosphereThicknessEnum; else if (strcmp(name,"Thickness")==0) return ThicknessEnum; else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; @@ -358,5 +358,5 @@ else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum; else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; - else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum; + else if (strcmp(name,"TransientIsgiaivins")==0) return TransientIsgiaivinsEnum; else if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum; else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum; @@ -574,7 +574,7 @@ else if (strcmp(name,"Divergence")==0) return DivergenceEnum; else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum; - else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; - else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; - else if (strcmp(name,"GiaW")==0) return GiaWEnum; + else if (strcmp(name,"GiaIvinsCrossSectionShape")==0) return GiaIvinsCrossSectionShapeEnum; + else if (strcmp(name,"GiaIvinsdWdt")==0) return GiaIvinsdWdtEnum; + else if (strcmp(name,"GiaIvinsW")==0) return GiaIvinsWEnum; else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; @@ -918,6 +918,6 @@ else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum; - else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum; - else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum; + else if (strcmp(name,"GiaIvinsSolution")==0) return GiaIvinsSolutionEnum; + else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum; else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum; else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;