Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 21582) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 21583) @@ -453,16 +453,16 @@ endif #}}} -#GiaIvins sources {{{ +#Gia sources {{{ if GIAIVINS -issm_sources += ./cores/giaivins_core.cpp\ +issm_sources += ./cores/gia_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 + ./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 endif #}}} Index: /issm/trunk-jpl/src/c/analyses/GiaIvinsAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/GiaIvinsAnalysis.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/analyses/GiaIvinsAnalysis.cpp (revision 21583) @@ -31,6 +31,6 @@ iomodel->FetchDataToInput(elements,"md.geometry.thickness",ThicknessEnum); - iomodel->FetchDataToInput(elements,"md.giaivins.mantle_viscosity",GiaIvinsMantleViscosityEnum); - iomodel->FetchDataToInput(elements,"md.giaivins.lithosphere_thickness",GiaIvinsLithosphereThicknessEnum); + iomodel->FetchDataToInput(elements,"md.gia.mantle_viscosity",GiaMantleViscosityEnum); + iomodel->FetchDataToInput(elements,"md.gia.lithosphere_thickness",GiaLithosphereThicknessEnum); iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum); }/*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 21582) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 21583) @@ -294,5 +294,5 @@ virtual void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0; - #ifdef _HAVE_GIA_ + #ifdef _HAVE_GIAIVINS_ virtual void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y)=0; #endif Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 21583) @@ -3536,5 +3536,5 @@ /*}}}*/ -#ifdef _HAVE_GIA_ +#ifdef _HAVE_GIAIVINS_ void Penta::GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){/*{{{*/ _error_("GIA deflection not implemented yet!"); Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 21582) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 21583) @@ -182,5 +182,5 @@ #endif - #ifdef _HAVE_GIA_ + #ifdef _HAVE_GIAIVINS_ void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); #endif Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 21582) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 21583) @@ -165,5 +165,5 @@ IssmDouble GetAreaSpherical(void){_error_("not implemented yet!");}; -#ifdef _HAVE_GIA_ +#ifdef _HAVE_GIAIVINS_ void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");}; #endif Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 21582) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 21583) @@ -172,5 +172,5 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); -#ifdef _HAVE_GIA_ +#ifdef _HAVE_GIAIVINS_ void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y){_error_("not implemented yet");}; #endif Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 21583) @@ -15,5 +15,5 @@ #include "../classes.h" #include "../../shared/shared.h" -#ifdef _HAVE_GIA_ +#ifdef _HAVE_GIAIVINS_ #include "../../modules/GiaDeflectionCorex/GiaDeflectionCorex.h" #endif @@ -3453,5 +3453,5 @@ /*}}}*/ -#ifdef _HAVE_GIA_ +#ifdef _HAVE_GIAIVINS_ void Tria::GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x, IssmDouble* y){/*{{{*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 21582) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 21583) @@ -141,5 +141,5 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); - #ifdef _HAVE_GIA_ + #ifdef _HAVE_GIAIVINS_ void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); #endif Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 21583) @@ -2317,5 +2317,5 @@ /*}}}*/ #endif -#ifdef _HAVE_GIA_ +#ifdef _HAVE_GIAIVINS_ void FemModel::Deflection(Vector* wg,Vector* dwgdt, IssmDouble* x, IssmDouble* y){ /*{{{*/ Index: /issm/trunk-jpl/src/c/classes/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.h (revision 21582) +++ /issm/trunk-jpl/src/c/classes/FemModel.h (revision 21583) @@ -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/cores/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 21583) @@ -66,5 +66,5 @@ break; case GiaSolutionEnum: - #if _HAVE_GIA_ + #if _HAVE_GIAIVINS_ solutioncore=&gia_core; #else Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 21583) @@ -140,5 +140,5 @@ if(isgia){ if(VerboseSolution()) _printf0_(" computing glacial isostatic adjustment\n"); - #ifdef _HAVE_GIA_ + #ifdef _HAVE_GIAIVINS_ gia_core(femmodel); #else Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21582) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 21583) @@ -335,6 +335,6 @@ ThermalNumRequestedOutputsEnum, ThermalRequestedOutputsEnum, - GiaIvinsMantleViscosityEnum, - GiaIvinsLithosphereThicknessEnum, + GiaMantleViscosityEnum, + GiaLithosphereThicknessEnum, ThicknessEnum, TimesteppingStartTimeEnum, @@ -350,5 +350,5 @@ TransientIsmasstransportEnum, TransientIsthermalEnum, - TransientIsgiaivinsEnum, + TransientIsgiaEnum, TransientIsesaEnum, TransientIsdamageevolutionEnum, @@ -568,7 +568,7 @@ DivergenceEnum, MaxDivergenceEnum, - GiaIvinsCrossSectionShapeEnum, - GiaIvinsdWdtEnum, - GiaIvinsWEnum, + GiaCrossSectionShapeEnum, + GiadWdtEnum, + GiaWEnum, /*}}}*/ /*Results{{{*/ @@ -931,5 +931,5 @@ TransientSolutionEnum, UzawaPressureAnalysisEnum, - GiaIvinsSolutionEnum, + GiaSolutionEnum, GiaIvinsAnalysisEnum, EsaSolutionEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 21583) @@ -341,6 +341,6 @@ case ThermalNumRequestedOutputsEnum : return "ThermalNumRequestedOutputs"; case ThermalRequestedOutputsEnum : return "ThermalRequestedOutputs"; - case GiaIvinsMantleViscosityEnum : return "GiaIvinsMantleViscosity"; - case GiaIvinsLithosphereThicknessEnum : return "GiaIvinsLithosphereThickness"; + case GiaMantleViscosityEnum : return "GiaMantleViscosity"; + case GiaLithosphereThicknessEnum : return "GiaLithosphereThickness"; case ThicknessEnum : return "Thickness"; case TimesteppingStartTimeEnum : return "TimesteppingStartTime"; @@ -356,5 +356,5 @@ case TransientIsmasstransportEnum : return "TransientIsmasstransport"; case TransientIsthermalEnum : return "TransientIsthermal"; - case TransientIsgiaivinsEnum : return "TransientIsgiaivins"; + case TransientIsgiaEnum : return "TransientIsgia"; case TransientIsesaEnum : return "TransientIsesa"; case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution"; @@ -566,7 +566,7 @@ case DivergenceEnum : return "Divergence"; case MaxDivergenceEnum : return "MaxDivergence"; - case GiaIvinsCrossSectionShapeEnum : return "GiaIvinsCrossSectionShape"; - case GiaIvinsdWdtEnum : return "GiaIvinsdWdt"; - case GiaIvinsWEnum : return "GiaIvinsW"; + case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape"; + case GiadWdtEnum : return "GiadWdt"; + case GiaWEnum : return "GiaW"; case SaveResultsEnum : return "SaveResults"; case BoolExternalResultEnum : return "BoolExternalResult"; @@ -901,5 +901,5 @@ case TransientSolutionEnum : return "TransientSolution"; case UzawaPressureAnalysisEnum : return "UzawaPressureAnalysis"; - case GiaIvinsSolutionEnum : return "GiaIvinsSolution"; + case GiaSolutionEnum : return "GiaSolution"; case GiaIvinsAnalysisEnum : return "GiaIvinsAnalysis"; case EsaSolutionEnum : return "EsaSolution"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21582) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 21583) @@ -347,6 +347,6 @@ else if (strcmp(name,"ThermalNumRequestedOutputs")==0) return ThermalNumRequestedOutputsEnum; else if (strcmp(name,"ThermalRequestedOutputs")==0) return ThermalRequestedOutputsEnum; - else if (strcmp(name,"GiaIvinsMantleViscosity")==0) return GiaIvinsMantleViscosityEnum; - else if (strcmp(name,"GiaIvinsLithosphereThickness")==0) return GiaIvinsLithosphereThicknessEnum; + else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum; + else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum; else if (strcmp(name,"Thickness")==0) return ThicknessEnum; else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; @@ -362,5 +362,5 @@ else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum; else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; - else if (strcmp(name,"TransientIsgiaivins")==0) return TransientIsgiaivinsEnum; + else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum; else if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum; else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum; @@ -578,7 +578,7 @@ else if (strcmp(name,"Divergence")==0) return DivergenceEnum; else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum; - 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,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; + else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; + else if (strcmp(name,"GiaW")==0) return GiaWEnum; else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; @@ -922,5 +922,5 @@ else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum; - else if (strcmp(name,"GiaIvinsSolution")==0) return GiaIvinsSolutionEnum; + else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum; else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum; else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;