Index: /issm/oecreview/Archive/12678-13393/Date.tex =================================================================== --- /issm/oecreview/Archive/12678-13393/Date.tex (revision 13394) +++ /issm/oecreview/Archive/12678-13393/Date.tex (revision 13394) @@ -0,0 +1,1 @@ +Sep-19-2012 Index: /issm/oecreview/Archive/12678-13393/ISSM-12682-12683.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12682-12683.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12682-12683.diff (revision 13394) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12682) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12683) +@@ -97,7 +97,7 @@ + #footer + cat <> $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp + /*If we reach this point, the string provided has not been found*/ +- _error_("Enum %s not found",name); ++ _error2_("Enum " << name << " not found"); + } + END + #}}} Index: /issm/oecreview/Archive/12678-13393/ISSM-12683-12684.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12683-12684.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12683-12684.diff (revision 13394) @@ -0,0 +1,11 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12683) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12684) +@@ -477,5 +477,5 @@ + else stage=5; + } + /*If we reach this point, the string provided has not been found*/ +- _error2_("Enum " << name << " not found"); ++ _error2_("Enum " << name << " not found"); + } Index: /issm/oecreview/Archive/12678-13393/ISSM-12684-12685.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12684-12685.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12684-12685.diff (revision 13394) @@ -0,0 +1,4631 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsSmbPosMinEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsSmbPosMinEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsSmbPosMinEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsSmbPosMinEnum() ++%SURFACEFORCINGSSMBPOSMINENUM - Enum of SurfaceforcingsSmbPosMin ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsSmbPosMinEnum() ++ ++macro=StringToEnum('SurfaceforcingsSmbPosMin'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsHcEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsHcEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsHcEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsHcEnum() ++%SURFACEFORCINGSHCENUM - Enum of SurfaceforcingsHc ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsHcEnum() ++ ++macro=StringToEnum('SurfaceforcingsHc'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsBPosEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsBPosEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsBPosEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsBPosEnum() ++%SURFACEFORCINGSBPOSENUM - Enum of SurfaceforcingsBPos ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsBPosEnum() ++ ++macro=StringToEnum('SurfaceforcingsBPos'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsBNegEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsBNegEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsBNegEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsBNegEnum() ++%SURFACEFORCINGSBNEGENUM - Enum of SurfaceforcingsBNeg ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsBNegEnum() ++ ++macro=StringToEnum('SurfaceforcingsBNeg'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsSmbPosMaxEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsSmbPosMaxEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsSmbPosMaxEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsSmbPosMaxEnum() ++%SURFACEFORCINGSSMBPOSMAXENUM - Enum of SurfaceforcingsSmbPosMax ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsSmbPosMaxEnum() ++ ++macro=StringToEnum('SurfaceforcingsSmbPosMax'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 12685) +@@ -0,0 +1,4498 @@ ++""" ++ ++ WARNING: DO NOT MODIFY THIS FILE ++ this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++ Please read src/c/EnumDefinitions/README for more information ++ ++""" ++ ++def AutodiffForwardEnum(): ++ """ ++ AUTODIFFFORWARDENUM - Enum of AutodiffForward ++ ++ Usage: ++ macro=AutodiffForwardEnum() ++ """ ++ ++ return StringToEnum('AutodiffForward') ++ ++def AutodiffIsautodiffEnum(): ++ """ ++ AUTODIFFISAUTODIFFENUM - Enum of AutodiffIsautodiff ++ ++ Usage: ++ macro=AutodiffIsautodiffEnum() ++ """ ++ ++ return StringToEnum('AutodiffIsautodiff') ++ ++def AutodiffReverseEnum(): ++ """ ++ AUTODIFFREVERSEENUM - Enum of AutodiffReverse ++ ++ Usage: ++ macro=AutodiffReverseEnum() ++ """ ++ ++ return StringToEnum('AutodiffReverse') ++ ++def BalancethicknessSpcthicknessEnum(): ++ """ ++ BALANCETHICKNESSSPCTHICKNESSENUM - Enum of BalancethicknessSpcthickness ++ ++ Usage: ++ macro=BalancethicknessSpcthicknessEnum() ++ """ ++ ++ return StringToEnum('BalancethicknessSpcthickness') ++ ++def BalancethicknessStabilizationEnum(): ++ """ ++ BALANCETHICKNESSSTABILIZATIONENUM - Enum of BalancethicknessStabilization ++ ++ Usage: ++ macro=BalancethicknessStabilizationEnum() ++ """ ++ ++ return StringToEnum('BalancethicknessStabilization') ++ ++def BalancethicknessThickeningRateEnum(): ++ """ ++ BALANCETHICKNESSTHICKENINGRATEENUM - Enum of BalancethicknessThickeningRate ++ ++ Usage: ++ macro=BalancethicknessThickeningRateEnum() ++ """ ++ ++ return StringToEnum('BalancethicknessThickeningRate') ++ ++def BasalforcingsGeothermalfluxEnum(): ++ """ ++ BASALFORCINGSGEOTHERMALFLUXENUM - Enum of BasalforcingsGeothermalflux ++ ++ Usage: ++ macro=BasalforcingsGeothermalfluxEnum() ++ """ ++ ++ return StringToEnum('BasalforcingsGeothermalflux') ++ ++def BasalforcingsMeltingRateCorrectionEnum(): ++ """ ++ BASALFORCINGSMELTINGRATECORRECTIONENUM - Enum of BasalforcingsMeltingRateCorrection ++ ++ Usage: ++ macro=BasalforcingsMeltingRateCorrectionEnum() ++ """ ++ ++ return StringToEnum('BasalforcingsMeltingRateCorrection') ++ ++def BasalforcingsMeltingRateEnum(): ++ """ ++ BASALFORCINGSMELTINGRATEENUM - Enum of BasalforcingsMeltingRate ++ ++ Usage: ++ macro=BasalforcingsMeltingRateEnum() ++ """ ++ ++ return StringToEnum('BasalforcingsMeltingRate') ++ ++def BathymetryEnum(): ++ """ ++ BATHYMETRYENUM - Enum of Bathymetry ++ ++ Usage: ++ macro=BathymetryEnum() ++ """ ++ ++ return StringToEnum('Bathymetry') ++ ++def BedEnum(): ++ """ ++ BEDENUM - Enum of Bed ++ ++ Usage: ++ macro=BedEnum() ++ """ ++ ++ return StringToEnum('Bed') ++ ++def ConstantsGEnum(): ++ """ ++ CONSTANTSGENUM - Enum of ConstantsG ++ ++ Usage: ++ macro=ConstantsGEnum() ++ """ ++ ++ return StringToEnum('ConstantsG') ++ ++def ConstantsReferencetemperatureEnum(): ++ """ ++ CONSTANTSREFERENCETEMPERATUREENUM - Enum of ConstantsReferencetemperature ++ ++ Usage: ++ macro=ConstantsReferencetemperatureEnum() ++ """ ++ ++ return StringToEnum('ConstantsReferencetemperature') ++ ++def ConstantsYtsEnum(): ++ """ ++ CONSTANTSYTSENUM - Enum of ConstantsYts ++ ++ Usage: ++ macro=ConstantsYtsEnum() ++ """ ++ ++ return StringToEnum('ConstantsYts') ++ ++def DiagnosticAbstolEnum(): ++ """ ++ DIAGNOSTICABSTOLENUM - Enum of DiagnosticAbstol ++ ++ Usage: ++ macro=DiagnosticAbstolEnum() ++ """ ++ ++ return StringToEnum('DiagnosticAbstol') ++ ++def DiagnosticIcefrontEnum(): ++ """ ++ DIAGNOSTICICEFRONTENUM - Enum of DiagnosticIcefront ++ ++ Usage: ++ macro=DiagnosticIcefrontEnum() ++ """ ++ ++ return StringToEnum('DiagnosticIcefront') ++ ++def DiagnosticIsnewtonEnum(): ++ """ ++ DIAGNOSTICISNEWTONENUM - Enum of DiagnosticIsnewton ++ ++ Usage: ++ macro=DiagnosticIsnewtonEnum() ++ """ ++ ++ return StringToEnum('DiagnosticIsnewton') ++ ++def DiagnosticMaxiterEnum(): ++ """ ++ DIAGNOSTICMAXITERENUM - Enum of DiagnosticMaxiter ++ ++ Usage: ++ macro=DiagnosticMaxiterEnum() ++ """ ++ ++ return StringToEnum('DiagnosticMaxiter') ++ ++def DiagnosticNumRequestedOutputsEnum(): ++ """ ++ DIAGNOSTICNUMREQUESTEDOUTPUTSENUM - Enum of DiagnosticNumRequestedOutputs ++ ++ Usage: ++ macro=DiagnosticNumRequestedOutputsEnum() ++ """ ++ ++ return StringToEnum('DiagnosticNumRequestedOutputs') ++ ++def DiagnosticPenaltyFactorEnum(): ++ """ ++ DIAGNOSTICPENALTYFACTORENUM - Enum of DiagnosticPenaltyFactor ++ ++ Usage: ++ macro=DiagnosticPenaltyFactorEnum() ++ """ ++ ++ return StringToEnum('DiagnosticPenaltyFactor') ++ ++def DiagnosticReferentialEnum(): ++ """ ++ DIAGNOSTICREFERENTIALENUM - Enum of DiagnosticReferential ++ ++ Usage: ++ macro=DiagnosticReferentialEnum() ++ """ ++ ++ return StringToEnum('DiagnosticReferential') ++ ++def DiagnosticReltolEnum(): ++ """ ++ DIAGNOSTICRELTOLENUM - Enum of DiagnosticReltol ++ ++ Usage: ++ macro=DiagnosticReltolEnum() ++ """ ++ ++ return StringToEnum('DiagnosticReltol') ++ ++def DiagnosticRequestedOutputsEnum(): ++ """ ++ DIAGNOSTICREQUESTEDOUTPUTSENUM - Enum of DiagnosticRequestedOutputs ++ ++ Usage: ++ macro=DiagnosticRequestedOutputsEnum() ++ """ ++ ++ return StringToEnum('DiagnosticRequestedOutputs') ++ ++def DiagnosticRestolEnum(): ++ """ ++ DIAGNOSTICRESTOLENUM - Enum of DiagnosticRestol ++ ++ Usage: ++ macro=DiagnosticRestolEnum() ++ """ ++ ++ return StringToEnum('DiagnosticRestol') ++ ++def DiagnosticRiftPenaltyLockEnum(): ++ """ ++ DIAGNOSTICRIFTPENALTYLOCKENUM - Enum of DiagnosticRiftPenaltyLock ++ ++ Usage: ++ macro=DiagnosticRiftPenaltyLockEnum() ++ """ ++ ++ return StringToEnum('DiagnosticRiftPenaltyLock') ++ ++def DiagnosticRiftPenaltyThresholdEnum(): ++ """ ++ DIAGNOSTICRIFTPENALTYTHRESHOLDENUM - Enum of DiagnosticRiftPenaltyThreshold ++ ++ Usage: ++ macro=DiagnosticRiftPenaltyThresholdEnum() ++ """ ++ ++ return StringToEnum('DiagnosticRiftPenaltyThreshold') ++ ++def DiagnosticShelfDampeningEnum(): ++ """ ++ DIAGNOSTICSHELFDAMPENINGENUM - Enum of DiagnosticShelfDampening ++ ++ Usage: ++ macro=DiagnosticShelfDampeningEnum() ++ """ ++ ++ return StringToEnum('DiagnosticShelfDampening') ++ ++def DiagnosticSpcvxEnum(): ++ """ ++ DIAGNOSTICSPCVXENUM - Enum of DiagnosticSpcvx ++ ++ Usage: ++ macro=DiagnosticSpcvxEnum() ++ """ ++ ++ return StringToEnum('DiagnosticSpcvx') ++ ++def DiagnosticSpcvyEnum(): ++ """ ++ DIAGNOSTICSPCVYENUM - Enum of DiagnosticSpcvy ++ ++ Usage: ++ macro=DiagnosticSpcvyEnum() ++ """ ++ ++ return StringToEnum('DiagnosticSpcvy') ++ ++def DiagnosticSpcvzEnum(): ++ """ ++ DIAGNOSTICSPCVZENUM - Enum of DiagnosticSpcvz ++ ++ Usage: ++ macro=DiagnosticSpcvzEnum() ++ """ ++ ++ return StringToEnum('DiagnosticSpcvz') ++ ++def DiagnosticStokesreconditioningEnum(): ++ """ ++ DIAGNOSTICSTOKESRECONDITIONINGENUM - Enum of DiagnosticStokesreconditioning ++ ++ Usage: ++ macro=DiagnosticStokesreconditioningEnum() ++ """ ++ ++ return StringToEnum('DiagnosticStokesreconditioning') ++ ++def DiagnosticVertexPairingEnum(): ++ """ ++ DIAGNOSTICVERTEXPAIRINGENUM - Enum of DiagnosticVertexPairing ++ ++ Usage: ++ macro=DiagnosticVertexPairingEnum() ++ """ ++ ++ return StringToEnum('DiagnosticVertexPairing') ++ ++def DiagnosticViscosityOvershootEnum(): ++ """ ++ DIAGNOSTICVISCOSITYOVERSHOOTENUM - Enum of DiagnosticViscosityOvershoot ++ ++ Usage: ++ macro=DiagnosticViscosityOvershootEnum() ++ """ ++ ++ return StringToEnum('DiagnosticViscosityOvershoot') ++ ++def FlowequationBordermacayealEnum(): ++ """ ++ FLOWEQUATIONBORDERMACAYEALENUM - Enum of FlowequationBordermacayeal ++ ++ Usage: ++ macro=FlowequationBordermacayealEnum() ++ """ ++ ++ return StringToEnum('FlowequationBordermacayeal') ++ ++def FlowequationBorderpattynEnum(): ++ """ ++ FLOWEQUATIONBORDERPATTYNENUM - Enum of FlowequationBorderpattyn ++ ++ Usage: ++ macro=FlowequationBorderpattynEnum() ++ """ ++ ++ return StringToEnum('FlowequationBorderpattyn') ++ ++def FlowequationBorderstokesEnum(): ++ """ ++ FLOWEQUATIONBORDERSTOKESENUM - Enum of FlowequationBorderstokes ++ ++ Usage: ++ macro=FlowequationBorderstokesEnum() ++ """ ++ ++ return StringToEnum('FlowequationBorderstokes') ++ ++def FlowequationElementEquationEnum(): ++ """ ++ FLOWEQUATIONELEMENTEQUATIONENUM - Enum of FlowequationElementEquation ++ ++ Usage: ++ macro=FlowequationElementEquationEnum() ++ """ ++ ++ return StringToEnum('FlowequationElementEquation') ++ ++def FlowequationIshutterEnum(): ++ """ ++ FLOWEQUATIONISHUTTERENUM - Enum of FlowequationIshutter ++ ++ Usage: ++ macro=FlowequationIshutterEnum() ++ """ ++ ++ return StringToEnum('FlowequationIshutter') ++ ++def FlowequationIsmacayealpattynEnum(): ++ """ ++ FLOWEQUATIONISMACAYEALPATTYNENUM - Enum of FlowequationIsmacayealpattyn ++ ++ Usage: ++ macro=FlowequationIsmacayealpattynEnum() ++ """ ++ ++ return StringToEnum('FlowequationIsmacayealpattyn') ++ ++def FlowequationIsstokesEnum(): ++ """ ++ FLOWEQUATIONISSTOKESENUM - Enum of FlowequationIsstokes ++ ++ Usage: ++ macro=FlowequationIsstokesEnum() ++ """ ++ ++ return StringToEnum('FlowequationIsstokes') ++ ++def FlowequationVertexEquationEnum(): ++ """ ++ FLOWEQUATIONVERTEXEQUATIONENUM - Enum of FlowequationVertexEquation ++ ++ Usage: ++ macro=FlowequationVertexEquationEnum() ++ """ ++ ++ return StringToEnum('FlowequationVertexEquation') ++ ++def FrictionCoefficientEnum(): ++ """ ++ FRICTIONCOEFFICIENTENUM - Enum of FrictionCoefficient ++ ++ Usage: ++ macro=FrictionCoefficientEnum() ++ """ ++ ++ return StringToEnum('FrictionCoefficient') ++ ++def FrictionPEnum(): ++ """ ++ FRICTIONPENUM - Enum of FrictionP ++ ++ Usage: ++ macro=FrictionPEnum() ++ """ ++ ++ return StringToEnum('FrictionP') ++ ++def FrictionQEnum(): ++ """ ++ FRICTIONQENUM - Enum of FrictionQ ++ ++ Usage: ++ macro=FrictionQEnum() ++ """ ++ ++ return StringToEnum('FrictionQ') ++ ++def GeometryHydrostaticRatioEnum(): ++ """ ++ GEOMETRYHYDROSTATICRATIOENUM - Enum of GeometryHydrostaticRatio ++ ++ Usage: ++ macro=GeometryHydrostaticRatioEnum() ++ """ ++ ++ return StringToEnum('GeometryHydrostaticRatio') ++ ++def HydrologyCREnum(): ++ """ ++ HYDROLOGYCRENUM - Enum of HydrologyCR ++ ++ Usage: ++ macro=HydrologyCREnum() ++ """ ++ ++ return StringToEnum('HydrologyCR') ++ ++def HydrologyKnEnum(): ++ """ ++ HYDROLOGYKNENUM - Enum of HydrologyKn ++ ++ Usage: ++ macro=HydrologyKnEnum() ++ """ ++ ++ return StringToEnum('HydrologyKn') ++ ++def HydrologyNEnum(): ++ """ ++ HYDROLOGYNENUM - Enum of HydrologyN ++ ++ Usage: ++ macro=HydrologyNEnum() ++ """ ++ ++ return StringToEnum('HydrologyN') ++ ++def HydrologyPEnum(): ++ """ ++ HYDROLOGYPENUM - Enum of HydrologyP ++ ++ Usage: ++ macro=HydrologyPEnum() ++ """ ++ ++ return StringToEnum('HydrologyP') ++ ++def HydrologyQEnum(): ++ """ ++ HYDROLOGYQENUM - Enum of HydrologyQ ++ ++ Usage: ++ macro=HydrologyQEnum() ++ """ ++ ++ return StringToEnum('HydrologyQ') ++ ++def HydrologySpcwatercolumnEnum(): ++ """ ++ HYDROLOGYSPCWATERCOLUMNENUM - Enum of HydrologySpcwatercolumn ++ ++ Usage: ++ macro=HydrologySpcwatercolumnEnum() ++ """ ++ ++ return StringToEnum('HydrologySpcwatercolumn') ++ ++def HydrologyStabilizationEnum(): ++ """ ++ HYDROLOGYSTABILIZATIONENUM - Enum of HydrologyStabilization ++ ++ Usage: ++ macro=HydrologyStabilizationEnum() ++ """ ++ ++ return StringToEnum('HydrologyStabilization') ++ ++def InversionControlParametersEnum(): ++ """ ++ INVERSIONCONTROLPARAMETERSENUM - Enum of InversionControlParameters ++ ++ Usage: ++ macro=InversionControlParametersEnum() ++ """ ++ ++ return StringToEnum('InversionControlParameters') ++ ++def InversionCostFunctionEnum(): ++ """ ++ INVERSIONCOSTFUNCTIONENUM - Enum of InversionCostFunction ++ ++ Usage: ++ macro=InversionCostFunctionEnum() ++ """ ++ ++ return StringToEnum('InversionCostFunction') ++ ++def InversionCostFunctionThresholdEnum(): ++ """ ++ INVERSIONCOSTFUNCTIONTHRESHOLDENUM - Enum of InversionCostFunctionThreshold ++ ++ Usage: ++ macro=InversionCostFunctionThresholdEnum() ++ """ ++ ++ return StringToEnum('InversionCostFunctionThreshold') ++ ++def InversionCostFunctionsCoefficientsEnum(): ++ """ ++ INVERSIONCOSTFUNCTIONSCOEFFICIENTSENUM - Enum of InversionCostFunctionsCoefficients ++ ++ Usage: ++ macro=InversionCostFunctionsCoefficientsEnum() ++ """ ++ ++ return StringToEnum('InversionCostFunctionsCoefficients') ++ ++def InversionCostFunctionsEnum(): ++ """ ++ INVERSIONCOSTFUNCTIONSENUM - Enum of InversionCostFunctions ++ ++ Usage: ++ macro=InversionCostFunctionsEnum() ++ """ ++ ++ return StringToEnum('InversionCostFunctions') ++ ++def InversionGradientOnlyEnum(): ++ """ ++ INVERSIONGRADIENTONLYENUM - Enum of InversionGradientOnly ++ ++ Usage: ++ macro=InversionGradientOnlyEnum() ++ """ ++ ++ return StringToEnum('InversionGradientOnly') ++ ++def InversionGradientScalingEnum(): ++ """ ++ INVERSIONGRADIENTSCALINGENUM - Enum of InversionGradientScaling ++ ++ Usage: ++ macro=InversionGradientScalingEnum() ++ """ ++ ++ return StringToEnum('InversionGradientScaling') ++ ++def InversionIscontrolEnum(): ++ """ ++ INVERSIONISCONTROLENUM - Enum of InversionIscontrol ++ ++ Usage: ++ macro=InversionIscontrolEnum() ++ """ ++ ++ return StringToEnum('InversionIscontrol') ++ ++def InversionTaoEnum(): ++ """ ++ INVERSIONTAOENUM - Enum of InversionTao ++ ++ Usage: ++ macro=InversionTaoEnum() ++ """ ++ ++ return StringToEnum('InversionTao') ++ ++def InversionIncompleteAdjointEnum(): ++ """ ++ INVERSIONINCOMPLETEADJOINTENUM - Enum of InversionIncompleteAdjoint ++ ++ Usage: ++ macro=InversionIncompleteAdjointEnum() ++ """ ++ ++ return StringToEnum('InversionIncompleteAdjoint') ++ ++def InversionMaxParametersEnum(): ++ """ ++ INVERSIONMAXPARAMETERSENUM - Enum of InversionMaxParameters ++ ++ Usage: ++ macro=InversionMaxParametersEnum() ++ """ ++ ++ return StringToEnum('InversionMaxParameters') ++ ++def InversionMaxiterPerStepEnum(): ++ """ ++ INVERSIONMAXITERPERSTEPENUM - Enum of InversionMaxiterPerStep ++ ++ Usage: ++ macro=InversionMaxiterPerStepEnum() ++ """ ++ ++ return StringToEnum('InversionMaxiterPerStep') ++ ++def InversionMinParametersEnum(): ++ """ ++ INVERSIONMINPARAMETERSENUM - Enum of InversionMinParameters ++ ++ Usage: ++ macro=InversionMinParametersEnum() ++ """ ++ ++ return StringToEnum('InversionMinParameters') ++ ++def InversionNstepsEnum(): ++ """ ++ INVERSIONNSTEPSENUM - Enum of InversionNsteps ++ ++ Usage: ++ macro=InversionNstepsEnum() ++ """ ++ ++ return StringToEnum('InversionNsteps') ++ ++def InversionNumControlParametersEnum(): ++ """ ++ INVERSIONNUMCONTROLPARAMETERSENUM - Enum of InversionNumControlParameters ++ ++ Usage: ++ macro=InversionNumControlParametersEnum() ++ """ ++ ++ return StringToEnum('InversionNumControlParameters') ++ ++def InversionNumCostFunctionsEnum(): ++ """ ++ INVERSIONNUMCOSTFUNCTIONSENUM - Enum of InversionNumCostFunctions ++ ++ Usage: ++ macro=InversionNumCostFunctionsEnum() ++ """ ++ ++ return StringToEnum('InversionNumCostFunctions') ++ ++def InversionStepThresholdEnum(): ++ """ ++ INVERSIONSTEPTHRESHOLDENUM - Enum of InversionStepThreshold ++ ++ Usage: ++ macro=InversionStepThresholdEnum() ++ """ ++ ++ return StringToEnum('InversionStepThreshold') ++ ++def InversionThicknessObsEnum(): ++ """ ++ INVERSIONTHICKNESSOBSENUM - Enum of InversionThicknessObs ++ ++ Usage: ++ macro=InversionThicknessObsEnum() ++ """ ++ ++ return StringToEnum('InversionThicknessObs') ++ ++def InversionVelObsEnum(): ++ """ ++ INVERSIONVELOBSENUM - Enum of InversionVelObs ++ ++ Usage: ++ macro=InversionVelObsEnum() ++ """ ++ ++ return StringToEnum('InversionVelObs') ++ ++def InversionVxObsEnum(): ++ """ ++ INVERSIONVXOBSENUM - Enum of InversionVxObs ++ ++ Usage: ++ macro=InversionVxObsEnum() ++ """ ++ ++ return StringToEnum('InversionVxObs') ++ ++def InversionVyObsEnum(): ++ """ ++ INVERSIONVYOBSENUM - Enum of InversionVyObs ++ ++ Usage: ++ macro=InversionVyObsEnum() ++ """ ++ ++ return StringToEnum('InversionVyObs') ++ ++def InversionVzObsEnum(): ++ """ ++ INVERSIONVZOBSENUM - Enum of InversionVzObs ++ ++ Usage: ++ macro=InversionVzObsEnum() ++ """ ++ ++ return StringToEnum('InversionVzObs') ++ ++def MaskElementonfloatingiceEnum(): ++ """ ++ MASKELEMENTONFLOATINGICEENUM - Enum of MaskElementonfloatingice ++ ++ Usage: ++ macro=MaskElementonfloatingiceEnum() ++ """ ++ ++ return StringToEnum('MaskElementonfloatingice') ++ ++def MaskElementongroundediceEnum(): ++ """ ++ MASKELEMENTONGROUNDEDICEENUM - Enum of MaskElementongroundedice ++ ++ Usage: ++ macro=MaskElementongroundediceEnum() ++ """ ++ ++ return StringToEnum('MaskElementongroundedice') ++ ++def MaskElementonwaterEnum(): ++ """ ++ MASKELEMENTONWATERENUM - Enum of MaskElementonwater ++ ++ Usage: ++ macro=MaskElementonwaterEnum() ++ """ ++ ++ return StringToEnum('MaskElementonwater') ++ ++def MaskVertexonfloatingiceEnum(): ++ """ ++ MASKVERTEXONFLOATINGICEENUM - Enum of MaskVertexonfloatingice ++ ++ Usage: ++ macro=MaskVertexonfloatingiceEnum() ++ """ ++ ++ return StringToEnum('MaskVertexonfloatingice') ++ ++def MaskVertexongroundediceEnum(): ++ """ ++ MASKVERTEXONGROUNDEDICEENUM - Enum of MaskVertexongroundedice ++ ++ Usage: ++ macro=MaskVertexongroundediceEnum() ++ """ ++ ++ return StringToEnum('MaskVertexongroundedice') ++ ++def MaskVertexonwaterEnum(): ++ """ ++ MASKVERTEXONWATERENUM - Enum of MaskVertexonwater ++ ++ Usage: ++ macro=MaskVertexonwaterEnum() ++ """ ++ ++ return StringToEnum('MaskVertexonwater') ++ ++def MaterialsBetaEnum(): ++ """ ++ MATERIALSBETAENUM - Enum of MaterialsBeta ++ ++ Usage: ++ macro=MaterialsBetaEnum() ++ """ ++ ++ return StringToEnum('MaterialsBeta') ++ ++def MaterialsHeatcapacityEnum(): ++ """ ++ MATERIALSHEATCAPACITYENUM - Enum of MaterialsHeatcapacity ++ ++ Usage: ++ macro=MaterialsHeatcapacityEnum() ++ """ ++ ++ return StringToEnum('MaterialsHeatcapacity') ++ ++def MaterialsLatentheatEnum(): ++ """ ++ MATERIALSLATENTHEATENUM - Enum of MaterialsLatentheat ++ ++ Usage: ++ macro=MaterialsLatentheatEnum() ++ """ ++ ++ return StringToEnum('MaterialsLatentheat') ++ ++def MaterialsMeltingpointEnum(): ++ """ ++ MATERIALSMELTINGPOINTENUM - Enum of MaterialsMeltingpoint ++ ++ Usage: ++ macro=MaterialsMeltingpointEnum() ++ """ ++ ++ return StringToEnum('MaterialsMeltingpoint') ++ ++def MaterialsMixedLayerCapacityEnum(): ++ """ ++ MATERIALSMIXEDLAYERCAPACITYENUM - Enum of MaterialsMixedLayerCapacity ++ ++ Usage: ++ macro=MaterialsMixedLayerCapacityEnum() ++ """ ++ ++ return StringToEnum('MaterialsMixedLayerCapacity') ++ ++def MaterialsRheologyBEnum(): ++ """ ++ MATERIALSRHEOLOGYBENUM - Enum of MaterialsRheologyB ++ ++ Usage: ++ macro=MaterialsRheologyBEnum() ++ """ ++ ++ return StringToEnum('MaterialsRheologyB') ++ ++def MaterialsRheologyBbarEnum(): ++ """ ++ MATERIALSRHEOLOGYBBARENUM - Enum of MaterialsRheologyBbar ++ ++ Usage: ++ macro=MaterialsRheologyBbarEnum() ++ """ ++ ++ return StringToEnum('MaterialsRheologyBbar') ++ ++def MaterialsRheologyLawEnum(): ++ """ ++ MATERIALSRHEOLOGYLAWENUM - Enum of MaterialsRheologyLaw ++ ++ Usage: ++ macro=MaterialsRheologyLawEnum() ++ """ ++ ++ return StringToEnum('MaterialsRheologyLaw') ++ ++def MaterialsRheologyNEnum(): ++ """ ++ MATERIALSRHEOLOGYNENUM - Enum of MaterialsRheologyN ++ ++ Usage: ++ macro=MaterialsRheologyNEnum() ++ """ ++ ++ return StringToEnum('MaterialsRheologyN') ++ ++def MaterialsRhoIceEnum(): ++ """ ++ MATERIALSRHOICEENUM - Enum of MaterialsRhoIce ++ ++ Usage: ++ macro=MaterialsRhoIceEnum() ++ """ ++ ++ return StringToEnum('MaterialsRhoIce') ++ ++def MaterialsRhoWaterEnum(): ++ """ ++ MATERIALSRHOWATERENUM - Enum of MaterialsRhoWater ++ ++ Usage: ++ macro=MaterialsRhoWaterEnum() ++ """ ++ ++ return StringToEnum('MaterialsRhoWater') ++ ++def MaterialsRhoFreshwaterEnum(): ++ """ ++ MATERIALSRHOFRESHWATERENUM - Enum of MaterialsRhoFreshwater ++ ++ Usage: ++ macro=MaterialsRhoFreshwaterEnum() ++ """ ++ ++ return StringToEnum('MaterialsRhoFreshwater') ++ ++def MaterialsMuWaterEnum(): ++ """ ++ MATERIALSMUWATERENUM - Enum of MaterialsMuWater ++ ++ Usage: ++ macro=MaterialsMuWaterEnum() ++ """ ++ ++ return StringToEnum('MaterialsMuWater') ++ ++def MaterialsThermalExchangeVelocityEnum(): ++ """ ++ MATERIALSTHERMALEXCHANGEVELOCITYENUM - Enum of MaterialsThermalExchangeVelocity ++ ++ Usage: ++ macro=MaterialsThermalExchangeVelocityEnum() ++ """ ++ ++ return StringToEnum('MaterialsThermalExchangeVelocity') ++ ++def MaterialsThermalconductivityEnum(): ++ """ ++ MATERIALSTHERMALCONDUCTIVITYENUM - Enum of MaterialsThermalconductivity ++ ++ Usage: ++ macro=MaterialsThermalconductivityEnum() ++ """ ++ ++ return StringToEnum('MaterialsThermalconductivity') ++ ++def MeshAverageVertexConnectivityEnum(): ++ """ ++ MESHAVERAGEVERTEXCONNECTIVITYENUM - Enum of MeshAverageVertexConnectivity ++ ++ Usage: ++ macro=MeshAverageVertexConnectivityEnum() ++ """ ++ ++ return StringToEnum('MeshAverageVertexConnectivity') ++ ++def MeshDimensionEnum(): ++ """ ++ MESHDIMENSIONENUM - Enum of MeshDimension ++ ++ Usage: ++ macro=MeshDimensionEnum() ++ """ ++ ++ return StringToEnum('MeshDimension') ++ ++def MeshEdgesEnum(): ++ """ ++ MESHEDGESENUM - Enum of MeshEdges ++ ++ Usage: ++ macro=MeshEdgesEnum() ++ """ ++ ++ return StringToEnum('MeshEdges') ++ ++def MeshElementconnectivityEnum(): ++ """ ++ MESHELEMENTCONNECTIVITYENUM - Enum of MeshElementconnectivity ++ ++ Usage: ++ macro=MeshElementconnectivityEnum() ++ """ ++ ++ return StringToEnum('MeshElementconnectivity') ++ ++def MeshElementonbedEnum(): ++ """ ++ MESHELEMENTONBEDENUM - Enum of MeshElementonbed ++ ++ Usage: ++ macro=MeshElementonbedEnum() ++ """ ++ ++ return StringToEnum('MeshElementonbed') ++ ++def MeshElementonsurfaceEnum(): ++ """ ++ MESHELEMENTONSURFACEENUM - Enum of MeshElementonsurface ++ ++ Usage: ++ macro=MeshElementonsurfaceEnum() ++ """ ++ ++ return StringToEnum('MeshElementonsurface') ++ ++def MeshElements2dEnum(): ++ """ ++ MESHELEMENTS2DENUM - Enum of MeshElements2d ++ ++ Usage: ++ macro=MeshElements2dEnum() ++ """ ++ ++ return StringToEnum('MeshElements2d') ++ ++def MeshElementsEnum(): ++ """ ++ MESHELEMENTSENUM - Enum of MeshElements ++ ++ Usage: ++ macro=MeshElementsEnum() ++ """ ++ ++ return StringToEnum('MeshElements') ++ ++def MeshLowerelementsEnum(): ++ """ ++ MESHLOWERELEMENTSENUM - Enum of MeshLowerelements ++ ++ Usage: ++ macro=MeshLowerelementsEnum() ++ """ ++ ++ return StringToEnum('MeshLowerelements') ++ ++def MeshNumberofedgesEnum(): ++ """ ++ MESHNUMBEROFEDGESENUM - Enum of MeshNumberofedges ++ ++ Usage: ++ macro=MeshNumberofedgesEnum() ++ """ ++ ++ return StringToEnum('MeshNumberofedges') ++ ++def MeshNumberofelements2dEnum(): ++ """ ++ MESHNUMBEROFELEMENTS2DENUM - Enum of MeshNumberofelements2d ++ ++ Usage: ++ macro=MeshNumberofelements2dEnum() ++ """ ++ ++ return StringToEnum('MeshNumberofelements2d') ++ ++def MeshNumberofelementsEnum(): ++ """ ++ MESHNUMBEROFELEMENTSENUM - Enum of MeshNumberofelements ++ ++ Usage: ++ macro=MeshNumberofelementsEnum() ++ """ ++ ++ return StringToEnum('MeshNumberofelements') ++ ++def MeshNumberoflayersEnum(): ++ """ ++ MESHNUMBEROFLAYERSENUM - Enum of MeshNumberoflayers ++ ++ Usage: ++ macro=MeshNumberoflayersEnum() ++ """ ++ ++ return StringToEnum('MeshNumberoflayers') ++ ++def MeshNumberofvertices2dEnum(): ++ """ ++ MESHNUMBEROFVERTICES2DENUM - Enum of MeshNumberofvertices2d ++ ++ Usage: ++ macro=MeshNumberofvertices2dEnum() ++ """ ++ ++ return StringToEnum('MeshNumberofvertices2d') ++ ++def MeshNumberofverticesEnum(): ++ """ ++ MESHNUMBEROFVERTICESENUM - Enum of MeshNumberofvertices ++ ++ Usage: ++ macro=MeshNumberofverticesEnum() ++ """ ++ ++ return StringToEnum('MeshNumberofvertices') ++ ++def MeshUpperelementsEnum(): ++ """ ++ MESHUPPERELEMENTSENUM - Enum of MeshUpperelements ++ ++ Usage: ++ macro=MeshUpperelementsEnum() ++ """ ++ ++ return StringToEnum('MeshUpperelements') ++ ++def MeshVertexonbedEnum(): ++ """ ++ MESHVERTEXONBEDENUM - Enum of MeshVertexonbed ++ ++ Usage: ++ macro=MeshVertexonbedEnum() ++ """ ++ ++ return StringToEnum('MeshVertexonbed') ++ ++def MeshVertexonsurfaceEnum(): ++ """ ++ MESHVERTEXONSURFACEENUM - Enum of MeshVertexonsurface ++ ++ Usage: ++ macro=MeshVertexonsurfaceEnum() ++ """ ++ ++ return StringToEnum('MeshVertexonsurface') ++ ++def MeshXEnum(): ++ """ ++ MESHXENUM - Enum of MeshX ++ ++ Usage: ++ macro=MeshXEnum() ++ """ ++ ++ return StringToEnum('MeshX') ++ ++def MeshYEnum(): ++ """ ++ MESHYENUM - Enum of MeshY ++ ++ Usage: ++ macro=MeshYEnum() ++ """ ++ ++ return StringToEnum('MeshY') ++ ++def MeshZEnum(): ++ """ ++ MESHZENUM - Enum of MeshZ ++ ++ Usage: ++ macro=MeshZEnum() ++ """ ++ ++ return StringToEnum('MeshZ') ++ ++def MiscellaneousNameEnum(): ++ """ ++ MISCELLANEOUSNAMEENUM - Enum of MiscellaneousName ++ ++ Usage: ++ macro=MiscellaneousNameEnum() ++ """ ++ ++ return StringToEnum('MiscellaneousName') ++ ++def PrognosticHydrostaticAdjustmentEnum(): ++ """ ++ PROGNOSTICHYDROSTATICADJUSTMENTENUM - Enum of PrognosticHydrostaticAdjustment ++ ++ Usage: ++ macro=PrognosticHydrostaticAdjustmentEnum() ++ """ ++ ++ return StringToEnum('PrognosticHydrostaticAdjustment') ++ ++def PrognosticMinThicknessEnum(): ++ """ ++ PROGNOSTICMINTHICKNESSENUM - Enum of PrognosticMinThickness ++ ++ Usage: ++ macro=PrognosticMinThicknessEnum() ++ """ ++ ++ return StringToEnum('PrognosticMinThickness') ++ ++def PrognosticPenaltyFactorEnum(): ++ """ ++ PROGNOSTICPENALTYFACTORENUM - Enum of PrognosticPenaltyFactor ++ ++ Usage: ++ macro=PrognosticPenaltyFactorEnum() ++ """ ++ ++ return StringToEnum('PrognosticPenaltyFactor') ++ ++def PrognosticSpcthicknessEnum(): ++ """ ++ PROGNOSTICSPCTHICKNESSENUM - Enum of PrognosticSpcthickness ++ ++ Usage: ++ macro=PrognosticSpcthicknessEnum() ++ """ ++ ++ return StringToEnum('PrognosticSpcthickness') ++ ++def PrognosticStabilizationEnum(): ++ """ ++ PROGNOSTICSTABILIZATIONENUM - Enum of PrognosticStabilization ++ ++ Usage: ++ macro=PrognosticStabilizationEnum() ++ """ ++ ++ return StringToEnum('PrognosticStabilization') ++ ++def PrognosticVertexPairingEnum(): ++ """ ++ PROGNOSTICVERTEXPAIRINGENUM - Enum of PrognosticVertexPairing ++ ++ Usage: ++ macro=PrognosticVertexPairingEnum() ++ """ ++ ++ return StringToEnum('PrognosticVertexPairing') ++ ++def QmuIsdakotaEnum(): ++ """ ++ QMUISDAKOTAENUM - Enum of QmuIsdakota ++ ++ Usage: ++ macro=QmuIsdakotaEnum() ++ """ ++ ++ return StringToEnum('QmuIsdakota') ++ ++def QmuMassFluxSegmentsEnum(): ++ """ ++ QMUMASSFLUXSEGMENTSENUM - Enum of QmuMassFluxSegments ++ ++ Usage: ++ macro=QmuMassFluxSegmentsEnum() ++ """ ++ ++ return StringToEnum('QmuMassFluxSegments') ++ ++def QmuNumberofpartitionsEnum(): ++ """ ++ QMUNUMBEROFPARTITIONSENUM - Enum of QmuNumberofpartitions ++ ++ Usage: ++ macro=QmuNumberofpartitionsEnum() ++ """ ++ ++ return StringToEnum('QmuNumberofpartitions') ++ ++def QmuNumberofresponsesEnum(): ++ """ ++ QMUNUMBEROFRESPONSESENUM - Enum of QmuNumberofresponses ++ ++ Usage: ++ macro=QmuNumberofresponsesEnum() ++ """ ++ ++ return StringToEnum('QmuNumberofresponses') ++ ++def QmuPartitionEnum(): ++ """ ++ QMUPARTITIONENUM - Enum of QmuPartition ++ ++ Usage: ++ macro=QmuPartitionEnum() ++ """ ++ ++ return StringToEnum('QmuPartition') ++ ++def QmuResponsedescriptorsEnum(): ++ """ ++ QMURESPONSEDESCRIPTORSENUM - Enum of QmuResponsedescriptors ++ ++ Usage: ++ macro=QmuResponsedescriptorsEnum() ++ """ ++ ++ return StringToEnum('QmuResponsedescriptors') ++ ++def QmuVariabledescriptorsEnum(): ++ """ ++ QMUVARIABLEDESCRIPTORSENUM - Enum of QmuVariabledescriptors ++ ++ Usage: ++ macro=QmuVariabledescriptorsEnum() ++ """ ++ ++ return StringToEnum('QmuVariabledescriptors') ++ ++def RiftsNumriftsEnum(): ++ """ ++ RIFTSNUMRIFTSENUM - Enum of RiftsNumrifts ++ ++ Usage: ++ macro=RiftsNumriftsEnum() ++ """ ++ ++ return StringToEnum('RiftsNumrifts') ++ ++def RiftsRiftstructEnum(): ++ """ ++ RIFTSRIFTSTRUCTENUM - Enum of RiftsRiftstruct ++ ++ Usage: ++ macro=RiftsRiftstructEnum() ++ """ ++ ++ return StringToEnum('RiftsRiftstruct') ++ ++def SettingsIoGatherEnum(): ++ """ ++ SETTINGSIOGATHERENUM - Enum of SettingsIoGather ++ ++ Usage: ++ macro=SettingsIoGatherEnum() ++ """ ++ ++ return StringToEnum('SettingsIoGather') ++ ++def SettingsLowmemEnum(): ++ """ ++ SETTINGSLOWMEMENUM - Enum of SettingsLowmem ++ ++ Usage: ++ macro=SettingsLowmemEnum() ++ """ ++ ++ return StringToEnum('SettingsLowmem') ++ ++def SettingsOutputFrequencyEnum(): ++ """ ++ SETTINGSOUTPUTFREQUENCYENUM - Enum of SettingsOutputFrequency ++ ++ Usage: ++ macro=SettingsOutputFrequencyEnum() ++ """ ++ ++ return StringToEnum('SettingsOutputFrequency') ++ ++def SettingsResultsAsPatchesEnum(): ++ """ ++ SETTINGSRESULTSASPATCHESENUM - Enum of SettingsResultsAsPatches ++ ++ Usage: ++ macro=SettingsResultsAsPatchesEnum() ++ """ ++ ++ return StringToEnum('SettingsResultsAsPatches') ++ ++def SettingsWaitonlockEnum(): ++ """ ++ SETTINGSWAITONLOCKENUM - Enum of SettingsWaitonlock ++ ++ Usage: ++ macro=SettingsWaitonlockEnum() ++ """ ++ ++ return StringToEnum('SettingsWaitonlock') ++ ++def DebugPetscProfilingEnum(): ++ """ ++ DEBUGPETSCPROFILINGENUM - Enum of DebugPetscProfiling ++ ++ Usage: ++ macro=DebugPetscProfilingEnum() ++ """ ++ ++ return StringToEnum('DebugPetscProfiling') ++ ++def PetscProfilingCurrentMemEnum(): ++ """ ++ PETSCPROFILINGCURRENTMEMENUM - Enum of PetscProfilingCurrentMem ++ ++ Usage: ++ macro=PetscProfilingCurrentMemEnum() ++ """ ++ ++ return StringToEnum('PetscProfilingCurrentMem') ++ ++def PetscProfilingCurrentFlopsEnum(): ++ """ ++ PETSCPROFILINGCURRENTFLOPSENUM - Enum of PetscProfilingCurrentFlops ++ ++ Usage: ++ macro=PetscProfilingCurrentFlopsEnum() ++ """ ++ ++ return StringToEnum('PetscProfilingCurrentFlops') ++ ++def PetscProfilingSolutionTimeEnum(): ++ """ ++ PETSCPROFILINGSOLUTIONTIMEENUM - Enum of PetscProfilingSolutionTime ++ ++ Usage: ++ macro=PetscProfilingSolutionTimeEnum() ++ """ ++ ++ return StringToEnum('PetscProfilingSolutionTime') ++ ++def MaxIterationConvergenceFlagEnum(): ++ """ ++ MAXITERATIONCONVERGENCEFLAGENUM - Enum of MaxIterationConvergenceFlag ++ ++ Usage: ++ macro=MaxIterationConvergenceFlagEnum() ++ """ ++ ++ return StringToEnum('MaxIterationConvergenceFlag') ++ ++def SteadystateMaxiterEnum(): ++ """ ++ STEADYSTATEMAXITERENUM - Enum of SteadystateMaxiter ++ ++ Usage: ++ macro=SteadystateMaxiterEnum() ++ """ ++ ++ return StringToEnum('SteadystateMaxiter') ++ ++def SteadystateNumRequestedOutputsEnum(): ++ """ ++ STEADYSTATENUMREQUESTEDOUTPUTSENUM - Enum of SteadystateNumRequestedOutputs ++ ++ Usage: ++ macro=SteadystateNumRequestedOutputsEnum() ++ """ ++ ++ return StringToEnum('SteadystateNumRequestedOutputs') ++ ++def SteadystateReltolEnum(): ++ """ ++ STEADYSTATERELTOLENUM - Enum of SteadystateReltol ++ ++ Usage: ++ macro=SteadystateReltolEnum() ++ """ ++ ++ return StringToEnum('SteadystateReltol') ++ ++def SteadystateRequestedOutputsEnum(): ++ """ ++ STEADYSTATEREQUESTEDOUTPUTSENUM - Enum of SteadystateRequestedOutputs ++ ++ Usage: ++ macro=SteadystateRequestedOutputsEnum() ++ """ ++ ++ return StringToEnum('SteadystateRequestedOutputs') ++ ++def SurfaceEnum(): ++ """ ++ SURFACEENUM - Enum of Surface ++ ++ Usage: ++ macro=SurfaceEnum() ++ """ ++ ++ return StringToEnum('Surface') ++ ++def SurfaceforcingsPrecipitationEnum(): ++ """ ++ SURFACEFORCINGSPRECIPITATIONENUM - Enum of SurfaceforcingsPrecipitation ++ ++ Usage: ++ macro=SurfaceforcingsPrecipitationEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsPrecipitation') ++ ++def SurfaceforcingsMassBalanceEnum(): ++ """ ++ SURFACEFORCINGSMASSBALANCEENUM - Enum of SurfaceforcingsMassBalance ++ ++ Usage: ++ macro=SurfaceforcingsMassBalanceEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsMassBalance') ++ ++def SurfaceforcingsIspddEnum(): ++ """ ++ SURFACEFORCINGSISPDDENUM - Enum of SurfaceforcingsIspdd ++ ++ Usage: ++ macro=SurfaceforcingsIspddEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsIspdd') ++ ++def SurfaceforcingsIssmbgradientsEnum(): ++ """ ++ SURFACEFORCINGSISSMBGRADIENTSENUM - Enum of SurfaceforcingsIssmbgradients ++ ++ Usage: ++ macro=SurfaceforcingsIssmbgradientsEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsIssmbgradients') ++ ++def SurfaceforcingsMonthlytemperaturesEnum(): ++ """ ++ SURFACEFORCINGSMONTHLYTEMPERATURESENUM - Enum of SurfaceforcingsMonthlytemperatures ++ ++ Usage: ++ macro=SurfaceforcingsMonthlytemperaturesEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsMonthlytemperatures') ++ ++def SurfaceforcingsHcEnum(): ++ """ ++ SURFACEFORCINGSHCENUM - Enum of SurfaceforcingsHc ++ ++ Usage: ++ macro=SurfaceforcingsHcEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsHc') ++ ++def SurfaceforcingsSmbPosMaxEnum(): ++ """ ++ SURFACEFORCINGSSMBPOSMAXENUM - Enum of SurfaceforcingsSmbPosMax ++ ++ Usage: ++ macro=SurfaceforcingsSmbPosMaxEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsSmbPosMax') ++ ++def SurfaceforcingsSmbPosMinEnum(): ++ """ ++ SURFACEFORCINGSSMBPOSMINENUM - Enum of SurfaceforcingsSmbPosMin ++ ++ Usage: ++ macro=SurfaceforcingsSmbPosMinEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsSmbPosMin') ++ ++def SurfaceforcingsAPosEnum(): ++ """ ++ SURFACEFORCINGSAPOSENUM - Enum of SurfaceforcingsAPos ++ ++ Usage: ++ macro=SurfaceforcingsAPosEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsAPos') ++ ++def SurfaceforcingsBPosEnum(): ++ """ ++ SURFACEFORCINGSBPOSENUM - Enum of SurfaceforcingsBPos ++ ++ Usage: ++ macro=SurfaceforcingsBPosEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsBPos') ++ ++def SurfaceforcingsANegEnum(): ++ """ ++ SURFACEFORCINGSANEGENUM - Enum of SurfaceforcingsANeg ++ ++ Usage: ++ macro=SurfaceforcingsANegEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsANeg') ++ ++def SurfaceforcingsBNegEnum(): ++ """ ++ SURFACEFORCINGSBNEGENUM - Enum of SurfaceforcingsBNeg ++ ++ Usage: ++ macro=SurfaceforcingsBNegEnum() ++ """ ++ ++ return StringToEnum('SurfaceforcingsBNeg') ++ ++def ThermalMaxiterEnum(): ++ """ ++ THERMALMAXITERENUM - Enum of ThermalMaxiter ++ ++ Usage: ++ macro=ThermalMaxiterEnum() ++ """ ++ ++ return StringToEnum('ThermalMaxiter') ++ ++def ThermalPenaltyFactorEnum(): ++ """ ++ THERMALPENALTYFACTORENUM - Enum of ThermalPenaltyFactor ++ ++ Usage: ++ macro=ThermalPenaltyFactorEnum() ++ """ ++ ++ return StringToEnum('ThermalPenaltyFactor') ++ ++def ThermalPenaltyLockEnum(): ++ """ ++ THERMALPENALTYLOCKENUM - Enum of ThermalPenaltyLock ++ ++ Usage: ++ macro=ThermalPenaltyLockEnum() ++ """ ++ ++ return StringToEnum('ThermalPenaltyLock') ++ ++def ThermalPenaltyThresholdEnum(): ++ """ ++ THERMALPENALTYTHRESHOLDENUM - Enum of ThermalPenaltyThreshold ++ ++ Usage: ++ macro=ThermalPenaltyThresholdEnum() ++ """ ++ ++ return StringToEnum('ThermalPenaltyThreshold') ++ ++def ThermalSpctemperatureEnum(): ++ """ ++ THERMALSPCTEMPERATUREENUM - Enum of ThermalSpctemperature ++ ++ Usage: ++ macro=ThermalSpctemperatureEnum() ++ """ ++ ++ return StringToEnum('ThermalSpctemperature') ++ ++def ThermalStabilizationEnum(): ++ """ ++ THERMALSTABILIZATIONENUM - Enum of ThermalStabilization ++ ++ Usage: ++ macro=ThermalStabilizationEnum() ++ """ ++ ++ return StringToEnum('ThermalStabilization') ++ ++def ThermalIsenthalpyEnum(): ++ """ ++ THERMALISENTHALPYENUM - Enum of ThermalIsenthalpy ++ ++ Usage: ++ macro=ThermalIsenthalpyEnum() ++ """ ++ ++ return StringToEnum('ThermalIsenthalpy') ++ ++def ThicknessEnum(): ++ """ ++ THICKNESSENUM - Enum of Thickness ++ ++ Usage: ++ macro=ThicknessEnum() ++ """ ++ ++ return StringToEnum('Thickness') ++ ++def TimesteppingStartTimeEnum(): ++ """ ++ TIMESTEPPINGSTARTTIMEENUM - Enum of TimesteppingStartTime ++ ++ Usage: ++ macro=TimesteppingStartTimeEnum() ++ """ ++ ++ return StringToEnum('TimesteppingStartTime') ++ ++def TimesteppingFinalTimeEnum(): ++ """ ++ TIMESTEPPINGFINALTIMEENUM - Enum of TimesteppingFinalTime ++ ++ Usage: ++ macro=TimesteppingFinalTimeEnum() ++ """ ++ ++ return StringToEnum('TimesteppingFinalTime') ++ ++def TimesteppingCflCoefficientEnum(): ++ """ ++ TIMESTEPPINGCFLCOEFFICIENTENUM - Enum of TimesteppingCflCoefficient ++ ++ Usage: ++ macro=TimesteppingCflCoefficientEnum() ++ """ ++ ++ return StringToEnum('TimesteppingCflCoefficient') ++ ++def TimesteppingTimeAdaptEnum(): ++ """ ++ TIMESTEPPINGTIMEADAPTENUM - Enum of TimesteppingTimeAdapt ++ ++ Usage: ++ macro=TimesteppingTimeAdaptEnum() ++ """ ++ ++ return StringToEnum('TimesteppingTimeAdapt') ++ ++def TimesteppingTimeStepEnum(): ++ """ ++ TIMESTEPPINGTIMESTEPENUM - Enum of TimesteppingTimeStep ++ ++ Usage: ++ macro=TimesteppingTimeStepEnum() ++ """ ++ ++ return StringToEnum('TimesteppingTimeStep') ++ ++def TransientIsdiagnosticEnum(): ++ """ ++ TRANSIENTISDIAGNOSTICENUM - Enum of TransientIsdiagnostic ++ ++ Usage: ++ macro=TransientIsdiagnosticEnum() ++ """ ++ ++ return StringToEnum('TransientIsdiagnostic') ++ ++def TransientIsgroundinglineEnum(): ++ """ ++ TRANSIENTISGROUNDINGLINEENUM - Enum of TransientIsgroundingline ++ ++ Usage: ++ macro=TransientIsgroundinglineEnum() ++ """ ++ ++ return StringToEnum('TransientIsgroundingline') ++ ++def TransientIsprognosticEnum(): ++ """ ++ TRANSIENTISPROGNOSTICENUM - Enum of TransientIsprognostic ++ ++ Usage: ++ macro=TransientIsprognosticEnum() ++ """ ++ ++ return StringToEnum('TransientIsprognostic') ++ ++def TransientIsthermalEnum(): ++ """ ++ TRANSIENTISTHERMALENUM - Enum of TransientIsthermal ++ ++ Usage: ++ macro=TransientIsthermalEnum() ++ """ ++ ++ return StringToEnum('TransientIsthermal') ++ ++def TransientNumRequestedOutputsEnum(): ++ """ ++ TRANSIENTNUMREQUESTEDOUTPUTSENUM - Enum of TransientNumRequestedOutputs ++ ++ Usage: ++ macro=TransientNumRequestedOutputsEnum() ++ """ ++ ++ return StringToEnum('TransientNumRequestedOutputs') ++ ++def TransientRequestedOutputsEnum(): ++ """ ++ TRANSIENTREQUESTEDOUTPUTSENUM - Enum of TransientRequestedOutputs ++ ++ Usage: ++ macro=TransientRequestedOutputsEnum() ++ """ ++ ++ return StringToEnum('TransientRequestedOutputs') ++ ++def SolutionTypeEnum(): ++ """ ++ SOLUTIONTYPEENUM - Enum of SolutionType ++ ++ Usage: ++ macro=SolutionTypeEnum() ++ """ ++ ++ return StringToEnum('SolutionType') ++ ++def AnalysisTypeEnum(): ++ """ ++ ANALYSISTYPEENUM - Enum of AnalysisType ++ ++ Usage: ++ macro=AnalysisTypeEnum() ++ """ ++ ++ return StringToEnum('AnalysisType') ++ ++def ConfigurationTypeEnum(): ++ """ ++ CONFIGURATIONTYPEENUM - Enum of ConfigurationType ++ ++ Usage: ++ macro=ConfigurationTypeEnum() ++ """ ++ ++ return StringToEnum('ConfigurationType') ++ ++def AdjointBalancethicknessAnalysisEnum(): ++ """ ++ ADJOINTBALANCETHICKNESSANALYSISENUM - Enum of AdjointBalancethicknessAnalysis ++ ++ Usage: ++ macro=AdjointBalancethicknessAnalysisEnum() ++ """ ++ ++ return StringToEnum('AdjointBalancethicknessAnalysis') ++ ++def AdjointHorizAnalysisEnum(): ++ """ ++ ADJOINTHORIZANALYSISENUM - Enum of AdjointHorizAnalysis ++ ++ Usage: ++ macro=AdjointHorizAnalysisEnum() ++ """ ++ ++ return StringToEnum('AdjointHorizAnalysis') ++ ++def AdjointSolutionEnum(): ++ """ ++ ADJOINTSOLUTIONENUM - Enum of AdjointSolution ++ ++ Usage: ++ macro=AdjointSolutionEnum() ++ """ ++ ++ return StringToEnum('AdjointSolution') ++ ++def AnalysisCounterEnum(): ++ """ ++ ANALYSISCOUNTERENUM - Enum of AnalysisCounter ++ ++ Usage: ++ macro=AnalysisCounterEnum() ++ """ ++ ++ return StringToEnum('AnalysisCounter') ++ ++def BalancethicknessAnalysisEnum(): ++ """ ++ BALANCETHICKNESSANALYSISENUM - Enum of BalancethicknessAnalysis ++ ++ Usage: ++ macro=BalancethicknessAnalysisEnum() ++ """ ++ ++ return StringToEnum('BalancethicknessAnalysis') ++ ++def BalancethicknessSolutionEnum(): ++ """ ++ BALANCETHICKNESSSOLUTIONENUM - Enum of BalancethicknessSolution ++ ++ Usage: ++ macro=BalancethicknessSolutionEnum() ++ """ ++ ++ return StringToEnum('BalancethicknessSolution') ++ ++def BedSlopeAnalysisEnum(): ++ """ ++ BEDSLOPEANALYSISENUM - Enum of BedSlopeAnalysis ++ ++ Usage: ++ macro=BedSlopeAnalysisEnum() ++ """ ++ ++ return StringToEnum('BedSlopeAnalysis') ++ ++def BedSlopeSolutionEnum(): ++ """ ++ BEDSLOPESOLUTIONENUM - Enum of BedSlopeSolution ++ ++ Usage: ++ macro=BedSlopeSolutionEnum() ++ """ ++ ++ return StringToEnum('BedSlopeSolution') ++ ++def BedSlopeXAnalysisEnum(): ++ """ ++ BEDSLOPEXANALYSISENUM - Enum of BedSlopeXAnalysis ++ ++ Usage: ++ macro=BedSlopeXAnalysisEnum() ++ """ ++ ++ return StringToEnum('BedSlopeXAnalysis') ++ ++def BedSlopeYAnalysisEnum(): ++ """ ++ BEDSLOPEYANALYSISENUM - Enum of BedSlopeYAnalysis ++ ++ Usage: ++ macro=BedSlopeYAnalysisEnum() ++ """ ++ ++ return StringToEnum('BedSlopeYAnalysis') ++ ++def DiagnosticHorizAnalysisEnum(): ++ """ ++ DIAGNOSTICHORIZANALYSISENUM - Enum of DiagnosticHorizAnalysis ++ ++ Usage: ++ macro=DiagnosticHorizAnalysisEnum() ++ """ ++ ++ return StringToEnum('DiagnosticHorizAnalysis') ++ ++def DiagnosticHutterAnalysisEnum(): ++ """ ++ DIAGNOSTICHUTTERANALYSISENUM - Enum of DiagnosticHutterAnalysis ++ ++ Usage: ++ macro=DiagnosticHutterAnalysisEnum() ++ """ ++ ++ return StringToEnum('DiagnosticHutterAnalysis') ++ ++def DiagnosticSolutionEnum(): ++ """ ++ DIAGNOSTICSOLUTIONENUM - Enum of DiagnosticSolution ++ ++ Usage: ++ macro=DiagnosticSolutionEnum() ++ """ ++ ++ return StringToEnum('DiagnosticSolution') ++ ++def DiagnosticVertAnalysisEnum(): ++ """ ++ DIAGNOSTICVERTANALYSISENUM - Enum of DiagnosticVertAnalysis ++ ++ Usage: ++ macro=DiagnosticVertAnalysisEnum() ++ """ ++ ++ return StringToEnum('DiagnosticVertAnalysis') ++ ++def EnthalpyAnalysisEnum(): ++ """ ++ ENTHALPYANALYSISENUM - Enum of EnthalpyAnalysis ++ ++ Usage: ++ macro=EnthalpyAnalysisEnum() ++ """ ++ ++ return StringToEnum('EnthalpyAnalysis') ++ ++def EnthalpySolutionEnum(): ++ """ ++ ENTHALPYSOLUTIONENUM - Enum of EnthalpySolution ++ ++ Usage: ++ macro=EnthalpySolutionEnum() ++ """ ++ ++ return StringToEnum('EnthalpySolution') ++ ++def FlaimAnalysisEnum(): ++ """ ++ FLAIMANALYSISENUM - Enum of FlaimAnalysis ++ ++ Usage: ++ macro=FlaimAnalysisEnum() ++ """ ++ ++ return StringToEnum('FlaimAnalysis') ++ ++def FlaimSolutionEnum(): ++ """ ++ FLAIMSOLUTIONENUM - Enum of FlaimSolution ++ ++ Usage: ++ macro=FlaimSolutionEnum() ++ """ ++ ++ return StringToEnum('FlaimSolution') ++ ++def HydrologyAnalysisEnum(): ++ """ ++ HYDROLOGYANALYSISENUM - Enum of HydrologyAnalysis ++ ++ Usage: ++ macro=HydrologyAnalysisEnum() ++ """ ++ ++ return StringToEnum('HydrologyAnalysis') ++ ++def HydrologySolutionEnum(): ++ """ ++ HYDROLOGYSOLUTIONENUM - Enum of HydrologySolution ++ ++ Usage: ++ macro=HydrologySolutionEnum() ++ """ ++ ++ return StringToEnum('HydrologySolution') ++ ++def MeltingAnalysisEnum(): ++ """ ++ MELTINGANALYSISENUM - Enum of MeltingAnalysis ++ ++ Usage: ++ macro=MeltingAnalysisEnum() ++ """ ++ ++ return StringToEnum('MeltingAnalysis') ++ ++def NoneAnalysisEnum(): ++ """ ++ NONEANALYSISENUM - Enum of NoneAnalysis ++ ++ Usage: ++ macro=NoneAnalysisEnum() ++ """ ++ ++ return StringToEnum('NoneAnalysis') ++ ++def PrognosticAnalysisEnum(): ++ """ ++ PROGNOSTICANALYSISENUM - Enum of PrognosticAnalysis ++ ++ Usage: ++ macro=PrognosticAnalysisEnum() ++ """ ++ ++ return StringToEnum('PrognosticAnalysis') ++ ++def PrognosticSolutionEnum(): ++ """ ++ PROGNOSTICSOLUTIONENUM - Enum of PrognosticSolution ++ ++ Usage: ++ macro=PrognosticSolutionEnum() ++ """ ++ ++ return StringToEnum('PrognosticSolution') ++ ++def SteadystateSolutionEnum(): ++ """ ++ STEADYSTATESOLUTIONENUM - Enum of SteadystateSolution ++ ++ Usage: ++ macro=SteadystateSolutionEnum() ++ """ ++ ++ return StringToEnum('SteadystateSolution') ++ ++def SurfaceSlopeAnalysisEnum(): ++ """ ++ SURFACESLOPEANALYSISENUM - Enum of SurfaceSlopeAnalysis ++ ++ Usage: ++ macro=SurfaceSlopeAnalysisEnum() ++ """ ++ ++ return StringToEnum('SurfaceSlopeAnalysis') ++ ++def SurfaceSlopeSolutionEnum(): ++ """ ++ SURFACESLOPESOLUTIONENUM - Enum of SurfaceSlopeSolution ++ ++ Usage: ++ macro=SurfaceSlopeSolutionEnum() ++ """ ++ ++ return StringToEnum('SurfaceSlopeSolution') ++ ++def SurfaceSlopeXAnalysisEnum(): ++ """ ++ SURFACESLOPEXANALYSISENUM - Enum of SurfaceSlopeXAnalysis ++ ++ Usage: ++ macro=SurfaceSlopeXAnalysisEnum() ++ """ ++ ++ return StringToEnum('SurfaceSlopeXAnalysis') ++ ++def SurfaceSlopeYAnalysisEnum(): ++ """ ++ SURFACESLOPEYANALYSISENUM - Enum of SurfaceSlopeYAnalysis ++ ++ Usage: ++ macro=SurfaceSlopeYAnalysisEnum() ++ """ ++ ++ return StringToEnum('SurfaceSlopeYAnalysis') ++ ++def ThermalAnalysisEnum(): ++ """ ++ THERMALANALYSISENUM - Enum of ThermalAnalysis ++ ++ Usage: ++ macro=ThermalAnalysisEnum() ++ """ ++ ++ return StringToEnum('ThermalAnalysis') ++ ++def ThermalSolutionEnum(): ++ """ ++ THERMALSOLUTIONENUM - Enum of ThermalSolution ++ ++ Usage: ++ macro=ThermalSolutionEnum() ++ """ ++ ++ return StringToEnum('ThermalSolution') ++ ++def TransientSolutionEnum(): ++ """ ++ TRANSIENTSOLUTIONENUM - Enum of TransientSolution ++ ++ Usage: ++ macro=TransientSolutionEnum() ++ """ ++ ++ return StringToEnum('TransientSolution') ++ ++def ApproximationEnum(): ++ """ ++ APPROXIMATIONENUM - Enum of Approximation ++ ++ Usage: ++ macro=ApproximationEnum() ++ """ ++ ++ return StringToEnum('Approximation') ++ ++def HutterApproximationEnum(): ++ """ ++ HUTTERAPPROXIMATIONENUM - Enum of HutterApproximation ++ ++ Usage: ++ macro=HutterApproximationEnum() ++ """ ++ ++ return StringToEnum('HutterApproximation') ++ ++def MacAyealApproximationEnum(): ++ """ ++ MACAYEALAPPROXIMATIONENUM - Enum of MacAyealApproximation ++ ++ Usage: ++ macro=MacAyealApproximationEnum() ++ """ ++ ++ return StringToEnum('MacAyealApproximation') ++ ++def MacAyealPattynApproximationEnum(): ++ """ ++ MACAYEALPATTYNAPPROXIMATIONENUM - Enum of MacAyealPattynApproximation ++ ++ Usage: ++ macro=MacAyealPattynApproximationEnum() ++ """ ++ ++ return StringToEnum('MacAyealPattynApproximation') ++ ++def MacAyealStokesApproximationEnum(): ++ """ ++ MACAYEALSTOKESAPPROXIMATIONENUM - Enum of MacAyealStokesApproximation ++ ++ Usage: ++ macro=MacAyealStokesApproximationEnum() ++ """ ++ ++ return StringToEnum('MacAyealStokesApproximation') ++ ++def NoneApproximationEnum(): ++ """ ++ NONEAPPROXIMATIONENUM - Enum of NoneApproximation ++ ++ Usage: ++ macro=NoneApproximationEnum() ++ """ ++ ++ return StringToEnum('NoneApproximation') ++ ++def PattynApproximationEnum(): ++ """ ++ PATTYNAPPROXIMATIONENUM - Enum of PattynApproximation ++ ++ Usage: ++ macro=PattynApproximationEnum() ++ """ ++ ++ return StringToEnum('PattynApproximation') ++ ++def PattynStokesApproximationEnum(): ++ """ ++ PATTYNSTOKESAPPROXIMATIONENUM - Enum of PattynStokesApproximation ++ ++ Usage: ++ macro=PattynStokesApproximationEnum() ++ """ ++ ++ return StringToEnum('PattynStokesApproximation') ++ ++def StokesApproximationEnum(): ++ """ ++ STOKESAPPROXIMATIONENUM - Enum of StokesApproximation ++ ++ Usage: ++ macro=StokesApproximationEnum() ++ """ ++ ++ return StringToEnum('StokesApproximation') ++ ++def ConstraintsEnum(): ++ """ ++ CONSTRAINTSENUM - Enum of Constraints ++ ++ Usage: ++ macro=ConstraintsEnum() ++ """ ++ ++ return StringToEnum('Constraints') ++ ++def LoadsEnum(): ++ """ ++ LOADSENUM - Enum of Loads ++ ++ Usage: ++ macro=LoadsEnum() ++ """ ++ ++ return StringToEnum('Loads') ++ ++def MaterialsEnum(): ++ """ ++ MATERIALSENUM - Enum of Materials ++ ++ Usage: ++ macro=MaterialsEnum() ++ """ ++ ++ return StringToEnum('Materials') ++ ++def NodesEnum(): ++ """ ++ NODESENUM - Enum of Nodes ++ ++ Usage: ++ macro=NodesEnum() ++ """ ++ ++ return StringToEnum('Nodes') ++ ++def ParametersEnum(): ++ """ ++ PARAMETERSENUM - Enum of Parameters ++ ++ Usage: ++ macro=ParametersEnum() ++ """ ++ ++ return StringToEnum('Parameters') ++ ++def VerticesEnum(): ++ """ ++ VERTICESENUM - Enum of Vertices ++ ++ Usage: ++ macro=VerticesEnum() ++ """ ++ ++ return StringToEnum('Vertices') ++ ++def ResultsEnum(): ++ """ ++ RESULTSENUM - Enum of Results ++ ++ Usage: ++ macro=ResultsEnum() ++ """ ++ ++ return StringToEnum('Results') ++ ++def BoolInputEnum(): ++ """ ++ BOOLINPUTENUM - Enum of BoolInput ++ ++ Usage: ++ macro=BoolInputEnum() ++ """ ++ ++ return StringToEnum('BoolInput') ++ ++def BoolParamEnum(): ++ """ ++ BOOLPARAMENUM - Enum of BoolParam ++ ++ Usage: ++ macro=BoolParamEnum() ++ """ ++ ++ return StringToEnum('BoolParam') ++ ++def ContourEnum(): ++ """ ++ CONTOURENUM - Enum of Contour ++ ++ Usage: ++ macro=ContourEnum() ++ """ ++ ++ return StringToEnum('Contour') ++ ++def ControlInputEnum(): ++ """ ++ CONTROLINPUTENUM - Enum of ControlInput ++ ++ Usage: ++ macro=ControlInputEnum() ++ """ ++ ++ return StringToEnum('ControlInput') ++ ++def DatasetInputEnum(): ++ """ ++ DATASETINPUTENUM - Enum of DatasetInput ++ ++ Usage: ++ macro=DatasetInputEnum() ++ """ ++ ++ return StringToEnum('DatasetInput') ++ ++def DofIndexingEnum(): ++ """ ++ DOFINDEXINGENUM - Enum of DofIndexing ++ ++ Usage: ++ macro=DofIndexingEnum() ++ """ ++ ++ return StringToEnum('DofIndexing') ++ ++def DoubleInputEnum(): ++ """ ++ DOUBLEINPUTENUM - Enum of DoubleInput ++ ++ Usage: ++ macro=DoubleInputEnum() ++ """ ++ ++ return StringToEnum('DoubleInput') ++ ++def DoubleMatArrayParamEnum(): ++ """ ++ DOUBLEMATARRAYPARAMENUM - Enum of DoubleMatArrayParam ++ ++ Usage: ++ macro=DoubleMatArrayParamEnum() ++ """ ++ ++ return StringToEnum('DoubleMatArrayParam') ++ ++def DoubleMatParamEnum(): ++ """ ++ DOUBLEMATPARAMENUM - Enum of DoubleMatParam ++ ++ Usage: ++ macro=DoubleMatParamEnum() ++ """ ++ ++ return StringToEnum('DoubleMatParam') ++ ++def DoubleParamEnum(): ++ """ ++ DOUBLEPARAMENUM - Enum of DoubleParam ++ ++ Usage: ++ macro=DoubleParamEnum() ++ """ ++ ++ return StringToEnum('DoubleParam') ++ ++def DoubleVecParamEnum(): ++ """ ++ DOUBLEVECPARAMENUM - Enum of DoubleVecParam ++ ++ Usage: ++ macro=DoubleVecParamEnum() ++ """ ++ ++ return StringToEnum('DoubleVecParam') ++ ++def ElementEnum(): ++ """ ++ ELEMENTENUM - Enum of Element ++ ++ Usage: ++ macro=ElementEnum() ++ """ ++ ++ return StringToEnum('Element') ++ ++def ElementResultEnum(): ++ """ ++ ELEMENTRESULTENUM - Enum of ElementResult ++ ++ Usage: ++ macro=ElementResultEnum() ++ """ ++ ++ return StringToEnum('ElementResult') ++ ++def ExternalResultEnum(): ++ """ ++ EXTERNALRESULTENUM - Enum of ExternalResult ++ ++ Usage: ++ macro=ExternalResultEnum() ++ """ ++ ++ return StringToEnum('ExternalResult') ++ ++def FileParamEnum(): ++ """ ++ FILEPARAMENUM - Enum of FileParam ++ ++ Usage: ++ macro=FileParamEnum() ++ """ ++ ++ return StringToEnum('FileParam') ++ ++def HookEnum(): ++ """ ++ HOOKENUM - Enum of Hook ++ ++ Usage: ++ macro=HookEnum() ++ """ ++ ++ return StringToEnum('Hook') ++ ++def IcefrontEnum(): ++ """ ++ ICEFRONTENUM - Enum of Icefront ++ ++ Usage: ++ macro=IcefrontEnum() ++ """ ++ ++ return StringToEnum('Icefront') ++ ++def InputEnum(): ++ """ ++ INPUTENUM - Enum of Input ++ ++ Usage: ++ macro=InputEnum() ++ """ ++ ++ return StringToEnum('Input') ++ ++def IntInputEnum(): ++ """ ++ INTINPUTENUM - Enum of IntInput ++ ++ Usage: ++ macro=IntInputEnum() ++ """ ++ ++ return StringToEnum('IntInput') ++ ++def IntParamEnum(): ++ """ ++ INTPARAMENUM - Enum of IntParam ++ ++ Usage: ++ macro=IntParamEnum() ++ """ ++ ++ return StringToEnum('IntParam') ++ ++def IntVecParamEnum(): ++ """ ++ INTVECPARAMENUM - Enum of IntVecParam ++ ++ Usage: ++ macro=IntVecParamEnum() ++ """ ++ ++ return StringToEnum('IntVecParam') ++ ++def MacAyeal2dIceFrontEnum(): ++ """ ++ MACAYEAL2DICEFRONTENUM - Enum of MacAyeal2dIceFront ++ ++ Usage: ++ macro=MacAyeal2dIceFrontEnum() ++ """ ++ ++ return StringToEnum('MacAyeal2dIceFront') ++ ++def MacAyeal3dIceFrontEnum(): ++ """ ++ MACAYEAL3DICEFRONTENUM - Enum of MacAyeal3dIceFront ++ ++ Usage: ++ macro=MacAyeal3dIceFrontEnum() ++ """ ++ ++ return StringToEnum('MacAyeal3dIceFront') ++ ++def MaticeEnum(): ++ """ ++ MATICEENUM - Enum of Matice ++ ++ Usage: ++ macro=MaticeEnum() ++ """ ++ ++ return StringToEnum('Matice') ++ ++def MatparEnum(): ++ """ ++ MATPARENUM - Enum of Matpar ++ ++ Usage: ++ macro=MatparEnum() ++ """ ++ ++ return StringToEnum('Matpar') ++ ++def NodeEnum(): ++ """ ++ NODEENUM - Enum of Node ++ ++ Usage: ++ macro=NodeEnum() ++ """ ++ ++ return StringToEnum('Node') ++ ++def NumericalfluxEnum(): ++ """ ++ NUMERICALFLUXENUM - Enum of Numericalflux ++ ++ Usage: ++ macro=NumericalfluxEnum() ++ """ ++ ++ return StringToEnum('Numericalflux') ++ ++def ParamEnum(): ++ """ ++ PARAMENUM - Enum of Param ++ ++ Usage: ++ macro=ParamEnum() ++ """ ++ ++ return StringToEnum('Param') ++ ++def PattynIceFrontEnum(): ++ """ ++ PATTYNICEFRONTENUM - Enum of PattynIceFront ++ ++ Usage: ++ macro=PattynIceFrontEnum() ++ """ ++ ++ return StringToEnum('PattynIceFront') ++ ++def PengridEnum(): ++ """ ++ PENGRIDENUM - Enum of Pengrid ++ ++ Usage: ++ macro=PengridEnum() ++ """ ++ ++ return StringToEnum('Pengrid') ++ ++def PenpairEnum(): ++ """ ++ PENPAIRENUM - Enum of Penpair ++ ++ Usage: ++ macro=PenpairEnum() ++ """ ++ ++ return StringToEnum('Penpair') ++ ++def PentaEnum(): ++ """ ++ PENTAENUM - Enum of Penta ++ ++ Usage: ++ macro=PentaEnum() ++ """ ++ ++ return StringToEnum('Penta') ++ ++def PentaP1InputEnum(): ++ """ ++ PENTAP1INPUTENUM - Enum of PentaP1Input ++ ++ Usage: ++ macro=PentaP1InputEnum() ++ """ ++ ++ return StringToEnum('PentaP1Input') ++ ++def MatrixParamEnum(): ++ """ ++ MATRIXPARAMENUM - Enum of MatrixParam ++ ++ Usage: ++ macro=MatrixParamEnum() ++ """ ++ ++ return StringToEnum('MatrixParam') ++ ++def VectorParamEnum(): ++ """ ++ VECTORPARAMENUM - Enum of VectorParam ++ ++ Usage: ++ macro=VectorParamEnum() ++ """ ++ ++ return StringToEnum('VectorParam') ++ ++def RiftfrontEnum(): ++ """ ++ RIFTFRONTENUM - Enum of Riftfront ++ ++ Usage: ++ macro=RiftfrontEnum() ++ """ ++ ++ return StringToEnum('Riftfront') ++ ++def SegmentEnum(): ++ """ ++ SEGMENTENUM - Enum of Segment ++ ++ Usage: ++ macro=SegmentEnum() ++ """ ++ ++ return StringToEnum('Segment') ++ ++def SegmentRiftfrontEnum(): ++ """ ++ SEGMENTRIFTFRONTENUM - Enum of SegmentRiftfront ++ ++ Usage: ++ macro=SegmentRiftfrontEnum() ++ """ ++ ++ return StringToEnum('SegmentRiftfront') ++ ++def SpcDynamicEnum(): ++ """ ++ SPCDYNAMICENUM - Enum of SpcDynamic ++ ++ Usage: ++ macro=SpcDynamicEnum() ++ """ ++ ++ return StringToEnum('SpcDynamic') ++ ++def SpcStaticEnum(): ++ """ ++ SPCSTATICENUM - Enum of SpcStatic ++ ++ Usage: ++ macro=SpcStaticEnum() ++ """ ++ ++ return StringToEnum('SpcStatic') ++ ++def SpcTransientEnum(): ++ """ ++ SPCTRANSIENTENUM - Enum of SpcTransient ++ ++ Usage: ++ macro=SpcTransientEnum() ++ """ ++ ++ return StringToEnum('SpcTransient') ++ ++def StokesIceFrontEnum(): ++ """ ++ STOKESICEFRONTENUM - Enum of StokesIceFront ++ ++ Usage: ++ macro=StokesIceFrontEnum() ++ """ ++ ++ return StringToEnum('StokesIceFront') ++ ++def StringArrayParamEnum(): ++ """ ++ STRINGARRAYPARAMENUM - Enum of StringArrayParam ++ ++ Usage: ++ macro=StringArrayParamEnum() ++ """ ++ ++ return StringToEnum('StringArrayParam') ++ ++def StringParamEnum(): ++ """ ++ STRINGPARAMENUM - Enum of StringParam ++ ++ Usage: ++ macro=StringParamEnum() ++ """ ++ ++ return StringToEnum('StringParam') ++ ++def TriaEnum(): ++ """ ++ TRIAENUM - Enum of Tria ++ ++ Usage: ++ macro=TriaEnum() ++ """ ++ ++ return StringToEnum('Tria') ++ ++def TriaP1InputEnum(): ++ """ ++ TRIAP1INPUTENUM - Enum of TriaP1Input ++ ++ Usage: ++ macro=TriaP1InputEnum() ++ """ ++ ++ return StringToEnum('TriaP1Input') ++ ++def VertexEnum(): ++ """ ++ VERTEXENUM - Enum of Vertex ++ ++ Usage: ++ macro=VertexEnum() ++ """ ++ ++ return StringToEnum('Vertex') ++ ++def AirEnum(): ++ """ ++ AIRENUM - Enum of Air ++ ++ Usage: ++ macro=AirEnum() ++ """ ++ ++ return StringToEnum('Air') ++ ++def IceEnum(): ++ """ ++ ICEENUM - Enum of Ice ++ ++ Usage: ++ macro=IceEnum() ++ """ ++ ++ return StringToEnum('Ice') ++ ++def MelangeEnum(): ++ """ ++ MELANGEENUM - Enum of Melange ++ ++ Usage: ++ macro=MelangeEnum() ++ """ ++ ++ return StringToEnum('Melange') ++ ++def WaterEnum(): ++ """ ++ WATERENUM - Enum of Water ++ ++ Usage: ++ macro=WaterEnum() ++ """ ++ ++ return StringToEnum('Water') ++ ++def ClosedEnum(): ++ """ ++ CLOSEDENUM - Enum of Closed ++ ++ Usage: ++ macro=ClosedEnum() ++ """ ++ ++ return StringToEnum('Closed') ++ ++def FreeEnum(): ++ """ ++ FREEENUM - Enum of Free ++ ++ Usage: ++ macro=FreeEnum() ++ """ ++ ++ return StringToEnum('Free') ++ ++def OpenEnum(): ++ """ ++ OPENENUM - Enum of Open ++ ++ Usage: ++ macro=OpenEnum() ++ """ ++ ++ return StringToEnum('Open') ++ ++def AdjointpEnum(): ++ """ ++ ADJOINTPENUM - Enum of Adjointp ++ ++ Usage: ++ macro=AdjointpEnum() ++ """ ++ ++ return StringToEnum('Adjointp') ++ ++def AdjointxEnum(): ++ """ ++ ADJOINTXENUM - Enum of Adjointx ++ ++ Usage: ++ macro=AdjointxEnum() ++ """ ++ ++ return StringToEnum('Adjointx') ++ ++def AdjointyEnum(): ++ """ ++ ADJOINTYENUM - Enum of Adjointy ++ ++ Usage: ++ macro=AdjointyEnum() ++ """ ++ ++ return StringToEnum('Adjointy') ++ ++def AdjointzEnum(): ++ """ ++ ADJOINTZENUM - Enum of Adjointz ++ ++ Usage: ++ macro=AdjointzEnum() ++ """ ++ ++ return StringToEnum('Adjointz') ++ ++def BedSlopeXEnum(): ++ """ ++ BEDSLOPEXENUM - Enum of BedSlopeX ++ ++ Usage: ++ macro=BedSlopeXEnum() ++ """ ++ ++ return StringToEnum('BedSlopeX') ++ ++def BedSlopeYEnum(): ++ """ ++ BEDSLOPEYENUM - Enum of BedSlopeY ++ ++ Usage: ++ macro=BedSlopeYEnum() ++ """ ++ ++ return StringToEnum('BedSlopeY') ++ ++def BoundaryEnum(): ++ """ ++ BOUNDARYENUM - Enum of Boundary ++ ++ Usage: ++ macro=BoundaryEnum() ++ """ ++ ++ return StringToEnum('Boundary') ++ ++def ConstantEnum(): ++ """ ++ CONSTANTENUM - Enum of Constant ++ ++ Usage: ++ macro=ConstantEnum() ++ """ ++ ++ return StringToEnum('Constant') ++ ++def ConvergedEnum(): ++ """ ++ CONVERGEDENUM - Enum of Converged ++ ++ Usage: ++ macro=ConvergedEnum() ++ """ ++ ++ return StringToEnum('Converged') ++ ++def ExtToIuEnum(): ++ """ ++ EXTTOIUENUM - Enum of ExtToIu ++ ++ Usage: ++ macro=ExtToIuEnum() ++ """ ++ ++ return StringToEnum('ExtToIu') ++ ++def FillEnum(): ++ """ ++ FILLENUM - Enum of Fill ++ ++ Usage: ++ macro=FillEnum() ++ """ ++ ++ return StringToEnum('Fill') ++ ++def FractionIncrementEnum(): ++ """ ++ FRACTIONINCREMENTENUM - Enum of FractionIncrement ++ ++ Usage: ++ macro=FractionIncrementEnum() ++ """ ++ ++ return StringToEnum('FractionIncrement') ++ ++def FrictionEnum(): ++ """ ++ FRICTIONENUM - Enum of Friction ++ ++ Usage: ++ macro=FrictionEnum() ++ """ ++ ++ return StringToEnum('Friction') ++ ++def GroundinglineMeltingRateEnum(): ++ """ ++ GROUNDINGLINEMELTINGRATEENUM - Enum of GroundinglineMeltingRate ++ ++ Usage: ++ macro=GroundinglineMeltingRateEnum() ++ """ ++ ++ return StringToEnum('GroundinglineMeltingRate') ++ ++def InternalEnum(): ++ """ ++ INTERNALENUM - Enum of Internal ++ ++ Usage: ++ macro=InternalEnum() ++ """ ++ ++ return StringToEnum('Internal') ++ ++def IuToExtEnum(): ++ """ ++ IUTOEXTENUM - Enum of IuToExt ++ ++ Usage: ++ macro=IuToExtEnum() ++ """ ++ ++ return StringToEnum('IuToExt') ++ ++def MassFluxEnum(): ++ """ ++ MASSFLUXENUM - Enum of MassFlux ++ ++ Usage: ++ macro=MassFluxEnum() ++ """ ++ ++ return StringToEnum('MassFlux') ++ ++def MaxPenetrationEnum(): ++ """ ++ MAXPENETRATIONENUM - Enum of MaxPenetration ++ ++ Usage: ++ macro=MaxPenetrationEnum() ++ """ ++ ++ return StringToEnum('MaxPenetration') ++ ++def MeltingOffsetEnum(): ++ """ ++ MELTINGOFFSETENUM - Enum of MeltingOffset ++ ++ Usage: ++ macro=MeltingOffsetEnum() ++ """ ++ ++ return StringToEnum('MeltingOffset') ++ ++def MisfitEnum(): ++ """ ++ MISFITENUM - Enum of Misfit ++ ++ Usage: ++ macro=MisfitEnum() ++ """ ++ ++ return StringToEnum('Misfit') ++ ++def NumberNodeToElementConnectivityEnum(): ++ """ ++ NUMBERNODETOELEMENTCONNECTIVITYENUM - Enum of NumberNodeToElementConnectivity ++ ++ Usage: ++ macro=NumberNodeToElementConnectivityEnum() ++ """ ++ ++ return StringToEnum('NumberNodeToElementConnectivity') ++ ++def PressureEnum(): ++ """ ++ PRESSUREENUM - Enum of Pressure ++ ++ Usage: ++ macro=PressureEnum() ++ """ ++ ++ return StringToEnum('Pressure') ++ ++def PressurePicardEnum(): ++ """ ++ PRESSUREPICARDENUM - Enum of PressurePicard ++ ++ Usage: ++ macro=PressurePicardEnum() ++ """ ++ ++ return StringToEnum('PressurePicard') ++ ++def QmuPressureEnum(): ++ """ ++ QMUPRESSUREENUM - Enum of QmuPressure ++ ++ Usage: ++ macro=QmuPressureEnum() ++ """ ++ ++ return StringToEnum('QmuPressure') ++ ++def QmuVxEnum(): ++ """ ++ QMUVXENUM - Enum of QmuVx ++ ++ Usage: ++ macro=QmuVxEnum() ++ """ ++ ++ return StringToEnum('QmuVx') ++ ++def QmuVyEnum(): ++ """ ++ QMUVYENUM - Enum of QmuVy ++ ++ Usage: ++ macro=QmuVyEnum() ++ """ ++ ++ return StringToEnum('QmuVy') ++ ++def QmuVzEnum(): ++ """ ++ QMUVZENUM - Enum of QmuVz ++ ++ Usage: ++ macro=QmuVzEnum() ++ """ ++ ++ return StringToEnum('QmuVz') ++ ++def QmuThicknessEnum(): ++ """ ++ QMUTHICKNESSENUM - Enum of QmuThickness ++ ++ Usage: ++ macro=QmuThicknessEnum() ++ """ ++ ++ return StringToEnum('QmuThickness') ++ ++def QmuBedEnum(): ++ """ ++ QMUBEDENUM - Enum of QmuBed ++ ++ Usage: ++ macro=QmuBedEnum() ++ """ ++ ++ return StringToEnum('QmuBed') ++ ++def QmuSurfaceEnum(): ++ """ ++ QMUSURFACEENUM - Enum of QmuSurface ++ ++ Usage: ++ macro=QmuSurfaceEnum() ++ """ ++ ++ return StringToEnum('QmuSurface') ++ ++def QmuMeltingEnum(): ++ """ ++ QMUMELTINGENUM - Enum of QmuMelting ++ ++ Usage: ++ macro=QmuMeltingEnum() ++ """ ++ ++ return StringToEnum('QmuMelting') ++ ++def ResetPenaltiesEnum(): ++ """ ++ RESETPENALTIESENUM - Enum of ResetPenalties ++ ++ Usage: ++ macro=ResetPenaltiesEnum() ++ """ ++ ++ return StringToEnum('ResetPenalties') ++ ++def SegmentOnIceShelfEnum(): ++ """ ++ SEGMENTONICESHELFENUM - Enum of SegmentOnIceShelf ++ ++ Usage: ++ macro=SegmentOnIceShelfEnum() ++ """ ++ ++ return StringToEnum('SegmentOnIceShelf') ++ ++def SurfaceAbsVelMisfitEnum(): ++ """ ++ SURFACEABSVELMISFITENUM - Enum of SurfaceAbsVelMisfit ++ ++ Usage: ++ macro=SurfaceAbsVelMisfitEnum() ++ """ ++ ++ return StringToEnum('SurfaceAbsVelMisfit') ++ ++def SurfaceAreaEnum(): ++ """ ++ SURFACEAREAENUM - Enum of SurfaceArea ++ ++ Usage: ++ macro=SurfaceAreaEnum() ++ """ ++ ++ return StringToEnum('SurfaceArea') ++ ++def SurfaceAverageVelMisfitEnum(): ++ """ ++ SURFACEAVERAGEVELMISFITENUM - Enum of SurfaceAverageVelMisfit ++ ++ Usage: ++ macro=SurfaceAverageVelMisfitEnum() ++ """ ++ ++ return StringToEnum('SurfaceAverageVelMisfit') ++ ++def SurfaceLogVelMisfitEnum(): ++ """ ++ SURFACELOGVELMISFITENUM - Enum of SurfaceLogVelMisfit ++ ++ Usage: ++ macro=SurfaceLogVelMisfitEnum() ++ """ ++ ++ return StringToEnum('SurfaceLogVelMisfit') ++ ++def SurfaceLogVxVyMisfitEnum(): ++ """ ++ SURFACELOGVXVYMISFITENUM - Enum of SurfaceLogVxVyMisfit ++ ++ Usage: ++ macro=SurfaceLogVxVyMisfitEnum() ++ """ ++ ++ return StringToEnum('SurfaceLogVxVyMisfit') ++ ++def SurfaceRelVelMisfitEnum(): ++ """ ++ SURFACERELVELMISFITENUM - Enum of SurfaceRelVelMisfit ++ ++ Usage: ++ macro=SurfaceRelVelMisfitEnum() ++ """ ++ ++ return StringToEnum('SurfaceRelVelMisfit') ++ ++def SurfaceSlopeXEnum(): ++ """ ++ SURFACESLOPEXENUM - Enum of SurfaceSlopeX ++ ++ Usage: ++ macro=SurfaceSlopeXEnum() ++ """ ++ ++ return StringToEnum('SurfaceSlopeX') ++ ++def SurfaceSlopeYEnum(): ++ """ ++ SURFACESLOPEYENUM - Enum of SurfaceSlopeY ++ ++ Usage: ++ macro=SurfaceSlopeYEnum() ++ """ ++ ++ return StringToEnum('SurfaceSlopeY') ++ ++def TemperatureEnum(): ++ """ ++ TEMPERATUREENUM - Enum of Temperature ++ ++ Usage: ++ macro=TemperatureEnum() ++ """ ++ ++ return StringToEnum('Temperature') ++ ++def TemperatureOldEnum(): ++ """ ++ TEMPERATUREOLDENUM - Enum of TemperatureOld ++ ++ Usage: ++ macro=TemperatureOldEnum() ++ """ ++ ++ return StringToEnum('TemperatureOld') ++ ++def TemperaturePicardEnum(): ++ """ ++ TEMPERATUREPICARDENUM - Enum of TemperaturePicard ++ ++ Usage: ++ macro=TemperaturePicardEnum() ++ """ ++ ++ return StringToEnum('TemperaturePicard') ++ ++def ThicknessAbsMisfitEnum(): ++ """ ++ THICKNESSABSMISFITENUM - Enum of ThicknessAbsMisfit ++ ++ Usage: ++ macro=ThicknessAbsMisfitEnum() ++ """ ++ ++ return StringToEnum('ThicknessAbsMisfit') ++ ++def TypeEnum(): ++ """ ++ TYPEENUM - Enum of Type ++ ++ Usage: ++ macro=TypeEnum() ++ """ ++ ++ return StringToEnum('Type') ++ ++def VelEnum(): ++ """ ++ VELENUM - Enum of Vel ++ ++ Usage: ++ macro=VelEnum() ++ """ ++ ++ return StringToEnum('Vel') ++ ++def VelocityEnum(): ++ """ ++ VELOCITYENUM - Enum of Velocity ++ ++ Usage: ++ macro=VelocityEnum() ++ """ ++ ++ return StringToEnum('Velocity') ++ ++def VxAverageEnum(): ++ """ ++ VXAVERAGEENUM - Enum of VxAverage ++ ++ Usage: ++ macro=VxAverageEnum() ++ """ ++ ++ return StringToEnum('VxAverage') ++ ++def VxEnum(): ++ """ ++ VXENUM - Enum of Vx ++ ++ Usage: ++ macro=VxEnum() ++ """ ++ ++ return StringToEnum('Vx') ++ ++def VxPicardEnum(): ++ """ ++ VXPICARDENUM - Enum of VxPicard ++ ++ Usage: ++ macro=VxPicardEnum() ++ """ ++ ++ return StringToEnum('VxPicard') ++ ++def VyAverageEnum(): ++ """ ++ VYAVERAGEENUM - Enum of VyAverage ++ ++ Usage: ++ macro=VyAverageEnum() ++ """ ++ ++ return StringToEnum('VyAverage') ++ ++def VyEnum(): ++ """ ++ VYENUM - Enum of Vy ++ ++ Usage: ++ macro=VyEnum() ++ """ ++ ++ return StringToEnum('Vy') ++ ++def VyPicardEnum(): ++ """ ++ VYPICARDENUM - Enum of VyPicard ++ ++ Usage: ++ macro=VyPicardEnum() ++ """ ++ ++ return StringToEnum('VyPicard') ++ ++def VzEnum(): ++ """ ++ VZENUM - Enum of Vz ++ ++ Usage: ++ macro=VzEnum() ++ """ ++ ++ return StringToEnum('Vz') ++ ++def VzMacAyealEnum(): ++ """ ++ VZMACAYEALENUM - Enum of VzMacAyeal ++ ++ Usage: ++ macro=VzMacAyealEnum() ++ """ ++ ++ return StringToEnum('VzMacAyeal') ++ ++def VzPattynEnum(): ++ """ ++ VZPATTYNENUM - Enum of VzPattyn ++ ++ Usage: ++ macro=VzPattynEnum() ++ """ ++ ++ return StringToEnum('VzPattyn') ++ ++def VzPicardEnum(): ++ """ ++ VZPICARDENUM - Enum of VzPicard ++ ++ Usage: ++ macro=VzPicardEnum() ++ """ ++ ++ return StringToEnum('VzPicard') ++ ++def VzStokesEnum(): ++ """ ++ VZSTOKESENUM - Enum of VzStokes ++ ++ Usage: ++ macro=VzStokesEnum() ++ """ ++ ++ return StringToEnum('VzStokes') ++ ++def VxMeshEnum(): ++ """ ++ VXMESHENUM - Enum of VxMesh ++ ++ Usage: ++ macro=VxMeshEnum() ++ """ ++ ++ return StringToEnum('VxMesh') ++ ++def VyMeshEnum(): ++ """ ++ VYMESHENUM - Enum of VyMesh ++ ++ Usage: ++ macro=VyMeshEnum() ++ """ ++ ++ return StringToEnum('VyMesh') ++ ++def VzMeshEnum(): ++ """ ++ VZMESHENUM - Enum of VzMesh ++ ++ Usage: ++ macro=VzMeshEnum() ++ """ ++ ++ return StringToEnum('VzMesh') ++ ++def EnthalpyEnum(): ++ """ ++ ENTHALPYENUM - Enum of Enthalpy ++ ++ Usage: ++ macro=EnthalpyEnum() ++ """ ++ ++ return StringToEnum('Enthalpy') ++ ++def EnthalpyPicardEnum(): ++ """ ++ ENTHALPYPICARDENUM - Enum of EnthalpyPicard ++ ++ Usage: ++ macro=EnthalpyPicardEnum() ++ """ ++ ++ return StringToEnum('EnthalpyPicard') ++ ++def ThicknessAbsGradientEnum(): ++ """ ++ THICKNESSABSGRADIENTENUM - Enum of ThicknessAbsGradient ++ ++ Usage: ++ macro=ThicknessAbsGradientEnum() ++ """ ++ ++ return StringToEnum('ThicknessAbsGradient') ++ ++def StepResponsesEnum(): ++ """ ++ STEPRESPONSESENUM - Enum of StepResponses ++ ++ Usage: ++ macro=StepResponsesEnum() ++ """ ++ ++ return StringToEnum('StepResponses') ++ ++def IntMatParamEnum(): ++ """ ++ INTMATPARAMENUM - Enum of IntMatParam ++ ++ Usage: ++ macro=IntMatParamEnum() ++ """ ++ ++ return StringToEnum('IntMatParam') ++ ++def RheologyBbarAbsGradientEnum(): ++ """ ++ RHEOLOGYBBARABSGRADIENTENUM - Enum of RheologyBbarAbsGradient ++ ++ Usage: ++ macro=RheologyBbarAbsGradientEnum() ++ """ ++ ++ return StringToEnum('RheologyBbarAbsGradient') ++ ++def DragCoefficientAbsGradientEnum(): ++ """ ++ DRAGCOEFFICIENTABSGRADIENTENUM - Enum of DragCoefficientAbsGradient ++ ++ Usage: ++ macro=DragCoefficientAbsGradientEnum() ++ """ ++ ++ return StringToEnum('DragCoefficientAbsGradient') ++ ++def TransientInputEnum(): ++ """ ++ TRANSIENTINPUTENUM - Enum of TransientInput ++ ++ Usage: ++ macro=TransientInputEnum() ++ """ ++ ++ return StringToEnum('TransientInput') ++ ++def OutputfilenameEnum(): ++ """ ++ OUTPUTFILENAMEENUM - Enum of Outputfilename ++ ++ Usage: ++ macro=OutputfilenameEnum() ++ """ ++ ++ return StringToEnum('Outputfilename') ++ ++def WaterfractionEnum(): ++ """ ++ WATERFRACTIONENUM - Enum of Waterfraction ++ ++ Usage: ++ macro=WaterfractionEnum() ++ """ ++ ++ return StringToEnum('Waterfraction') ++ ++def WatercolumnEnum(): ++ """ ++ WATERCOLUMNENUM - Enum of Watercolumn ++ ++ Usage: ++ macro=WatercolumnEnum() ++ """ ++ ++ return StringToEnum('Watercolumn') ++ ++def BasalFrictionEnum(): ++ """ ++ BASALFRICTIONENUM - Enum of BasalFriction ++ ++ Usage: ++ macro=BasalFrictionEnum() ++ """ ++ ++ return StringToEnum('BasalFriction') ++ ++def ViscousHeatingEnum(): ++ """ ++ VISCOUSHEATINGENUM - Enum of ViscousHeating ++ ++ Usage: ++ macro=ViscousHeatingEnum() ++ """ ++ ++ return StringToEnum('ViscousHeating') ++ ++def QmuTemperatureEnum(): ++ """ ++ QMUTEMPERATUREENUM - Enum of QmuTemperature ++ ++ Usage: ++ macro=QmuTemperatureEnum() ++ """ ++ ++ return StringToEnum('QmuTemperature') ++ ++def HydrologyWaterVxEnum(): ++ """ ++ HYDROLOGYWATERVXENUM - Enum of HydrologyWaterVx ++ ++ Usage: ++ macro=HydrologyWaterVxEnum() ++ """ ++ ++ return StringToEnum('HydrologyWaterVx') ++ ++def HydrologyWaterVyEnum(): ++ """ ++ HYDROLOGYWATERVYENUM - Enum of HydrologyWaterVy ++ ++ Usage: ++ macro=HydrologyWaterVyEnum() ++ """ ++ ++ return StringToEnum('HydrologyWaterVy') ++ ++def StressTensorEnum(): ++ """ ++ STRESSTENSORENUM - Enum of StressTensor ++ ++ Usage: ++ macro=StressTensorEnum() ++ """ ++ ++ return StringToEnum('StressTensor') ++ ++def StressTensorxxEnum(): ++ """ ++ STRESSTENSORXXENUM - Enum of StressTensorxx ++ ++ Usage: ++ macro=StressTensorxxEnum() ++ """ ++ ++ return StringToEnum('StressTensorxx') ++ ++def StressTensorxyEnum(): ++ """ ++ STRESSTENSORXYENUM - Enum of StressTensorxy ++ ++ Usage: ++ macro=StressTensorxyEnum() ++ """ ++ ++ return StringToEnum('StressTensorxy') ++ ++def StressTensorxzEnum(): ++ """ ++ STRESSTENSORXZENUM - Enum of StressTensorxz ++ ++ Usage: ++ macro=StressTensorxzEnum() ++ """ ++ ++ return StringToEnum('StressTensorxz') ++ ++def StressTensoryyEnum(): ++ """ ++ STRESSTENSORYYENUM - Enum of StressTensoryy ++ ++ Usage: ++ macro=StressTensoryyEnum() ++ """ ++ ++ return StringToEnum('StressTensoryy') ++ ++def StressTensoryzEnum(): ++ """ ++ STRESSTENSORYZENUM - Enum of StressTensoryz ++ ++ Usage: ++ macro=StressTensoryzEnum() ++ """ ++ ++ return StringToEnum('StressTensoryz') ++ ++def StressTensorzzEnum(): ++ """ ++ STRESSTENSORZZENUM - Enum of StressTensorzz ++ ++ Usage: ++ macro=StressTensorzzEnum() ++ """ ++ ++ return StringToEnum('StressTensorzz') ++ ++def IceVolumeEnum(): ++ """ ++ ICEVOLUMEENUM - Enum of IceVolume ++ ++ Usage: ++ macro=IceVolumeEnum() ++ """ ++ ++ return StringToEnum('IceVolume') ++ ++def P0Enum(): ++ """ ++ P0ENUM - Enum of P0 ++ ++ Usage: ++ macro=P0Enum() ++ """ ++ ++ return StringToEnum('P0') ++ ++def P1Enum(): ++ """ ++ P1ENUM - Enum of P1 ++ ++ Usage: ++ macro=P1Enum() ++ """ ++ ++ return StringToEnum('P1') ++ ++def P1DGEnum(): ++ """ ++ P1DGENUM - Enum of P1DG ++ ++ Usage: ++ macro=P1DGEnum() ++ """ ++ ++ return StringToEnum('P1DG') ++ ++def SaveResultsEnum(): ++ """ ++ SAVERESULTSENUM - Enum of SaveResults ++ ++ Usage: ++ macro=SaveResultsEnum() ++ """ ++ ++ return StringToEnum('SaveResults') ++ ++def BoolElementResultEnum(): ++ """ ++ BOOLELEMENTRESULTENUM - Enum of BoolElementResult ++ ++ Usage: ++ macro=BoolElementResultEnum() ++ """ ++ ++ return StringToEnum('BoolElementResult') ++ ++def BoolExternalResultEnum(): ++ """ ++ BOOLEXTERNALRESULTENUM - Enum of BoolExternalResult ++ ++ Usage: ++ macro=BoolExternalResultEnum() ++ """ ++ ++ return StringToEnum('BoolExternalResult') ++ ++def DoubleElementResultEnum(): ++ """ ++ DOUBLEELEMENTRESULTENUM - Enum of DoubleElementResult ++ ++ Usage: ++ macro=DoubleElementResultEnum() ++ """ ++ ++ return StringToEnum('DoubleElementResult') ++ ++def DoubleExternalResultEnum(): ++ """ ++ DOUBLEEXTERNALRESULTENUM - Enum of DoubleExternalResult ++ ++ Usage: ++ macro=DoubleExternalResultEnum() ++ """ ++ ++ return StringToEnum('DoubleExternalResult') ++ ++def DoubleMatExternalResultEnum(): ++ """ ++ DOUBLEMATEXTERNALRESULTENUM - Enum of DoubleMatExternalResult ++ ++ Usage: ++ macro=DoubleMatExternalResultEnum() ++ """ ++ ++ return StringToEnum('DoubleMatExternalResult') ++ ++def DoubleVecExternalResultEnum(): ++ """ ++ DOUBLEVECEXTERNALRESULTENUM - Enum of DoubleVecExternalResult ++ ++ Usage: ++ macro=DoubleVecExternalResultEnum() ++ """ ++ ++ return StringToEnum('DoubleVecExternalResult') ++ ++def IntExternalResultEnum(): ++ """ ++ INTEXTERNALRESULTENUM - Enum of IntExternalResult ++ ++ Usage: ++ macro=IntExternalResultEnum() ++ """ ++ ++ return StringToEnum('IntExternalResult') ++ ++def JEnum(): ++ """ ++ JENUM - Enum of J ++ ++ Usage: ++ macro=JEnum() ++ """ ++ ++ return StringToEnum('J') ++ ++def PatchEnum(): ++ """ ++ PATCHENUM - Enum of Patch ++ ++ Usage: ++ macro=PatchEnum() ++ """ ++ ++ return StringToEnum('Patch') ++ ++def PatchNodesEnum(): ++ """ ++ PATCHNODESENUM - Enum of PatchNodes ++ ++ Usage: ++ macro=PatchNodesEnum() ++ """ ++ ++ return StringToEnum('PatchNodes') ++ ++def PatchVerticesEnum(): ++ """ ++ PATCHVERTICESENUM - Enum of PatchVertices ++ ++ Usage: ++ macro=PatchVerticesEnum() ++ """ ++ ++ return StringToEnum('PatchVertices') ++ ++def PentaP1ElementResultEnum(): ++ """ ++ PENTAP1ELEMENTRESULTENUM - Enum of PentaP1ElementResult ++ ++ Usage: ++ macro=PentaP1ElementResultEnum() ++ """ ++ ++ return StringToEnum('PentaP1ElementResult') ++ ++def PetscVecExternalResultEnum(): ++ """ ++ PETSCVECEXTERNALRESULTENUM - Enum of PetscVecExternalResult ++ ++ Usage: ++ macro=PetscVecExternalResultEnum() ++ """ ++ ++ return StringToEnum('PetscVecExternalResult') ++ ++def StringExternalResultEnum(): ++ """ ++ STRINGEXTERNALRESULTENUM - Enum of StringExternalResult ++ ++ Usage: ++ macro=StringExternalResultEnum() ++ """ ++ ++ return StringToEnum('StringExternalResult') ++ ++def StepEnum(): ++ """ ++ STEPENUM - Enum of Step ++ ++ Usage: ++ macro=StepEnum() ++ """ ++ ++ return StringToEnum('Step') ++ ++def TimeEnum(): ++ """ ++ TIMEENUM - Enum of Time ++ ++ Usage: ++ macro=TimeEnum() ++ """ ++ ++ return StringToEnum('Time') ++ ++def TriaP1ElementResultEnum(): ++ """ ++ TRIAP1ELEMENTRESULTENUM - Enum of TriaP1ElementResult ++ ++ Usage: ++ macro=TriaP1ElementResultEnum() ++ """ ++ ++ return StringToEnum('TriaP1ElementResult') ++ ++def WaterColumnOldEnum(): ++ """ ++ WATERCOLUMNOLDENUM - Enum of WaterColumnOld ++ ++ Usage: ++ macro=WaterColumnOldEnum() ++ """ ++ ++ return StringToEnum('WaterColumnOld') ++ ++def MinVelEnum(): ++ """ ++ MINVELENUM - Enum of MinVel ++ ++ Usage: ++ macro=MinVelEnum() ++ """ ++ ++ return StringToEnum('MinVel') ++ ++def MaxVelEnum(): ++ """ ++ MAXVELENUM - Enum of MaxVel ++ ++ Usage: ++ macro=MaxVelEnum() ++ """ ++ ++ return StringToEnum('MaxVel') ++ ++def MinVxEnum(): ++ """ ++ MINVXENUM - Enum of MinVx ++ ++ Usage: ++ macro=MinVxEnum() ++ """ ++ ++ return StringToEnum('MinVx') ++ ++def MaxVxEnum(): ++ """ ++ MAXVXENUM - Enum of MaxVx ++ ++ Usage: ++ macro=MaxVxEnum() ++ """ ++ ++ return StringToEnum('MaxVx') ++ ++def MaxAbsVxEnum(): ++ """ ++ MAXABSVXENUM - Enum of MaxAbsVx ++ ++ Usage: ++ macro=MaxAbsVxEnum() ++ """ ++ ++ return StringToEnum('MaxAbsVx') ++ ++def MinVyEnum(): ++ """ ++ MINVYENUM - Enum of MinVy ++ ++ Usage: ++ macro=MinVyEnum() ++ """ ++ ++ return StringToEnum('MinVy') ++ ++def MaxVyEnum(): ++ """ ++ MAXVYENUM - Enum of MaxVy ++ ++ Usage: ++ macro=MaxVyEnum() ++ """ ++ ++ return StringToEnum('MaxVy') ++ ++def MaxAbsVyEnum(): ++ """ ++ MAXABSVYENUM - Enum of MaxAbsVy ++ ++ Usage: ++ macro=MaxAbsVyEnum() ++ """ ++ ++ return StringToEnum('MaxAbsVy') ++ ++def MinVzEnum(): ++ """ ++ MINVZENUM - Enum of MinVz ++ ++ Usage: ++ macro=MinVzEnum() ++ """ ++ ++ return StringToEnum('MinVz') ++ ++def MaxVzEnum(): ++ """ ++ MAXVZENUM - Enum of MaxVz ++ ++ Usage: ++ macro=MaxVzEnum() ++ """ ++ ++ return StringToEnum('MaxVz') ++ ++def MaxAbsVzEnum(): ++ """ ++ MAXABSVZENUM - Enum of MaxAbsVz ++ ++ Usage: ++ macro=MaxAbsVzEnum() ++ """ ++ ++ return StringToEnum('MaxAbsVz') ++ ++def RelativeEnum(): ++ """ ++ RELATIVEENUM - Enum of Relative ++ ++ Usage: ++ macro=RelativeEnum() ++ """ ++ ++ return StringToEnum('Relative') ++ ++def AbsoluteEnum(): ++ """ ++ ABSOLUTEENUM - Enum of Absolute ++ ++ Usage: ++ macro=AbsoluteEnum() ++ """ ++ ++ return StringToEnum('Absolute') ++ ++def IncrementalEnum(): ++ """ ++ INCREMENTALENUM - Enum of Incremental ++ ++ Usage: ++ macro=IncrementalEnum() ++ """ ++ ++ return StringToEnum('Incremental') ++ ++def AgressiveMigrationEnum(): ++ """ ++ AGRESSIVEMIGRATIONENUM - Enum of AgressiveMigration ++ ++ Usage: ++ macro=AgressiveMigrationEnum() ++ """ ++ ++ return StringToEnum('AgressiveMigration') ++ ++def NoneEnum(): ++ """ ++ NONEENUM - Enum of None ++ ++ Usage: ++ macro=NoneEnum() ++ """ ++ ++ return StringToEnum('None') ++ ++def SoftMigrationEnum(): ++ """ ++ SOFTMIGRATIONENUM - Enum of SoftMigration ++ ++ Usage: ++ macro=SoftMigrationEnum() ++ """ ++ ++ return StringToEnum('SoftMigration') ++ ++def StokesSolverEnum(): ++ """ ++ STOKESSOLVERENUM - Enum of StokesSolver ++ ++ Usage: ++ macro=StokesSolverEnum() ++ """ ++ ++ return StringToEnum('StokesSolver') ++ ++def AdjointEnum(): ++ """ ++ ADJOINTENUM - Enum of Adjoint ++ ++ Usage: ++ macro=AdjointEnum() ++ """ ++ ++ return StringToEnum('Adjoint') ++ ++def ColinearEnum(): ++ """ ++ COLINEARENUM - Enum of Colinear ++ ++ Usage: ++ macro=ColinearEnum() ++ """ ++ ++ return StringToEnum('Colinear') ++ ++def ControlSteadyEnum(): ++ """ ++ CONTROLSTEADYENUM - Enum of ControlSteady ++ ++ Usage: ++ macro=ControlSteadyEnum() ++ """ ++ ++ return StringToEnum('ControlSteady') ++ ++def FsetEnum(): ++ """ ++ FSETENUM - Enum of Fset ++ ++ Usage: ++ macro=FsetEnum() ++ """ ++ ++ return StringToEnum('Fset') ++ ++def Gradient1Enum(): ++ """ ++ GRADIENT1ENUM - Enum of Gradient1 ++ ++ Usage: ++ macro=Gradient1Enum() ++ """ ++ ++ return StringToEnum('Gradient1') ++ ++def Gradient2Enum(): ++ """ ++ GRADIENT2ENUM - Enum of Gradient2 ++ ++ Usage: ++ macro=Gradient2Enum() ++ """ ++ ++ return StringToEnum('Gradient2') ++ ++def Gradient3Enum(): ++ """ ++ GRADIENT3ENUM - Enum of Gradient3 ++ ++ Usage: ++ macro=Gradient3Enum() ++ """ ++ ++ return StringToEnum('Gradient3') ++ ++def GradientEnum(): ++ """ ++ GRADIENTENUM - Enum of Gradient ++ ++ Usage: ++ macro=GradientEnum() ++ """ ++ ++ return StringToEnum('Gradient') ++ ++def GroundinglineMigrationEnum(): ++ """ ++ GROUNDINGLINEMIGRATIONENUM - Enum of GroundinglineMigration ++ ++ Usage: ++ macro=GroundinglineMigrationEnum() ++ """ ++ ++ return StringToEnum('GroundinglineMigration') ++ ++def GsetEnum(): ++ """ ++ GSETENUM - Enum of Gset ++ ++ Usage: ++ macro=GsetEnum() ++ """ ++ ++ return StringToEnum('Gset') ++ ++def IndexEnum(): ++ """ ++ INDEXENUM - Enum of Index ++ ++ Usage: ++ macro=IndexEnum() ++ """ ++ ++ return StringToEnum('Index') ++ ++def IndexedEnum(): ++ """ ++ INDEXEDENUM - Enum of Indexed ++ ++ Usage: ++ macro=IndexedEnum() ++ """ ++ ++ return StringToEnum('Indexed') ++ ++def IntersectEnum(): ++ """ ++ INTERSECTENUM - Enum of Intersect ++ ++ Usage: ++ macro=IntersectEnum() ++ """ ++ ++ return StringToEnum('Intersect') ++ ++def NodalEnum(): ++ """ ++ NODALENUM - Enum of Nodal ++ ++ Usage: ++ macro=NodalEnum() ++ """ ++ ++ return StringToEnum('Nodal') ++ ++def OldGradientEnum(): ++ """ ++ OLDGRADIENTENUM - Enum of OldGradient ++ ++ Usage: ++ macro=OldGradientEnum() ++ """ ++ ++ return StringToEnum('OldGradient') ++ ++def OutputFilePointerEnum(): ++ """ ++ OUTPUTFILEPOINTERENUM - Enum of OutputFilePointer ++ ++ Usage: ++ macro=OutputFilePointerEnum() ++ """ ++ ++ return StringToEnum('OutputFilePointer') ++ ++def PetscOptionsAnalysesEnum(): ++ """ ++ PETSCOPTIONSANALYSESENUM - Enum of PetscOptionsAnalyses ++ ++ Usage: ++ macro=PetscOptionsAnalysesEnum() ++ """ ++ ++ return StringToEnum('PetscOptionsAnalyses') ++ ++def PetscOptionsStringsEnum(): ++ """ ++ PETSCOPTIONSSTRINGSENUM - Enum of PetscOptionsStrings ++ ++ Usage: ++ macro=PetscOptionsStringsEnum() ++ """ ++ ++ return StringToEnum('PetscOptionsStrings') ++ ++def QmuErrNameEnum(): ++ """ ++ QMUERRNAMEENUM - Enum of QmuErrName ++ ++ Usage: ++ macro=QmuErrNameEnum() ++ """ ++ ++ return StringToEnum('QmuErrName') ++ ++def QmuInNameEnum(): ++ """ ++ QMUINNAMEENUM - Enum of QmuInName ++ ++ Usage: ++ macro=QmuInNameEnum() ++ """ ++ ++ return StringToEnum('QmuInName') ++ ++def QmuOutNameEnum(): ++ """ ++ QMUOUTNAMEENUM - Enum of QmuOutName ++ ++ Usage: ++ macro=QmuOutNameEnum() ++ """ ++ ++ return StringToEnum('QmuOutName') ++ ++def RegularEnum(): ++ """ ++ REGULARENUM - Enum of Regular ++ ++ Usage: ++ macro=RegularEnum() ++ """ ++ ++ return StringToEnum('Regular') ++ ++def ScaledEnum(): ++ """ ++ SCALEDENUM - Enum of Scaled ++ ++ Usage: ++ macro=ScaledEnum() ++ """ ++ ++ return StringToEnum('Scaled') ++ ++def SeparateEnum(): ++ """ ++ SEPARATEENUM - Enum of Separate ++ ++ Usage: ++ macro=SeparateEnum() ++ """ ++ ++ return StringToEnum('Separate') ++ ++def SsetEnum(): ++ """ ++ SSETENUM - Enum of Sset ++ ++ Usage: ++ macro=SsetEnum() ++ """ ++ ++ return StringToEnum('Sset') ++ ++def VerboseEnum(): ++ """ ++ VERBOSEENUM - Enum of Verbose ++ ++ Usage: ++ macro=VerboseEnum() ++ """ ++ ++ return StringToEnum('Verbose') ++ ++def TriangleInterpEnum(): ++ """ ++ TRIANGLEINTERPENUM - Enum of TriangleInterp ++ ++ Usage: ++ macro=TriangleInterpEnum() ++ """ ++ ++ return StringToEnum('TriangleInterp') ++ ++def BilinearInterpEnum(): ++ """ ++ BILINEARINTERPENUM - Enum of BilinearInterp ++ ++ Usage: ++ macro=BilinearInterpEnum() ++ """ ++ ++ return StringToEnum('BilinearInterp') ++ ++def NearestInterpEnum(): ++ """ ++ NEARESTINTERPENUM - Enum of NearestInterp ++ ++ Usage: ++ macro=NearestInterpEnum() ++ """ ++ ++ return StringToEnum('NearestInterp') ++ ++def XYEnum(): ++ """ ++ XYENUM - Enum of XY ++ ++ Usage: ++ macro=XYEnum() ++ """ ++ ++ return StringToEnum('XY') ++ ++def XYZPEnum(): ++ """ ++ XYZPENUM - Enum of XYZP ++ ++ Usage: ++ macro=XYZPEnum() ++ """ ++ ++ return StringToEnum('XYZP') ++ ++def OptionEnum(): ++ """ ++ OPTIONENUM - Enum of Option ++ ++ Usage: ++ macro=OptionEnum() ++ """ ++ ++ return StringToEnum('Option') ++ ++def OptionCellEnum(): ++ """ ++ OPTIONCELLENUM - Enum of OptionCell ++ ++ Usage: ++ macro=OptionCellEnum() ++ """ ++ ++ return StringToEnum('OptionCell') ++ ++def OptionCharEnum(): ++ """ ++ OPTIONCHARENUM - Enum of OptionChar ++ ++ Usage: ++ macro=OptionCharEnum() ++ """ ++ ++ return StringToEnum('OptionChar') ++ ++def OptionStructEnum(): ++ """ ++ OPTIONSTRUCTENUM - Enum of OptionStruct ++ ++ Usage: ++ macro=OptionStructEnum() ++ """ ++ ++ return StringToEnum('OptionStruct') ++ ++def OptionDoubleEnum(): ++ """ ++ OPTIONDOUBLEENUM - Enum of OptionDouble ++ ++ Usage: ++ macro=OptionDoubleEnum() ++ """ ++ ++ return StringToEnum('OptionDouble') ++ ++def OptionLogicalEnum(): ++ """ ++ OPTIONLOGICALENUM - Enum of OptionLogical ++ ++ Usage: ++ macro=OptionLogicalEnum() ++ """ ++ ++ return StringToEnum('OptionLogical') ++ ++def PatersonEnum(): ++ """ ++ PATERSONENUM - Enum of Paterson ++ ++ Usage: ++ macro=PatersonEnum() ++ """ ++ ++ return StringToEnum('Paterson') ++ ++def ArrheniusEnum(): ++ """ ++ ARRHENIUSENUM - Enum of Arrhenius ++ ++ Usage: ++ macro=ArrheniusEnum() ++ """ ++ ++ return StringToEnum('Arrhenius') ++ ++def MaximumNumberOfEnums(): ++ """ ++ MAXIMUMNUMBEROFENUMS - Enum of MaximumNumberOfEnums ++ ++ Usage: ++ macro=MaximumNumberOfEnums() ++ """ ++ ++ return 448 ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsAPosEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsAPosEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsAPosEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsAPosEnum() ++%SURFACEFORCINGSAPOSENUM - Enum of SurfaceforcingsAPos ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsAPosEnum() ++ ++macro=StringToEnum('SurfaceforcingsAPos'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsANegEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsANegEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsANegEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsANegEnum() ++%SURFACEFORCINGSANEGENUM - Enum of SurfaceforcingsANeg ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsANegEnum() ++ ++macro=StringToEnum('SurfaceforcingsANeg'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsIssmbgradientsEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsIssmbgradientsEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/SurfaceforcingsIssmbgradientsEnum.m (revision 12685) +@@ -0,0 +1,11 @@ ++function macro=SurfaceforcingsIssmbgradientsEnum() ++%SURFACEFORCINGSISSMBGRADIENTSENUM - Enum of SurfaceforcingsIssmbgradients ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SurfaceforcingsIssmbgradientsEnum() ++ ++macro=StringToEnum('SurfaceforcingsIssmbgradients'); Index: /issm/oecreview/Archive/12678-13393/ISSM-12685-12686.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12685-12686.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12685-12686.diff (revision 13394) @@ -0,0 +1,20 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/startup.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/startup.py (revision 12685) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/startup.py (revision 12686) +@@ -28,7 +28,6 @@ + if file.find(".pyc") == -1: + #add to path + sys.path.append(root) +- print root, "\n" + file=os.path.splitext(file)[0] + #__import__(file) + +@@ -40,7 +39,6 @@ + if file.find(".pyc") == -1: + #add to path + sys.path.append(root) +- print root, "\n" + file=os.path.splitext(file)[0] + #__import__(file) + Index: /issm/oecreview/Archive/12678-13393/ISSM-12686-12687.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12686-12687.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12686-12687.diff (revision 13394) @@ -0,0 +1,52 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment_variables.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment_variables.sh (revision 12686) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment_variables.sh (revision 12687) +@@ -200,3 +200,15 @@ + + #GIT + GIT_DIR="$ISSM_DIR/externalpackages/git" ++ ++#NCVIEW ++NCVIEW_DIR="$ISSM_DIR/externalpackages/ncview" ++ ++#TCLX ++TCLX_DIR="$ISSM_DIR/externalpackages/tclx/install/lib/tclx8.4" ++ ++#ASPELL ++ASPELL_DIR="$ISSM_DIR/externalpackages/aspell/" ++ ++#HDF5 ++export HDF5_DIR=$ISSM_DIR/externalpackages/hdf5/install +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh (revision 12686) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh (revision 12687) +@@ -269,3 +269,27 @@ + + #GIT + export PATH="$PATH:$GIT_DIR/install/bin" ++ ++#NCVIEW ++export PATH="$PATH:$NCVIEW_DIR/install" ++ ++#TCLX ++export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TCLX_DIR" ++export LD_RUN_PATH="$LD_RUN_PATH:$TCLX_DIR" ++ ++ ++#ASPELL ++export PATH="$ASPELL_DIR/install/bin:$PATH" ++ ++ ++#ESMF ++export ESMF_DIR=$ISSM_DIR/externalpackages/esmf/esmf ++export ESMF_COMPILER=gfortran ++export ESMF_COMM=mpich2 ++ ++#HDF5 ++export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$HDF5_DIR/lib" ++export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HDF5_DIR/lib" ++export LIBRARY_PATH="$LIBRARY_PATH:$HDF5_DIR/lib" ++export C_INCLUDE_PATH="$C_INCLUDE_PATH:$HDF5_DIR/include" ++ Index: /issm/oecreview/Archive/12678-13393/ISSM-12687-12688.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12687-12688.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12687-12688.diff (revision 13394) @@ -0,0 +1,10 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/ad/todo +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/ad/todo (revision 12687) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/ad/todo (revision 12688) +@@ -40,3 +40,5 @@ + + Create an alloc layer with template functions for new and delete. + Check that the new code is modular --without-kml, options are up to date. ++ ++Replace memcpy, realloc with x layers. Replace all calls to malloc and free in the code. Index: /issm/oecreview/Archive/12678-13393/ISSM-12688-12689.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12688-12689.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12688-12689.diff (revision 13394) @@ -0,0 +1,49 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-macosx64-larour-ad.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-macosx64-larour-ad.sh (revision 12688) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-macosx64-larour-ad.sh (revision 12689) +@@ -1,24 +1,8 @@ + #!/bin/sh + +-#petsc 3.2 +-#mpich 1.4 +- + ./configure \ +- --with-serial=no\ + --prefix=$ISSM_DIR \ +- --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \ +- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \ +- --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \ +- --without-blas-lapack-dir \ +- --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \ +- --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \ +- --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \ +- --with-math-lib="/usr/lib/libm.dylib" \ +- --with-graphics-lib="/usr/X11/lib/libX11.dylib" \ +- --with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5 -O3 -DNDEBUG -w "\ +- --with-adic2-dir=$ISSM_DIR/externalpackages/adic/install/ \ +- --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install/ \ +- --with-numthreads=8 \ ++ --without-modules\ + --without-thermal \ + --without-control \ + --without-hydrology \ +@@ -30,14 +14,7 @@ + --without-steadystate \ + --without-transient \ + --without-3d \ +- --without-groundingline +- +-#--without-prognostic \ +-#--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ +-#--with-petsc-arch=$ISSM_ARCH \ +-#--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ +-#--with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \ +-#--with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \ +-#--with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \ +-#--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ +-#--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \ ++ --without-groundingline \ ++ --without-kriging \ ++ --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install ++ #--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install\ Index: /issm/oecreview/Archive/12678-13393/ISSM-12689-12690.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12689-12690.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12689-12690.diff (revision 13394) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Kml/exp2kml.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Kml/exp2kml.m (revision 12689) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Kml/exp2kml.m (revision 12690) +@@ -7,7 +7,7 @@ + + + %First, read exp file +-domain=expread(input,1); ++domain=expread(input); + + + %then transform: Index: /issm/oecreview/Archive/12678-13393/ISSM-12690-12691.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12690-12691.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12690-12691.diff (revision 13394) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Exp/expcontract.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Exp/expcontract.m (revision 12690) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Exp/expcontract.m (revision 12691) +@@ -7,7 +7,7 @@ + % See also EXPMASTER, EXPDOC + + +-contour=expread(oldfile,1); ++contour=expread(oldfile); + num=numel(contour.x); + + normal=zeros(num-1,2); Index: /issm/oecreview/Archive/12678-13393/ISSM-12691-12692.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12691-12692.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12691-12692.diff (revision 13394) @@ -0,0 +1,26 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/isbasin.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/isbasin.m (revision 12691) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/isbasin.m (revision 12692) +@@ -8,7 +8,7 @@ + + + %First, load basin names: +-load([issmdir '/projects/ModelData/Names/Names.mat']); ++load([jplsvn '/projects/ModelData/Names/Names.mat']); + + + %go through names: +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/showbasins.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/showbasins.m (revision 12691) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/showbasins.m (revision 12692) +@@ -44,7 +44,7 @@ + end + + %Ok, find basin we are talking about: +-load([issmdir '/projects/ModelData/Names/Names.mat']); ++load([jplsvn '/projects/ModelData/Names/Names.mat']); + + %Get xlim and ylim, and convert into lat,long: + xlimits=xlim; x0=xlimits(1); x1=xlimits(2); Index: /issm/oecreview/Archive/12678-13393/ISSM-12692-12693.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12692-12693.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12692-12693.diff (revision 13394) @@ -0,0 +1,34 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install.sh (revision 12693) +@@ -0,0 +1,23 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/modules-3.2.9c.tar.gz modules-3.2.9c.tar.gz ++ ++#Untar and move python into install directory ++tar -zxvf modules-3.2.9c.tar.gz ++mv modules-3.2.9 install ++ ++exit 1 ++ ++#Configure doxygen ++cd install ++./configure \ ++ --prefix "$ISSM_DIR/externalpackages/modules/install" \ ++ --without-x ++ ++#compile and install ++make ++make install + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* Index: /issm/oecreview/Archive/12678-13393/ISSM-12694-12695.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12694-12695.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12694-12695.diff (revision 13394) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install.sh (revision 12694) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install.sh (revision 12695) +@@ -10,8 +10,6 @@ + tar -zxvf modules-3.2.9c.tar.gz + mv modules-3.2.9 install + +-exit 1 +- + #Configure doxygen + cd install + ./configure \ Index: /issm/oecreview/Archive/12678-13393/ISSM-12695-12696.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12695-12696.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12695-12696.diff (revision 13394) @@ -0,0 +1,499 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/issm.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/issm.cpp (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/issm.cpp (revision 12696) +@@ -34,10 +34,10 @@ + IssmPDouble start_init, finish_init; + int ierr; + +- /*PETSc profiling*/ +- bool petsc_profiling = false; +- PetscLogDouble petscTime_start, petscTime_finish; +- PetscLogDouble petsc_memUse, petscFlops_start, petscFlops_finish; ++ /*profiling*/ ++ bool profiling = false; ++ IssmPDouble Time_start, Flops_start; ++ IssmPDouble Solution_time, Memory_use, Current_flops; + + ISSMBOOT(); + +@@ -98,7 +98,7 @@ + femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); + femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum); + femmodel->parameters->FindParam(&tao_analysis,InversionTaoEnum); +- femmodel->parameters->FindParam(&petsc_profiling,DebugPetscProfilingEnum); ++ femmodel->parameters->FindParam(&profiling,DebugProfilingEnum); + + #ifdef _HAVE_MPI_ + MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime(); +@@ -113,10 +113,7 @@ + start_core=(IssmPDouble)clock(); + #endif + +- if(petsc_profiling){ +- PetscGetTime(&petscTime_start); +- PetscGetFlops(&petscFlops_start); +- } ++ if(profiling)ProfilingStart(&Time_start,&Flops_start); + + if(dakota_analysis){ + #ifdef _HAVE_DAKOTA_ +@@ -139,20 +136,14 @@ + solutioncore(femmodel); + } + +- if(petsc_profiling){ +- PetscGetTime(&petscTime_finish); +- PetscGetFlops(&petscFlops_finish); +- PetscMemoryGetCurrentUsage(&petsc_memUse); +- +- _pprintLine_("PETSc elapsed time : " << (petscTime_finish-petscTime_start) << " Seconds"); +- _pprintLine_("PETSc elapsed flops : " << (petscFlops_finish-petscFlops_start) << " Flops"); +- _pprintLine_("PETSc memory used : " << petsc_memUse << " Bytes"); +- +- femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingSolutionTimeEnum, (petscTime_finish-petscTime_start), 1, 0)); +- femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingCurrentMemEnum, petsc_memUse, 1, 0)); +- femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, PetscProfilingCurrentFlopsEnum, (petscFlops_finish-petscFlops_start), 1, 0)); ++ if(profiling){ ++ ProfilingEnd(&Solution_time,&Memory_use,&Current_flops,Time_start,Flops_start); ++ femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingSolutionTimeEnum, Solution_time, 1, 0)); ++ femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingCurrentMemEnum, Memory_use, 1, 0)); ++ femmodel->results->AddObject(new DoubleExternalResult(femmodel->results->Size()+1, ProfilingCurrentFlopsEnum, Current_flops, 1, 0)); + } + ++ + #ifdef _HAVE_MPI_ + MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( ); + #else +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12696) +@@ -148,10 +148,10 @@ + SettingsOutputFrequencyEnum, + SettingsResultsAsPatchesEnum, + SettingsWaitonlockEnum, +- DebugPetscProfilingEnum, +- PetscProfilingCurrentMemEnum, +- PetscProfilingCurrentFlopsEnum, +- PetscProfilingSolutionTimeEnum, ++ DebugProfilingEnum, ++ ProfilingCurrentMemEnum, ++ ProfilingCurrentFlopsEnum, ++ ProfilingSolutionTimeEnum, + MaxIterationConvergenceFlagEnum, + SteadystateMaxiterEnum, + SteadystateNumRequestedOutputsEnum, +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12696) +@@ -8,16 +8,17 @@ + #include "Alloc/alloc.h" + #include "Alloc/alloc_module.h" + #include "Alloc/xNewDelete.h" +-#include "MemOps/xMemCpy.h" ++#include "Bamg/shared.h" ++#include "Elements/elements.h" + #include "Exceptions/exceptions.h" + #include "Exp/exp.h" +-#include "TriMesh/trimesh.h" +-#include "Sorting/sorting.h" +-#include "Elements/elements.h" + #include "Matrix/matrix.h" ++#include "MemOps/xMemCpy.h" + #include "Numerics/numerics.h" ++#include "Sorting/sorting.h" ++#include "Sys/sys.h" + #include "Threads/issm_threads.h" +-#include "Bamg/shared.h" ++#include "TriMesh/trimesh.h" + #include "Wrapper/wrappershared.h" + + #endif +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp (revision 12696) +@@ -0,0 +1,42 @@ ++/*!\file: ProfilingEnd.cpp ++ * \brief ProfilingEnd.c: finalize profiling after calling a routine. Needs to mirror a ProfilingStart routine. ++ */ ++ ++/*Include files: {{{*/ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++#include "../../include/macros.h" ++#include "../shared.h" ++/*}}}*/ ++ ++void ProfilingEnd(double* pSolution_time, double* pMemory_use, double* pCurrent_flops, double Time_start, double Flops_start){ ++ ++ double Solution_time, Memory_use, Current_flops; ++ double Time_finish, Flops_finish, memUse; ++ ++ #ifdef _HAVE_PETSC_ ++ PetscGetTime(&Time_finish); ++ PetscGetFlops(&Flops_finish); ++ PetscMemoryGetCurrentUsage(&memUse); ++ ++ Solution_time=Time_finish-Time_start; ++ Current_flops=Flops_finish-Flops_start; ++ _pprintLine_("PETSc elapsed time : " << Solution_time << " Seconds"); ++ _pprintLine_("PETSc elapsed flops : " << Current_flops << " Flops"); ++ _pprintLine_("PETSc memory used : " << memUse << " Bytes"); ++ #else ++ _error_("Profiling not supported under this numerical toolkit"); ++ #endif ++ ++ /*Assign pointers: */ ++ *pSolution_time=Solution_time; ++ *pMemory_use=memUse; ++ *pCurrent_flops=Current_flops; ++ return; ++} ++ ++ ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/sys.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/sys.h (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/sys.h (revision 12696) +@@ -0,0 +1,12 @@ ++/* \file sys.h ++ * \brief: header file for ISSM system routines (profiling, timing, etc ...) ++ */ ++ ++ ++#ifndef _ISSM_SYS_H_ ++#define _ISSM_SYS_H_ ++ ++void ProfilingEnd(double* pSolution_time, double* pMemory_use, double* pCurrent_flops, double Time_start, double Flops_start); ++void ProfilingStart(double* pTime_start, double* pFlops_start); ++ ++#endif +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp (revision 12696) +@@ -0,0 +1,31 @@ ++/*!\file: ProfilingStart.cpp ++ * \brief ProfilingStart.c: initialize profiling before calling a routine ++ */ ++ ++ ++/*Include files: {{{*/ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++#include "../../include/macros.h" ++#include "../shared.h" ++/*}}}*/ ++ ++void ProfilingStart(double* pTime_start, double* pFlops_start){ ++ ++ double Time_start, Flops_start; ++ ++ #ifdef _HAVE_PETSC_ ++ PetscGetTime(&Time_start); ++ PetscGetFlops(&Flops_start ); ++ #else ++ _error_("Profiling not supported under this numerical toolkit"); ++ #endif ++ ++ /*Assign pointers: */ ++ *pTime_start=Time_start; ++ *pFlops_start=Flops_start; ++ return; ++} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12696) +@@ -157,10 +157,10 @@ + else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; + else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; + else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; +- else if (strcmp(name,"DebugPetscProfiling")==0) return DebugPetscProfilingEnum; +- else if (strcmp(name,"PetscProfilingCurrentMem")==0) return PetscProfilingCurrentMemEnum; +- else if (strcmp(name,"PetscProfilingCurrentFlops")==0) return PetscProfilingCurrentFlopsEnum; +- else if (strcmp(name,"PetscProfilingSolutionTime")==0) return PetscProfilingSolutionTimeEnum; ++ else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum; ++ else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum; ++ else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum; ++ else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum; + else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum; + else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; + else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12696) +@@ -153,10 +153,10 @@ + case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency"; + case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches"; + case SettingsWaitonlockEnum : return "SettingsWaitonlock"; +- case DebugPetscProfilingEnum : return "DebugPetscProfiling"; +- case PetscProfilingCurrentMemEnum : return "PetscProfilingCurrentMem"; +- case PetscProfilingCurrentFlopsEnum : return "PetscProfilingCurrentFlops"; +- case PetscProfilingSolutionTimeEnum : return "PetscProfilingSolutionTime"; ++ case DebugProfilingEnum : return "DebugProfiling"; ++ case ProfilingCurrentMemEnum : return "ProfilingCurrentMem"; ++ case ProfilingCurrentFlopsEnum : return "ProfilingCurrentFlops"; ++ case ProfilingSolutionTimeEnum : return "ProfilingSolutionTime"; + case MaxIterationConvergenceFlagEnum : return "MaxIterationConvergenceFlag"; + case SteadystateMaxiterEnum : return "SteadystateMaxiter"; + case SteadystateNumRequestedOutputsEnum : return "SteadystateNumRequestedOutputs"; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 12696) +@@ -56,7 +56,7 @@ + parameters->AddObject(iomodel->CopyConstantObject(PrognosticPenaltyFactorEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum)); + parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum)); +- parameters->AddObject(iomodel->CopyConstantObject(DebugPetscProfilingEnum)); ++ parameters->AddObject(iomodel->CopyConstantObject(DebugProfilingEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MeshAverageVertexConnectivityEnum)); + parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum)); + parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum)); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12696) +@@ -208,6 +208,9 @@ + ./shared/Wrapper/wrappershared.h\ + ./shared/Wrapper/ModuleBoot.cpp\ + ./shared/Wrapper/ModuleEnd.cpp\ ++ ./shared/Sys/sys.h\ ++ ./shared/Sys/ProfilingStart.cpp\ ++ ./shared/Sys/ProfilingEnd.cpp\ + ./toolkits/metis/metisincludes.h\ + ./toolkits/issm/issmtoolkit.h\ + ./toolkits/issm/SeqVec.h\ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingSolutionTimeEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingSolutionTimeEnum.m (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingSolutionTimeEnum.m (revision 12696) +@@ -1,11 +0,0 @@ +-function macro=PetscProfilingSolutionTimeEnum() +-%PETSCPROFILINGSOLUTIONTIMEENUM - Enum of PetscProfilingSolutionTime +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=PetscProfilingSolutionTimeEnum() +- +-macro=StringToEnum('PetscProfilingSolutionTime'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingCurrentFlopsEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingCurrentFlopsEnum.m (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingCurrentFlopsEnum.m (revision 12696) +@@ -1,11 +0,0 @@ +-function macro=PetscProfilingCurrentFlopsEnum() +-%PETSCPROFILINGCURRENTFLOPSENUM - Enum of PetscProfilingCurrentFlops +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=PetscProfilingCurrentFlopsEnum() +- +-macro=StringToEnum('PetscProfilingCurrentFlops'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingCurrentMemEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingCurrentMemEnum.m (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/PetscProfilingCurrentMemEnum.m (revision 12696) +@@ -1,11 +0,0 @@ +-function macro=PetscProfilingCurrentMemEnum() +-%PETSCPROFILINGCURRENTMEMENUM - Enum of PetscProfilingCurrentMem +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=PetscProfilingCurrentMemEnum() +- +-macro=StringToEnum('PetscProfilingCurrentMem'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/DebugPetscProfilingEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/DebugPetscProfilingEnum.m (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/DebugPetscProfilingEnum.m (revision 12696) +@@ -1,11 +0,0 @@ +-function macro=DebugPetscProfilingEnum() +-%DEBUGPETSCPROFILINGENUM - Enum of DebugPetscProfiling +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=DebugPetscProfilingEnum() +- +-macro=StringToEnum('DebugPetscProfiling'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/DebugProfilingEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/DebugProfilingEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/DebugProfilingEnum.m (revision 12696) +@@ -0,0 +1,11 @@ ++function macro=DebugProfilingEnum() ++%DEBUGPROFILINGENUM - Enum of DebugProfiling ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=DebugProfilingEnum() ++ ++macro=StringToEnum('DebugProfiling'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingSolutionTimeEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingSolutionTimeEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingSolutionTimeEnum.m (revision 12696) +@@ -0,0 +1,11 @@ ++function macro=ProfilingSolutionTimeEnum() ++%PROFILINGSOLUTIONTIMEENUM - Enum of ProfilingSolutionTime ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=ProfilingSolutionTimeEnum() ++ ++macro=StringToEnum('ProfilingSolutionTime'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingCurrentFlopsEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingCurrentFlopsEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingCurrentFlopsEnum.m (revision 12696) +@@ -0,0 +1,11 @@ ++function macro=ProfilingCurrentFlopsEnum() ++%PROFILINGCURRENTFLOPSENUM - Enum of ProfilingCurrentFlops ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=ProfilingCurrentFlopsEnum() ++ ++macro=StringToEnum('ProfilingCurrentFlops'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingCurrentMemEnum.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingCurrentMemEnum.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/ProfilingCurrentMemEnum.m (revision 12696) +@@ -0,0 +1,11 @@ ++function macro=ProfilingCurrentMemEnum() ++%PROFILINGCURRENTMEMENUM - Enum of ProfilingCurrentMem ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=ProfilingCurrentMemEnum() ++ ++macro=StringToEnum('ProfilingCurrentMem'); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 12696) +@@ -1376,45 +1376,45 @@ + + return StringToEnum('SettingsWaitonlock') + +-def DebugPetscProfilingEnum(): ++def DebugProfilingEnum(): + """ +- DEBUGPETSCPROFILINGENUM - Enum of DebugPetscProfiling ++ DEBUGPROFILINGENUM - Enum of DebugProfiling + + Usage: +- macro=DebugPetscProfilingEnum() ++ macro=DebugProfilingEnum() + """ + +- return StringToEnum('DebugPetscProfiling') ++ return StringToEnum('DebugProfiling') + +-def PetscProfilingCurrentMemEnum(): ++def ProfilingCurrentMemEnum(): + """ +- PETSCPROFILINGCURRENTMEMENUM - Enum of PetscProfilingCurrentMem ++ PROFILINGCURRENTMEMENUM - Enum of ProfilingCurrentMem + + Usage: +- macro=PetscProfilingCurrentMemEnum() ++ macro=ProfilingCurrentMemEnum() + """ + +- return StringToEnum('PetscProfilingCurrentMem') ++ return StringToEnum('ProfilingCurrentMem') + +-def PetscProfilingCurrentFlopsEnum(): ++def ProfilingCurrentFlopsEnum(): + """ +- PETSCPROFILINGCURRENTFLOPSENUM - Enum of PetscProfilingCurrentFlops ++ PROFILINGCURRENTFLOPSENUM - Enum of ProfilingCurrentFlops + + Usage: +- macro=PetscProfilingCurrentFlopsEnum() ++ macro=ProfilingCurrentFlopsEnum() + """ + +- return StringToEnum('PetscProfilingCurrentFlops') ++ return StringToEnum('ProfilingCurrentFlops') + +-def PetscProfilingSolutionTimeEnum(): ++def ProfilingSolutionTimeEnum(): + """ +- PETSCPROFILINGSOLUTIONTIMEENUM - Enum of PetscProfilingSolutionTime ++ PROFILINGSOLUTIONTIMEENUM - Enum of ProfilingSolutionTime + + Usage: +- macro=PetscProfilingSolutionTimeEnum() ++ macro=ProfilingSolutionTimeEnum() + """ + +- return StringToEnum('PetscProfilingSolutionTime') ++ return StringToEnum('ProfilingSolutionTime') + + def MaxIterationConvergenceFlagEnum(): + """ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/debug.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/debug.m (revision 12695) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/debug.m (revision 12696) +@@ -7,7 +7,7 @@ + properties (SetAccess=public) + valgrind = false; + gprof = false; +- petsc_profiling = false; ++ profiling = false; + end + methods + function obj = debug(varargin) % {{{ +@@ -26,11 +26,11 @@ + + fielddisplay(obj,'valgrind','use Valgrind to debug (0 or 1)'); + fielddisplay(obj,'gprof','use gnu-profiler to find out where the time is spent'); +- fielddisplay(obj,'petsc_profiling','enables PETSc profiling (memory, flops, time)'); ++ fielddisplay(obj,'profiling','enables profiling (memory, flops, time)'); + + end % }}} + function marshall(obj,fid) % {{{ +- WriteData(fid,'object',obj,'fieldname','petsc_profiling','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','profiling','format','Boolean'); + end % }}} + end + end Index: /issm/oecreview/Archive/12678-13393/ISSM-12696-12697.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12696-12697.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12696-12697.diff (revision 13394) @@ -0,0 +1,47 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/automakererun.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/automakererun.sh (revision 12696) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/automakererun.sh (revision 12697) +@@ -9,42 +9,3 @@ + + cd $ISSM_DIR + autoreconf -iv -I m4 +- +-exit 0 +- +-ACLOCAL="$ISSM_DIR/externalpackages/automake/install/bin/aclocal" +-AUTOCONF="$ISSM_DIR/externalpackages/autoconf/install/bin/autoconf" +-AUTOHEAD="$ISSM_DIR/externalpackages/autoconf/install/bin/autoheader" +-AUTOMAKE="$ISSM_DIR/externalpackages/automake/install/bin/automake" +- +-echo "removing config.cach" +-rm -rf config.cach +-rm -rf aclocal.m4 +- +-if [ ! -f "$ACLOCAL" ] +-then echo "issm aclocal not found, calling default aclocal" +- aclocal -I m4 +-else echo "Calling aclocal" +- $ACLOCAL -I m4 +-fi +- +-if [ ! -f "$AUTOCONF" ] +-then echo "issm autoconf not found, calling default aclocal" +- autoconf +-else echo "Calling autoconf" +- $AUTOCONF +-fi +- +-if [ ! -f "$AUTOHEAD" ] +-then echo "issm autoheader not found, calling default aclocal" +- autoheader +-else echo "Calling autoheader" +- $AUTOHEAD +-fi +- +-if [ ! -f "$AUTOMAKE" ] +-then echo "issm automake not found, calling default aclocal" +- automake +-else echo "Calling automake " +- $AUTOMAKE -a +-fi Index: /issm/oecreview/Archive/12678-13393/ISSM-12697-12698.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12697-12698.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12697-12698.diff (revision 13394) @@ -0,0 +1,59 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12697) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12698) +@@ -171,6 +171,7 @@ + case 352, name='SquareSheetConstrainedEnthalpyTranParallel'; + case 353, name='SquareSheetConstrainedTransP3dEnthSerial'; + case 354, name='SquareSheetConstrainedTransP3dEnthParallel'; ++ case 356, name='SquareSheetConstrainedSmbGradients2dParallel'; + case 401, name='SquareSheetShelfDiagM2dSerial'; + case 402, name='SquareSheetShelfDiagM2dParallel'; + case 403, name='SquareSheetShelfDiagM3dSerial'; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 12698) +@@ -0,0 +1,42 @@ ++md=triangle(model,'../Exp/Square.exp',150000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=setflowequation(md,'macayeal','all'); ++md.surfaceforcings.issmbgradients=1; ++md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; ++md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y; ++md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y; ++md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; ++md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; ++md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; ++md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos); ++md.cluster=generic('name',oshostname(),'np',3); ++md=solve(md,TransientSolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Vx1','Vy1','Vel1','Bed1','Surface1','Thickness1','SMB1','Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3'}; ++field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; ++field_values={... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ }; Index: /issm/oecreview/Archive/12678-13393/ISSM-12698-12699.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12698-12699.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12698-12699.diff (revision 13394) @@ -0,0 +1,12 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 12698) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test356.m (revision 12699) +@@ -34,7 +34,6 @@ + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vel),... +- (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... Index: /issm/oecreview/Archive/12678-13393/ISSM-12699-12700.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12699-12700.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12699-12700.diff (revision 13394) @@ -0,0 +1,68 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/test358.m (revision 12700) +@@ -0,0 +1,51 @@ ++md=triangle(model,'../Exp/Square.exp',150000); ++md=setmask(md,'',''); ++md=parameterize(md,'../Par/SquareSheetConstrained.par'); ++md=extrude(md,3,1); ++md=setflowequation(md,'pattyn','all'); ++md.surfaceforcings.issmbgradients=1; ++md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; ++md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y; ++md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y; ++md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; ++md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y; ++md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; ++md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos); ++md.cluster=generic('name',oshostname(),'np',3); ++md=solve(md,TransientSolutionEnum); ++ ++%Fields and tolerances to track changes ++field_names ={'Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3'}; ++field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,... ++ 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; ++ ++field_values={... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ }; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12699) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/IdToName.m (revision 12700) +@@ -172,6 +172,7 @@ + case 353, name='SquareSheetConstrainedTransP3dEnthSerial'; + case 354, name='SquareSheetConstrainedTransP3dEnthParallel'; + case 356, name='SquareSheetConstrainedSmbGradients2dParallel'; ++ case 358, name='SquareSheetConstrainedSmbGradients3dParallel'; + case 401, name='SquareSheetShelfDiagM2dSerial'; + case 402, name='SquareSheetShelfDiagM2dParallel'; + case 403, name='SquareSheetShelfDiagM3dSerial'; Index: /issm/oecreview/Archive/12678-13393/ISSM-12700-12701.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12700-12701.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12700-12701.diff (revision 13394) @@ -0,0 +1,12 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp (revision 12700) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp (revision 12701) +@@ -10,6 +10,7 @@ + #endif + #include "../../include/macros.h" + #include "../shared.h" ++#include "../../io/io.h" + /*}}}*/ + + void ProfilingEnd(double* pSolution_time, double* pMemory_use, double* pCurrent_flops, double Time_start, double Flops_start){ Index: /issm/oecreview/Archive/12678-13393/ISSM-12701-12702.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12701-12702.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12701-12702.diff (revision 13394) @@ -0,0 +1,28 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive358.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive358.mat +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive358.mat (revision 12701) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive358.mat (revision 12702) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive358.mat +___________________________________________________________________ +Added: svn:mime-type +## -0,0 +1 ## ++application/octet-stream +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive356.mat +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive356.mat +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive356.mat (revision 12701) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive356.mat (revision 12702) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Archives/Archive356.mat +___________________________________________________________________ +Added: svn:mime-type +## -0,0 +1 ## ++application/octet-stream Index: /issm/oecreview/Archive/12678-13393/ISSM-12702-12703.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12702-12703.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12702-12703.diff (revision 13394) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12702) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12703) +@@ -1,7 +1,7 @@ + # Process this file with autoconf to produce a configure script. + + #AUTOCONF +-AC_INIT([ISSM],[4.2],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure ++AC_INIT([ISSM],[4.2.1],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure + AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config + AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4 + AC_CANONICAL_TARGET #Determine the system type Index: /issm/oecreview/Archive/12678-13393/ISSM-12703-12704.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12703-12704.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12703-12704.diff (revision 13394) @@ -0,0 +1,1193 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 12704) +@@ -705,16 +705,6 @@ + syn keyword cConstant SurfaceEnum + syn keyword cConstant SurfaceforcingsPrecipitationEnum + syn keyword cConstant SurfaceforcingsMassBalanceEnum +-syn keyword cConstant SurfaceforcingsIspddEnum +-syn keyword cConstant SurfaceforcingsIssmbgradientsEnum +-syn keyword cConstant SurfaceforcingsMonthlytemperaturesEnum +-syn keyword cConstant SurfaceforcingsHcEnum +-syn keyword cConstant SurfaceforcingsSmbPosMaxEnum +-syn keyword cConstant SurfaceforcingsSmbPosMinEnum +-syn keyword cConstant SurfaceforcingsAPosEnum +-syn keyword cConstant SurfaceforcingsBPosEnum +-syn keyword cConstant SurfaceforcingsANegEnum +-syn keyword cConstant SurfaceforcingsBNegEnum + syn keyword cConstant ThermalMaxiterEnum + syn keyword cConstant ThermalPenaltyFactorEnum + syn keyword cConstant ThermalPenaltyLockEnum +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/OptionParse.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 12704) +@@ -7,13 +7,13 @@ + #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" + #endif + ++#include ++#include + #include "../../shared/shared.h" + #include "../../io/io.h" + #include "../../include/include.h" + #include "./matlabio.h" + +-#include +- + /*FUNCTION OptionDoubleParse {{{*/ + OptionDouble* OptionDoubleParse( char* name, const mxArray* prhs[]){ + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.cpp (revision 12704) +@@ -236,7 +236,7 @@ + + for(int j=0;jSize();j++){ + Element* element=(Element*)this->GetObjectByOffset(j); +- element->GetVectorFromResults(vector,i,resultssizes[i]); ++ element->GetVectorFromResults(vector,i,resultsenums[i],resultssizes[i]); + } + vector->Assemble(); + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/elements.h (revision 12704) +@@ -12,6 +12,7 @@ + + IssmDouble Paterson(IssmDouble temperature); + IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n); ++IssmDouble PddSurfaceMassBlance(IssmDouble* monthlytemperatures, IssmDouble* monthlyprec, IssmDouble* pdds, IssmDouble* pds, IssmDouble signorm, IssmDouble yts, IssmDouble h, IssmDouble s, IssmDouble rho_ice, IssmDouble rho_water); + void GetVerticesCoordinates(IssmDouble* xyz, Node** nodes, int numvertices); + int GetNumberOfDofs( Node** nodes,int numnodes,int setenum,int approximation_enum); + int* GetLocalDofList( Node** nodes,int numnodes,int setenum,int approximation_enum); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp (revision 12704) +@@ -0,0 +1,205 @@ ++/* file: PddSurfaceMassBlance.cpp ++ Calculating the surface mass balance using the positive degree day method. ++ */ ++ ++#include "./elements.h" ++ ++double PddSurfaceMassBlance(double* monthlytemperatures, double* monthlyprec, double* pdds, double* pds, double signorm, double yts, double h, double s, double rho_ice, double rho_water){ ++ ++ // output: ++ double B; // surface mass balance, melt+accumulation ++ ++ int iqj,imonth, j; ++ ++ double saccu; // yearly surface accumulation ++ double smelt; // yearly melt ++ double precrunoff; // yearly runoff ++ double prect; // total precipitation during 1 year taking into account des. ef. ++ double water; //water=rain + snowmelt ++ double runoff; //meltwater only, does not include rain ++ double sconv; //rhow_rain/rhoi / 12 months ++ ++ double density; ++ double lapser=6.5/1000., sealev=0.; // lapse rate. degrees per meter. 7.5 lev's 99 paper, 9 Marshall 99 paper ++ double desfac = 0.5; // desert elevation factor ++ double s0p=0.; // should be set to elevation from precip source ++ double s0t=0.; // should be set to elevation from temperature source ++ double st; // elevation between altitude of the temp record and current altitude ++ double sp; // elevation between altitude of the prec record and current altitude ++ ++ // PDD and PD constants and variables ++ double siglim; // sigma limit for the integration which is equal to 2.5 sigmanorm ++ double signormc = signorm - 0.5; // sigma of the temperature distribution for cloudy day ++ double siglimc, siglim0, siglim0c; ++ double PDup, pddsig, PDCUT = 2.0; // PDcut: rain/snow cutoff temperature (C) ++ double DT = 0.02; ++ double pddt, pd; // pd: snow/precip fraction, precipitation falling as snow ++ ++ double q, qmpt; // q is desert/elev. fact, hnpfac is huybrect fact, and pd is normal dist. ++ double qm = 0.; // snow part of the precipitation ++ double qmt = 0.; // precipitation without desertification effect adjustment ++ double qmp = 0.; // desertification taken into account ++ double pdd = 0.; ++ double frzndd = 0.; ++ ++ double tstar; // monthly mean surface temp ++ double Tsum= 0.; // average summer (JJA) temperature ++ double Tsurf = 0.; // average annual temperature ++ ++ ++ double deltm=1./12.; ++ int ismon[12]={11,0,1,2,3,4,5,6,7,8,9,10}; ++ ++ double snwm; // snow that could have been melted in a year. ++ double snwmf; // ablation factor for snow per positive degree day. ++ double smf; // ablation factor for ice per pdd (Braithwaite 1995 from tarasov 2002). ++ ++ double dfrz=1.5, CovrLm=2009./3.35e+5, dCovrLm=dfrz*CovrLm; //m*J kg^-1 C^-1 /(J kg^-1)=m/C yr ++ double supice,supcap,diffndd; ++ double fsupT=0.5, fsupndd=0.5; // Tsurf mode factors for supice ++ double pddtj, hmx2; ++ ++ sconv=(rho_water/rho_ice)/12.; //rhow_rain/rhoi / 12 months ++ ++ /*PDD constant*/ ++ siglim = 2.5*signorm; ++ siglimc = 2.5*signormc; ++ siglim0 = siglim/DT + 0.5; ++ siglim0c = siglimc/DT + 0.5; ++ PDup = siglimc+PDCUT; ++ ++ // seasonal loop ++ for (iqj = 0; iqj < 12; iqj++){ ++ imonth = ismon[iqj]; ++ ++ st=(s-s0t)/1000.; ++ tstar = monthlytemperatures[imonth] - lapser *max(st,sealev); ++ Tsurf = tstar*deltm+Tsurf; ++ ++ /*********compute PD ****************/ ++ if (tstar < PDup){ ++ pd = 1.; ++ if (tstar >= -siglimc){ pd = pds[int(tstar/DT + siglim0c)];}} ++ else { ++ pd = 0.;} ++ ++ /******exp des/elev precip reduction*******/ ++ sp=(s-s0p)/1000.; // deselev effect is wrt chng in topo ++ if (sp>0.0){q = exp(-desfac*sp);} ++ else {q = 1.0;} ++ ++ qmt= qmt + monthlyprec[imonth]*sconv; //*sconv to convert in m of ice equivalent per month ++ qmpt= q*monthlyprec[imonth]*sconv; ++ qmp= qmp + qmpt; ++ qm= qm + qmpt*pd; ++ ++ /*********compute PDD************/ ++ // ndd(month)=-(tstar-pdd(month)) since ndd+pdd gives expectation of ++ // gaussian=T_m, so ndd=-(Tsurf-pdd) ++ if (iqj>5 && iqj<9){ Tsum=Tsum+tstar;} ++ if (tstar >= siglim) {pdd = pdd + tstar*deltm;} ++ else if (tstar> -siglim){ ++ pddsig=pdds[int(tstar/DT + siglim0)]; ++ pdd = pdd + pddsig*deltm; ++ frzndd = frzndd - (tstar-pddsig)*deltm;} ++ else{frzndd = frzndd - tstar*deltm; } ++ } // end of seasonal loop ++ ++ //****************************************************************** ++ saccu = qm; ++ prect = qmp; // total precipitation during 1 year taking into account des. ef. ++ Tsum=Tsum/3; ++ ++ /***** determine PDD factors *****/ ++ if(Tsum< -1.) { ++ snwmf=2.65*0.001; // ablation factor for snow per positive degree day.*0.001 to go from mm to m/ppd ++ smf=17.22*0.001; // ablation factor for ice per pdd (Braithwaite 1995 from tarasov 2002) ++ } ++ else if(Tsum< 10){ ++ snwmf = (0.15*Tsum + 2.8)*0.001; ++ smf = (0.0067*pow((10.-Tsum),3) + 8.3)*0.001; ++ } ++ else{ ++ snwmf=4.3*0.001; ++ smf=8.3*0.001; ++ } ++ snwmf=0.95*snwmf; ++ smf=0.95*smf; ++ ++ /***** compute PDD ablation and refreezing *****/ ++ pddt = pdd *365; ++ snwm = snwmf*pddt; // snow that could have been melted in a year ++ hmx2 = min(h,dfrz); // refreeze active layer max depth: dfrz ++ ++ if(snwm < saccu) { ++ water=prect-saccu + snwm; //water=rain + snowmelt ++ // l 2.2= capillary factor ++ // Should refreezing be controlled by frzndd or by mean annual Tsurf? ++ // dCovrLm concept is of warming of active layer (thickness =d@=1- ++ // >2m) ++ // problem with water seepage into ice: should be sealed after ++ // refreezing ++ // so everything needs to be predicated on 1 year scale, except for ++ // thermal ++ // conductivity through ice ++ // also, need to account that melt season has low accum, so what's ++ // going to ++ // hold the meltwater around for refreezing? And melt-time will have ++ // low seasonal frzndd ++ ++ // Superimposed ice : Pfeffer et al. 1991, Tarasov 2002 ++ ++ supice= min(hmx2*CovrLm*frzndd+2.2*(saccu-snwm), water); // superimposed ice ++ supcap=min(2.2*(saccu-snwm),water); ++ runoff=snwm - supice; //meltwater only, does not include rain ++ } ++ else { //all snow melted ++ supice= min(hmx2*CovrLm*frzndd, prect ); ++ runoff= saccu + smf*(pddt-saccu/snwmf) - supice; ++ supcap=0; ++ } ++ // pdd melting doesn't cool Tsurf, so ndd refreeze shouldn't warm it ++ // except pdd melt heat source is atmosphere, while refreeze is ++ // ground/ice stored interim ++ // assume pdd=ndd, then melt should equal refreeze and Tsurf should=0 ++ // assume ndd=2*pdd, then all supice is refrozen, but Tsurf should be ++ // <0 ++ // assume ndd>pdd, little melt => little supice ++ // bottom line: compare for Tsurf<0 : supice and no supice case, ++ // expect Tsurf difference ++ // except some of cooling flux comes from atmosphere// ++ // 1 dm supice should not raise Tsurf by 1/dCovrLm = 16.675C ++ // does supice make sense when H< 0.1m? then d=thermoactive ice layer //// ++ // < 0.1 ++ ++ // make more sense to just use residual pdd-ndd except that pdd ++ // residual not clear yet ++ // frzndd should not be used up by refreezing in snow, so stick in ++ // supcap. ++ diffndd=0; ++ if (frzndd>0) { ++ diffndd=fsupndd*min((supice-supcap)/dCovrLm ,frzndd); ++ frzndd=frzndd-diffndd; ++ } ++ if(runoff<0){ ++ saccu= saccu -runoff; ++ smelt = 0; ++ precrunoff=prect-saccu; ++ //here assume pdd residual is 0, => ++ Tsurf= max(Tsurf,-frzndd); ++ } ++ else { ++ smelt = runoff; ++ precrunoff=prect-max(0.,supice)-saccu;} ++ //here really need pdd balance, try 0.5 fudge factor? ++ //at least runoff>0 => it's fairly warm, so Tsurf is !<<0, ++ //yet from site plots, can be ice free with Tsurf=-5.5C ++ if(Tsurf<0) { ++ Tsurf= min(Tsurf+fsupT*diffndd , 0.);} ++ ++ B = -smelt+saccu; ++ B = B/yts; ++ pddtj=pddt; ++ ++ return B; ++} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp (revision 12704) +@@ -6,6 +6,7 @@ + */ + + #include ++#include + #include "../Alloc/alloc.h" + #include "../../include/include.h" + #include "../../objects/objects.h" +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 12704) +@@ -63,7 +63,7 @@ + // tstar = REAL(it)*DT-siglim; + tstar = it*DT-siglim; + tint = tsint; +- pddt = 0; ++ pddt = 0.; + for ( jj = 0; jj < 600; jj++){ + if (tint > (tstar+siglim)){break;} + pddt = pddt + tint*exp(sigfac*(pow((tint-tstar),2)))*tstep; +@@ -89,7 +89,7 @@ + tstar = it*DT-siglimc; + // tstar = REAL(it)*DT-siglimc; + tint = tsint; // start against upper bound +- pd = 0; ++ pd = 0.; + for (jj = 0; jj < 600; jj++){ + if (tint<(tstar-siglimc)) {break;} + pd = pd + exp(sigfac*(pow((tint-tstar),2)))*tstepc; +@@ -97,7 +97,7 @@ + } + pds[it] = pd*snormfac; // gaussian integral lookup table for snow fraction + } +- pds[itm+1] = 0; ++ pds[itm+1] = 0.; + // *******END initialize PDD + + for(i=0;iSize();i++){ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12704) +@@ -204,6 +204,7 @@ + ./shared/Elements/GetLocalDofList.cpp\ + ./shared/Elements/GetGlobalDofList.cpp\ + ./shared/Elements/GetNumberOfDofs.cpp\ ++ ./shared/Elements/PddSurfaceMassBalance.cpp\ + ./shared/String/sharedstring.h\ + ./shared/Wrapper/wrappershared.h\ + ./shared/Wrapper/ModuleBoot.cpp\ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12704) +@@ -125,3 +125,13 @@ + + } + /*}}}*/ ++/*FUNCTION DoubleElementResult::GetVectorFromResults{{{1*/ ++void DoubleElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){ ++ ++ _error_("cannot return vector on vertices"); ++} /*}}}*/ ++/*FUNCTION DoubleElementResult::GetElementVectorFromResults{{{1*/ ++void DoubleElementResult::GetElementVectorFromResults(Vector* vector,int dof){ ++ ++ vector->SetValue(dof,value,INS_VAL); ++} /*}}}*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 12704) +@@ -47,8 +47,8 @@ + /*}}}*/ + /*DoubleElementResult management: {{{*/ + int InstanceEnum(); +- void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){_error2_("not implemented");}; +- void GetElementVectorFromResults(Vector* vector,int dof){_error2_("not implemented");}; ++ void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs); ++ void GetElementVectorFromResults(Vector* vector,int dof); + /*}}}*/ + }; + #endif /* _DOUBLEELEMENTRESULT_H */ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Element.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Element.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Element.h (revision 12704) +@@ -62,7 +62,7 @@ + virtual int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units)=0; + virtual void InputScale(int enum_type,IssmDouble scale_factor)=0; + virtual void GetVectorFromInputs(Vector* vector, int name_enum)=0; +- virtual void GetVectorFromResults(Vector* vector,int id,int interp)=0; ++ virtual void GetVectorFromResults(Vector* vector,int id,int enum_in,int interp)=0; + virtual void InputArtificialNoise(int enum_type,IssmDouble min,IssmDouble max)=0; + virtual bool InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums)=0; + virtual void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part)=0; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12704) +@@ -1191,10 +1191,13 @@ + } + /*}}}*/ + /*FUNCTION Tria::GetVectorFromResults{{{*/ +-void Tria::GetVectorFromResults(Vector* vector,int offset,int interp){ ++void Tria::GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp){ + + /*Get result*/ + ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); ++ if(elementresult->InstanceEnum()!=enum_in){ ++ _error_("Results of offset %i is %s, when %s was expected",offset,EnumToStringx(elementresult->InstanceEnum()),EnumToStringx(enum_in)); ++ } + if(interp==P1Enum){ + int doflist1[NUMVERTICES]; + int connectivity[NUMVERTICES]; +@@ -2085,236 +2088,44 @@ + /*FUNCTION Tria::PositiveDegreeDay{{{*/ + void Tria::PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){ + +- int i,iqj,imonth; + IssmDouble agd[NUMVERTICES]; // surface mass balance +- IssmDouble saccu[NUMVERTICES] = {0}; // yearly surface accumulation +- IssmDouble smelt[NUMVERTICES] = {0}; // yearly melt +- IssmDouble precrunoff[NUMVERTICES]; // yearly runoff +- IssmDouble prect; // total precipitation during 1 year taking into account des. ef. +- IssmDouble water; //water=rain + snowmelt +- IssmDouble runoff; //meltwater only, does not include rain +- IssmDouble sconv; //rhow_rain/rhoi / 12 months ++ IssmDouble monthlytemperatures[NUMVERTICES][12],monthlyprec[NUMVERTICES][12]; ++ IssmDouble h[NUMVERTICES],s[NUMVERTICES]; // ,b ++ IssmDouble rho_water,rho_ice; + +- IssmDouble rho_water,rho_ice,density; +- IssmDouble lapser=6.5/1000, sealev=0; // lapse rate. degrees per meter. 7.5 lev's 99 paper, 9 Marshall 99 paper +- IssmDouble desfac = 0.5; // desert elevation factor +- IssmDouble s0p[NUMVERTICES]={0}; // should be set to elevation from precip source +- IssmDouble s0t[NUMVERTICES]={0}; // should be set to elevation from temperature source +- IssmDouble st; // elevation between altitude of the temp record and current altitude +- IssmDouble sp; // elevation between altitude of the prec record and current altitude ++ /*Recover monthly temperatures and precipitation*/ ++ Input* input=inputs->GetInput(SurfaceforcingsMonthlytemperaturesEnum); _assert_(input); ++ Input* input2=inputs->GetInput(SurfaceforcingsPrecipitationEnum); _assert_(input2); ++ GaussTria* gauss=new GaussTria(); ++ IssmDouble time,yts; ++ this->parameters->FindParam(&time,TimeEnum); ++ this->parameters->FindParam(&yts,ConstantsYtsEnum); ++ for(int month=0;month<12;month++) { ++ for(int iv=0;ivGaussVertex(iv); ++ input->GetInputValue(&monthlytemperatures[iv][month],gauss,time+month/12.*yts); ++ monthlytemperatures[iv][month]=monthlytemperatures[iv][month]-273.15; // conversion from Kelvin to celcius ++ input2->GetInputValue(&monthlyprec[iv][month],gauss,time+month/12.*yts); ++ monthlyprec[iv][month]=monthlyprec[iv][month]*yts; // convertion to m/yr ++ } ++ } + +- // PDD and PD constants and variables +- IssmDouble siglim; // sigma limit for the integration which is equal to 2.5 sigmanorm +- IssmDouble signormc = signorm - 0.5; // sigma of the temperature distribution for cloudy day +- IssmDouble siglimc, siglim0, siglim0c; +- IssmDouble PDup, pddsig, PDCUT = 2.0; // PDcut: rain/snow cutoff temperature (C) +- IssmDouble DT = 0.02; +- IssmDouble pddt, pd; // pd: snow/precip fraction, precipitation falling as snow +- +- IssmDouble q, qmpt; // q is desert/elev. fact, hnpfac is huybrect fact, and pd is normal dist. +- IssmDouble qm[NUMVERTICES] = {0}; // snow part of the precipitation +- IssmDouble qmt[NUMVERTICES] = {0}; // precipitation without desertification effect adjustment +- IssmDouble qmp[NUMVERTICES] = {0}; // desertification taken into account +- IssmDouble pdd[NUMVERTICES] = {0}; +- IssmDouble frzndd[NUMVERTICES] = {0}; ++ /*Recover info at the vertices: */ ++ GetInputListOnVertices(&h[0],ThicknessEnum); ++ GetInputListOnVertices(&s[0],SurfaceEnum); + +- IssmDouble tstar; // monthly mean surface temp +- IssmDouble Tsum[NUMVERTICES]= {0}; // average summer (JJA) temperature +- IssmDouble Tsurf[NUMVERTICES] = {0}; // average annual temperature +- +- IssmDouble h[NUMVERTICES],s[NUMVERTICES],ttmp[NUMVERTICES],prectmp[NUMVERTICES]; // ,b[NUMVERTICES] +- IssmDouble t[NUMVERTICES+1][12],prec[NUMVERTICES+1][12]; +- IssmDouble deltm=1/12; +- int ismon[12]={12,1,2,3,4,5,6,7,8,9,10,11}; ++ /*Get material parameters :*/ ++ rho_ice=matpar->GetRhoIce(); ++ rho_water=matpar->GetRhoFreshwater(); + +- IssmDouble snwm; // snow that could have been melted in a year. +- IssmDouble snwmf; // ablation factor for snow per positive degree day. +- IssmDouble smf; // ablation factor for ice per pdd (Braithwaite 1995 from tarasov 2002). +- +- IssmDouble dfrz=1.5, CovrLm=2009./3.35e+5, dCovrLm=dfrz*CovrLm; //m*J kg^-1 C^-1 /(J kg^-1)=m/C yr +- IssmDouble supice,supcap,diffndd; +- IssmDouble fsupT=0.5, fsupndd=0.5; // Tsurf mode factors for supice +- IssmDouble pddtj[NUMVERTICES], hmx2; +- +- /*Recover info at the vertices: */ +- GetInputListOnVertices(&h[0],ThicknessEnum); +- GetInputListOnVertices(&s[0],SurfaceEnum); +- GetInputListOnVertices(&ttmp[0],ThermalSpctemperatureEnum); +- GetInputListOnVertices(&prectmp[0],SurfaceforcingsPrecipitationEnum); +- +- /*Recover monthly temperatures*/ +- Input* input=inputs->GetInput(SurfaceforcingsMonthlytemperaturesEnum); _assert_(input); +- GaussTria* gauss=new GaussTria(); +- IssmDouble time,yts; +- this->parameters->FindParam(&time,TimeEnum); +- this->parameters->FindParam(&yts,ConstantsYtsEnum); +- for(int month=0;month<12;month++){ +- for(int iv=0;ivGaussVertex(iv); +- input->GetInputValue(&t[iv][month],gauss,time+month/12*yts); +- t[iv][month]=t[iv][month]-273.15; // conversion from Kelvin to celcius +- } +- } +- +- for(i=0;iGetRhoIce(); +- rho_water=matpar->GetRhoFreshwater(); +- +- sconv=(rho_water/rho_ice)/12.; //rhow_rain/rhoi / 12 months +- +- /*PDD constant*/ +- siglim = 2.5*signorm; +- siglimc = 2.5*signormc; +- siglim0 = siglim/DT + 0.5; +- siglim0c = siglimc/DT + 0.5; +- PDup = siglimc+PDCUT; +- +- // seasonal loop +- for (iqj = 0; iqj < 12; iqj++){ +- imonth = ismon[iqj]; +- for (i = 0; i < NUMVERTICES; i++){ +- st=(s[i]-s0t[i])/1000; +- tstar = t[i][imonth] - lapser *max(st,sealev); +- Tsurf[i] = tstar*deltm+Tsurf[i]; +- +- /*********compute PD ****************/ +- if (tstar < PDup){ +- pd = 1; +- if (tstar >= -siglimc){ pd = pds[reCast(tstar/DT + siglim0c)];}} +- else { +- pd = 0;} +- +- /******exp des/elev precip reduction*******/ +- sp=(s[i]-s0p[i])/1000; // deselev effect is wrt chng in topo +- if (sp>0.0){q = exp(-desfac*sp);} +- else {q = 1.0;} +- +- qmt[i]= qmt[i] + prec[i][imonth]*sconv; //*sconv to convert in m of ice equivalent per month +- qmpt= q*prec[i][imonth]*sconv; +- qmp[i]= qmp[i] + qmpt; +- qm[i]= qm[i] + qmpt*pd; +- +- /*********compute PDD************/ +- // ndd(month)=-(tstar-pdd(month)) since ndd+pdd gives expectation of +- // gaussian=T_m, so ndd=-(Tsurf-pdd) +- if (iqj>6 && iqj<10){ Tsum[i]=Tsum[i]+tstar;} +- if (tstar >= siglim) {pdd[i] = pdd[i] + tstar*deltm;} +- else if (tstar> -siglim){ +- pddsig=pdds[reCast(tstar/DT + siglim0)]; +- pdd[i] = pdd[i] + pddsig*deltm; +- frzndd[i] = frzndd[i] - (tstar-pddsig)*deltm;} +- else{frzndd[i] = frzndd[i] - tstar*deltm; } +- } +- } // end of seasonal loop +- +- //****************************************************************** +- for(i=0;i2m) +- // problem with water seepage into ice: should be sealed after +- // refreezing +- // so everything needs to be predicated on 1 year scale, except for +- // thermal +- // conductivity through ice +- // also, need to account that melt season has low accum, so what's +- // going to +- // hold the meltwater around for refreezing? And melt-time will have +- // low seasonal frzndd +- +- // Superimposed ice : Pfeffer et al. 1991, Tarasov 2002 +- +- supice= min(hmx2*CovrLm*frzndd[i]+2.2*(saccu[i]-snwm), water); // superimposed ice +- supcap=min(2.2*(saccu[i]-snwm),water); +- runoff=snwm - supice; //meltwater only, does not include rain +- } +- else { //all snow melted +- supice= min(hmx2*CovrLm*frzndd[i], prect ); +- runoff= saccu[i] + smf*(pddt-saccu[i]/snwmf) - supice; +- supcap=0; +- } +- // pdd melting doesn't cool Tsurf, so ndd refreeze shouldn't warm it +- // except pdd melt heat source is atmosphere, while refreeze is +- // ground/ice stored interim +- // assume pdd=ndd, then melt should equal refreeze and Tsurf should=0 +- // assume ndd=2*pdd, then all supice is refrozen, but Tsurf should be +- // <0 +- // assume ndd>pdd, little melt => little supice +- // bottom line: compare for Tsurf<0 : supice and no supice case, +- // expect Tsurf difference +- // except some of cooling flux comes from atmosphere// +- // 1 dm supice should not raise Tsurf by 1/dCovrLm = 16.675C +- // does supice make sense when H< 0.1m? then d=thermoactive ice layer //// +- // < 0.1 +- +- // make more sense to just use residual pdd-ndd except that pdd +- // residual not clear yet +- // frzndd should not be used up by refreezing in snow, so stick in +- // supcap. +- diffndd=0; +- if (frzndd[i]>0) { +- diffndd=fsupndd*min((supice-supcap)/dCovrLm ,frzndd[i]); +- frzndd[i]=frzndd[i]-diffndd; +- } +- if(runoff<0){ +- saccu[i]= saccu[i] -runoff; +- smelt[i] = 0; +- precrunoff[i]=prect-saccu[i]; +- //here assume pdd residual is 0, => +- Tsurf[i]= max(Tsurf[i],-frzndd[i]); +- } +- else { +- smelt[i] = runoff; +- precrunoff[i]=prect-max(0.,supice)-saccu[i];} +- //here really need pdd balance, try 0.5 fudge factor? +- //at least runoff>0 => it's fairly warm, so Tsurf is !<<0, +- //yet from site plots, can be ice free with Tsurf=-5.5C +- if(Tsurf[i]<0) { +- Tsurf[i]= min(Tsurf[i]+fsupT*diffndd , 0.);} +- +- agd[i] = -smelt[i]+saccu[i]; +- pddtj[i]=pddt; +- +- /*Update inputs*/ +- this->inputs->AddInput(new TriaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0])); ////////verifier le nom +- // this->inputs->AddInput(new TriaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0])); +- this->inputs->AddInput(new TriaP1Input(ThermalSpctemperatureEnum,&Tsurf[0])); +- +- } //end of the for loop over the vertices ++ /*Update inputs*/ ++ this->inputs->AddInput(new TriaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0])); ++ // this->inputs->AddInput(new TriaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0])); + } + /*}}}*/ + /*FUNCTION Tria::ProcessResultsUnits{{{*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Tria.h (revision 12704) +@@ -88,7 +88,7 @@ + bool IsOnWater(); + void GetSolutionFromInputs(Vector* solution); + void GetVectorFromInputs(Vector* vector, int name_enum); +- void GetVectorFromResults(Vector* vector,int offset,int interp); ++ void GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp); + void InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max); + bool InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums); + void InputCreate(IssmDouble scalar,int name,int code); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12704) +@@ -1079,10 +1079,13 @@ + } + /*}}}*/ + /*FUNCTION Penta::GetVectorFromResults{{{*/ +-void Penta::GetVectorFromResults(Vector* vector,int offset,int interp){ ++void Penta::GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp){ + + /*Get result*/ + ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); ++ if(elementresult->InstanceEnum()!=enum_in){ ++ _error_("Results of offset %i is %s, when %s was expected",offset,EnumToStringx(elementresult->InstanceEnum()),EnumToStringx(enum_in)); ++ } + if(interp==P1Enum){ + int doflist1[NUMVERTICES]; + int connectivity[NUMVERTICES]; +@@ -2254,226 +2257,45 @@ + /*FUNCTION Penta::PositiveDegreeDay{{{*/ + void Penta::PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){ + ++ IssmDouble agd[NUMVERTICES]; // surface mass balance ++ IssmDouble monthlytemperatures[NUMVERTICES][12],monthlyprec[NUMVERTICES][12]; ++ IssmDouble h[NUMVERTICES],s[NUMVERTICES]; // ,b ++ IssmDouble rho_water,rho_ice; + +- int i,iqj,imonth; +- IssmDouble agd[NUMVERTICES]; // surface and basal +- IssmDouble saccu[NUMVERTICES] = {0}; // yearly surface accumulation +- IssmDouble smelt[NUMVERTICES] = {0}; // yearly melt +- IssmDouble precrunoff[NUMVERTICES]; // yearly runoff +- IssmDouble prect; // total precipitation during 1 year taking into account des. ef. +- IssmDouble water; //water=rain + snowmelt +- IssmDouble runoff; //meltwater only, does not include rain +- IssmDouble sconv; //rhow_rain/rhoi / 12 months ++ /*Recover monthly temperatures and precipitation*/ ++ Input* input=inputs->GetInput(SurfaceforcingsMonthlytemperaturesEnum); _assert_(input); ++ Input* input2=inputs->GetInput(SurfaceforcingsPrecipitationEnum); _assert_(input2); ++ GaussPenta* gauss=new GaussPenta(); ++ IssmDouble time,yts; ++ this->parameters->FindParam(&time,TimeEnum); ++ this->parameters->FindParam(&yts,ConstantsYtsEnum); ++ for(int month=0;month<12;month++) { ++ for(int iv=0;ivGaussVertex(iv); ++ input->GetInputValue(&monthlytemperatures[iv][month],gauss,time+month/12.*yts); ++ monthlytemperatures[iv][month]=monthlytemperatures[iv][month]-273.15; // conversion from Kelvin to celcius ++ input2->GetInputValue(&monthlyprec[iv][month],gauss,time+month/12.*yts); ++ monthlyprec[iv][month]=monthlyprec[iv][month]*yts; // convertion to m/yr ++ } ++ } + +- IssmDouble rho_water,rho_ice,density; +- IssmDouble lapser=6.5/1000, sealev=0; // lapse rate. degrees per meter. +- IssmDouble desfac = 0.5; //desert elevation factor +- IssmDouble s0p[NUMVERTICES]={0}; //should be set to elevation from precip source +- IssmDouble s0t[NUMVERTICES]={0}; //should be set to elevation from temperature source +- IssmDouble st; // elevation between altitude of the temp record and current altitude +- IssmDouble sp; // elevation between altitude of the prec record and current altitude ++ /*Recover info at the vertices: */ ++ GetInputListOnVertices(&h[0],ThicknessEnum); ++ GetInputListOnVertices(&s[0],SurfaceEnum); + ++ /*Get material parameters :*/ ++ rho_ice=matpar->GetRhoIce(); ++ rho_water=matpar->GetRhoFreshwater(); + +- // PDD and PD constants and variables +- IssmDouble siglim; // sigma limit for the integration which is equal to 2.5 sigmanorm +- IssmDouble signormc = signorm - 0.5; // sigma of the temperature distribution for cloudy day +- IssmDouble siglimc, siglim0, siglim0c; +- IssmDouble PDup, pddsig, PDCUT = 2.0; // PDcut: rain/snow cutoff temperature (C) +- IssmDouble DT = 0.02; +- IssmDouble pddt, pd; // pd: snow/precip fraction, precipitation falling as snow +- +- IssmDouble q, qmpt; // q is desert/elev. fact, hnpfac is huybrect fact, and pd is normal dist. +- IssmDouble qm[NUMVERTICES] = {0}; // snow part of the precipitation +- IssmDouble qmt[NUMVERTICES] = {0}; // precipitation without desertification effect adjustment +- IssmDouble qmp[NUMVERTICES] = {0}; // desertification taken into account +- IssmDouble pdd[NUMVERTICES] = {0}; +- IssmDouble frzndd[NUMVERTICES] = {0}; +- +- IssmDouble tstar; // monthly mean surface temp +- IssmDouble Tsum[NUMVERTICES]= {0}; // average summer (JJA) temperature +- IssmDouble Tsurf[NUMVERTICES] = {0}; // average annual temperature +- +- IssmDouble h[NUMVERTICES],s[NUMVERTICES],ttmp[NUMVERTICES],prectmp[NUMVERTICES]; // ,b[NUMVERTICES] +- IssmDouble t[NUMVERTICES][12],prec[NUMVERTICES][12]; +- IssmDouble deltm=1/12; +- int ismon[12]={12,1,2,3,4,5,6,7,8,9,10,11}; +- +- IssmDouble snwm; // snow that could have been melted in a year. +- IssmDouble snwmf; // ablation factor for snow per positive degree day. +- IssmDouble smf; // ablation factor for ice per pdd (Braithwaite 1995 from tarasov 2002). +- +- IssmDouble dfrz=1.5, CovrLm=2009./3.35e+5, dCovrLm=dfrz*CovrLm; //m*J kg^-1 C^-1 /(J kg^-1)=m/C yr +- IssmDouble supice,supcap,diffndd; +- IssmDouble fsupT=0.5, fsupndd=0.5; // Tsurf mode factors for supice +- IssmDouble pddtj[NUMVERTICES], hmx2; +- +- /*Recover info at the vertices: */ +- GetInputListOnVertices(&h[0],ThicknessEnum); +- GetInputListOnVertices(&s[0],SurfaceEnum); +- GetInputListOnVertices(&ttmp[0],ThermalSpctemperatureEnum); +- GetInputListOnVertices(&prectmp[0],SurfaceforcingsPrecipitationEnum); +- +- for(i=0;iGetRhoIce(); +- //rho_freshwater=matpar->GetRhoWater(); +- +- sconv=(1000/rho_ice)/12.; //rhow_rain/rhoi / 12 months +- +- /*PDD constant*/ +- siglim = 2.5*signorm; +- siglimc = 2.5*signormc; +- siglim0 = siglim/DT + 0.5; +- siglim0c = siglimc/DT + 0.5; +- PDup = siglimc+PDCUT; +- +- // seasonal loop +- for (iqj = 0; iqj < 12; iqj++){ +- imonth = ismon[iqj]; +- for (i = 0; i < NUMVERTICES; i++){ +- st=(s[i]-s0t[i])/1000; +- tstar = t[i][imonth] - lapser *max(st,sealev); +- Tsurf[i] = tstar*deltm+Tsurf[i]; +- +- /*********compute PD ****************/ +- if (tstar < PDup){ +- pd = 1; +- if (tstar >= -siglimc){ pd = pds[int(tstar/DT + siglim0c)];}} +- else { +- pd = 0;} +- +- /******exp des/elev precip reduction*******/ +- sp=(s[i]-s0p[i])/1000; // deselev effect is wrt chng in topo +- if (sp>0.0){q = exp(-desfac*sp);} +- else {q = 1.0;} +- +- qmt[i]= qmt[i] + prec[i][imonth]*sconv; //*sconv to convert in m of ice equivalent +- qmpt= q*prec[i][imonth]*sconv; +- qmp[i]= qmp[i] + qmpt; +- qm[i]= qm[i] + qmpt*pd; +- +- /*********compute PDD************/ +- // ndd(month)=-(tstar-pdd(month)) since ndd+pdd gives expectation of +- // gaussian=T_m, so ndd=-(Tsurf-pdd) +- if (iqj>6 && iqj<10){ Tsum[i]=Tsum[i]+tstar;} +- if (tstar >= siglim) {pdd[i] = pdd[i] + tstar*deltm;} +- else if (tstar> -siglim){ +- pddsig=pdds[int(tstar/DT + siglim0)]; +- pdd[i] = pdd[i] + pddsig*deltm; +- frzndd[i] = frzndd[i] - (tstar-pddsig)*deltm;} +- else{frzndd[i] = frzndd[i] - tstar*deltm; } +- } +- } // end of seasonal loop +- +- //****************************************************************** +- for(i=0;i2m) +- // problem with water seepage into ice: should be sealed after +- // refreezing +- // so everything needs to be predicated on 1 year scale, except for +- // thermal +- // conductivity through ice +- // also, need to account that melt season has low accum, so what's +- // going to +- // hold the meltwater around for refreezing? And melt-time will have +- // low seasonal frzndd +- +- // Superimposed ice : Pfeffer et al. 1991, Tarasov 2002 +- +- supice= min(hmx2*CovrLm*frzndd[i]+2.2*(saccu[i]-snwm), water); // superimposed ice +- supcap=min(2.2*(saccu[i]-snwm),water); +- runoff=snwm - supice; //meltwater only, does not include rain +- } +- else { //all snow melted +- supice= min(hmx2*CovrLm*frzndd[i], prect ); +- runoff= saccu[i] + smf*(pddt-saccu[i]/snwmf) - supice; +- supcap=0; +- } +- // pdd melting doesn't cool Tsurf, so ndd refreeze shouldn't warm it +- // except pdd melt heat source is atmosphere, while refreeze is +- // ground/ice stored interim +- // assume pdd=ndd, then melt should equal refreeze and Tsurf should=0 +- // assume ndd=2*pdd, then all supice is refrozen, but Tsurf should be +- // <0 +- // assume ndd>pdd, little melt => little supice +- // bottom line: compare for Tsurf<0 : supice and no supice case, +- // expect Tsurf difference +- // except some of cooling flux comes from atmosphere// +- // 1 dm supice should not raise Tsurf by 1/dCovrLm = 16.675C +- // does supice make sense when H< 0.1m? then d=thermoactive ice layer //// +- // < 0.1 +- +- // make more sense to just use residual pdd-ndd except that pdd +- // residual not clear yet +- // frzndd should not be used up by refreezing in snow, so stick in +- // supcap. +- diffndd=0; +- if (frzndd[i]>0) { +- diffndd=fsupndd*min((supice-supcap)/dCovrLm ,frzndd[i]); +- frzndd[i]=frzndd[i]-diffndd; +- } +- if(runoff<0){ +- saccu[i]= saccu[i] -runoff; +- smelt[i] = 0; +- precrunoff[i]=prect-saccu[i]; +- //here assume pdd residual is 0, => +- Tsurf[i]= max(Tsurf[i],-frzndd[i]); +- } +- else { +- smelt[i] = runoff; +- precrunoff[i]=prect-max(0.,supice)-saccu[i];} +- //here really need pdd balance, try 0.5 fudge factor? +- //at least runoff>0 => it's fairly warm, so Tsurf is !<<0, +- //yet from site plots, can be ice free with Tsurf=-5.5C +- if(Tsurf[i]<0) { +- Tsurf[i]= min(Tsurf[i]+fsupT*diffndd , 0.);} +- +- agd[i] = -smelt[i]+saccu[i]; +- pddtj[i]=pddt; +- +- /*Update inputs*/ +- this->inputs->AddInput(new PentaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0])); ////////verifier le nom +- // this->inputs->AddInput(new TriaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0])); +- this->inputs->AddInput(new PentaP1Input(ThermalSpctemperatureEnum,&Tsurf[0])); +- +- } //end of the for loop over the vertices ++ /*Update inputs*/ ++ this->inputs->AddInput(new PentaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0])); ++ //this->inputs->AddInput(new PentaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0])); ++ this->InputExtrude(SurfaceforcingsMassBalanceEnum,ElementEnum); + } + /*}}}*/ + /*FUNCTION Penta::PotentialSheetUngrounding{{{*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Elements/Penta.h (revision 12704) +@@ -88,7 +88,7 @@ + void GetSolutionFromInputs(Vector* solution); + IssmDouble GetZcoord(GaussPenta* gauss); + void GetVectorFromInputs(Vector* vector,int name_enum); +- void GetVectorFromResults(Vector* vector,int offset,int interp); ++ void GetVectorFromResults(Vector* vector,int offset,int name_enum,int interp); + + int Sid(); + void InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DoubleInput.h (revision 12704) +@@ -47,8 +47,9 @@ + void GetInputValue(int* pvalue); + void GetInputValue(IssmDouble* pvalue); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/Input.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/Input.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/Input.h (revision 12704) +@@ -20,14 +20,15 @@ + public: + + virtual ~Input(){}; +- /*Virtual functions:{{{*/ ++ + virtual int InstanceEnum()=0; + virtual void GetInputValue(bool* pvalue)=0; + virtual void GetInputValue(int* pvalue)=0; + virtual void GetInputValue(IssmDouble* pvalue)=0; + virtual void GetInputValue(IssmDouble* pvalue,GaussTria* gauss)=0; ++ virtual void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss)=0; + virtual void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time)=0; +- virtual void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss)=0; ++ virtual void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time)=0; + virtual void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index)=0; + virtual void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index)=0; + virtual void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss)=0; +@@ -64,8 +65,5 @@ + virtual Input* PointwiseMax(Input* inputmax)=0; + virtual Input* PointwiseMin(Input* inputmin)=0; + virtual ElementResult* SpawnResult(int step, IssmDouble time)=0; +- +- /*}}}*/ +- + }; + #endif +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 12704) +@@ -53,8 +53,9 @@ + void GetInputValue(int* pvalue); + void GetInputValue(IssmDouble* pvalue); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/DatasetInput.h (revision 12704) +@@ -43,13 +43,14 @@ + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + void Configure(Parameters* parameters); + /*}}}*/ +- /*numeriics: {{{*/ ++ /*numerics: {{{*/ + void GetInputValue(bool* pvalue){_error2_("not implemented yet");}; + void GetInputValue(int* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not implemented yet");}; ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index); + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/IntInput.h (revision 12704) +@@ -48,8 +48,9 @@ + void GetInputValue(int* pvalue); + void GetInputValue(IssmDouble* pvalue); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/BoolInput.h (revision 12704) +@@ -48,8 +48,9 @@ + void GetInputValue(int* pvalue); + void GetInputValue(IssmDouble* pvalue); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 12704) +@@ -48,8 +48,9 @@ + void GetInputValue(int* pvalue){_error2_("not implemented yet");} + void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");} + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.cpp (revision 12704) +@@ -171,6 +171,22 @@ + delete input; + } + /*}}}*/ ++/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ ++void TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){ ++ IssmDouble time; ++ ++ /*First, recover current time from parameters: */ ++ this->parameters->FindParam(&time,TimeEnum); ++ ++ /*Retrieve interpolated values for this time step: */ ++ Input* input=GetTimeInput(time); ++ ++ /*Call input function*/ ++ input->GetInputValue(pvalue,gauss); ++ ++ delete input; ++} ++/*}}}*/ + /*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){{{*/ + void TransientInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){ + +@@ -183,6 +199,18 @@ + delete input; + } + /*}}}*/ ++/*FUNCTION TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){{{*/ ++void TransientInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){ ++ ++ /*Retrieve interpolated values for this time step: */ ++ Input* input=GetTimeInput(time); ++ ++ /*Call input function*/ ++ input->GetInputValue(pvalue,gauss); ++ ++ delete input; ++} ++/*}}}*/ + /*FUNCTION TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){{{*/ + void TransientInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, GaussTria* gauss){ + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12704) +@@ -50,8 +50,9 @@ + void GetInputValue(int* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time); +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 12704) +@@ -48,8 +48,9 @@ + void GetInputValue(int* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not implemented yet");}; ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/extrude.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/extrude.m (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/extrude.m (revision 12704) +@@ -142,6 +142,7 @@ + md.surfaceforcings.mass_balance=project3d(md,'vector',md.surfaceforcings.mass_balance,'type','node'); + md.surfaceforcings.precipitation=project3d(md,'vector',md.surfaceforcings.precipitation,'type','node'); + md.balancethickness.thickening_rate=project3d(md,'vector',md.balancethickness.thickening_rate,'type','node'); ++md.surfaceforcings.monthlytemperatures=project3d(md,'vector',md.surfaceforcings.monthlytemperatures,'type','node'); + + %results + if ~isnan(md.initialization.vx),md.initialization.vx=project3d(md,'vector',md.initialization.vx,'type','node');end; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl (revision 12703) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl (revision 12704) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r12339-12703 Index: /issm/oecreview/Archive/12678-13393/ISSM-12704-12705.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12704-12705.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12704-12705.diff (revision 13394) @@ -0,0 +1,120 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp (revision 12704) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp (revision 12705) +@@ -4,60 +4,60 @@ + + #include "./elements.h" + +-double PddSurfaceMassBlance(double* monthlytemperatures, double* monthlyprec, double* pdds, double* pds, double signorm, double yts, double h, double s, double rho_ice, double rho_water){ ++IssmDouble PddSurfaceMassBlance(IssmDouble* monthlytemperatures, IssmDouble* monthlyprec, IssmDouble* pdds, IssmDouble* pds, IssmDouble signorm, IssmDouble yts, IssmDouble h, IssmDouble s, IssmDouble rho_ice, IssmDouble rho_water){ + + // output: +- double B; // surface mass balance, melt+accumulation ++ IssmDouble B; // surface mass balance, melt+accumulation + + int iqj,imonth, j; + +- double saccu; // yearly surface accumulation +- double smelt; // yearly melt +- double precrunoff; // yearly runoff +- double prect; // total precipitation during 1 year taking into account des. ef. +- double water; //water=rain + snowmelt +- double runoff; //meltwater only, does not include rain +- double sconv; //rhow_rain/rhoi / 12 months ++ IssmDouble saccu; // yearly surface accumulation ++ IssmDouble smelt; // yearly melt ++ IssmDouble precrunoff; // yearly runoff ++ IssmDouble prect; // total precipitation during 1 year taking into account des. ef. ++ IssmDouble water; //water=rain + snowmelt ++ IssmDouble runoff; //meltwater only, does not include rain ++ IssmDouble sconv; //rhow_rain/rhoi / 12 months + +- double density; +- double lapser=6.5/1000., sealev=0.; // lapse rate. degrees per meter. 7.5 lev's 99 paper, 9 Marshall 99 paper +- double desfac = 0.5; // desert elevation factor +- double s0p=0.; // should be set to elevation from precip source +- double s0t=0.; // should be set to elevation from temperature source +- double st; // elevation between altitude of the temp record and current altitude +- double sp; // elevation between altitude of the prec record and current altitude ++ IssmDouble density; ++ IssmDouble lapser=6.5/1000., sealev=0.; // lapse rate. degrees per meter. 7.5 lev's 99 paper, 9 Marshall 99 paper ++ IssmDouble desfac = 0.5; // desert elevation factor ++ IssmDouble s0p=0.; // should be set to elevation from precip source ++ IssmDouble s0t=0.; // should be set to elevation from temperature source ++ IssmDouble st; // elevation between altitude of the temp record and current altitude ++ IssmDouble sp; // elevation between altitude of the prec record and current altitude + + // PDD and PD constants and variables +- double siglim; // sigma limit for the integration which is equal to 2.5 sigmanorm +- double signormc = signorm - 0.5; // sigma of the temperature distribution for cloudy day +- double siglimc, siglim0, siglim0c; +- double PDup, pddsig, PDCUT = 2.0; // PDcut: rain/snow cutoff temperature (C) +- double DT = 0.02; +- double pddt, pd; // pd: snow/precip fraction, precipitation falling as snow ++ IssmDouble siglim; // sigma limit for the integration which is equal to 2.5 sigmanorm ++ IssmDouble signormc = signorm - 0.5; // sigma of the temperature distribution for cloudy day ++ IssmDouble siglimc, siglim0, siglim0c; ++ IssmDouble PDup, pddsig, PDCUT = 2.0; // PDcut: rain/snow cutoff temperature (C) ++ IssmDouble DT = 0.02; ++ IssmDouble pddt, pd; // pd: snow/precip fraction, precipitation falling as snow + +- double q, qmpt; // q is desert/elev. fact, hnpfac is huybrect fact, and pd is normal dist. +- double qm = 0.; // snow part of the precipitation +- double qmt = 0.; // precipitation without desertification effect adjustment +- double qmp = 0.; // desertification taken into account +- double pdd = 0.; +- double frzndd = 0.; ++ IssmDouble q, qmpt; // q is desert/elev. fact, hnpfac is huybrect fact, and pd is normal dist. ++ IssmDouble qm = 0.; // snow part of the precipitation ++ IssmDouble qmt = 0.; // precipitation without desertification effect adjustment ++ IssmDouble qmp = 0.; // desertification taken into account ++ IssmDouble pdd = 0.; ++ IssmDouble frzndd = 0.; + +- double tstar; // monthly mean surface temp +- double Tsum= 0.; // average summer (JJA) temperature +- double Tsurf = 0.; // average annual temperature ++ IssmDouble tstar; // monthly mean surface temp ++ IssmDouble Tsum= 0.; // average summer (JJA) temperature ++ IssmDouble Tsurf = 0.; // average annual temperature + + +- double deltm=1./12.; ++ IssmDouble deltm=1./12.; + int ismon[12]={11,0,1,2,3,4,5,6,7,8,9,10}; + +- double snwm; // snow that could have been melted in a year. +- double snwmf; // ablation factor for snow per positive degree day. +- double smf; // ablation factor for ice per pdd (Braithwaite 1995 from tarasov 2002). ++ IssmDouble snwm; // snow that could have been melted in a year. ++ IssmDouble snwmf; // ablation factor for snow per positive degree day. ++ IssmDouble smf; // ablation factor for ice per pdd (Braithwaite 1995 from tarasov 2002). + +- double dfrz=1.5, CovrLm=2009./3.35e+5, dCovrLm=dfrz*CovrLm; //m*J kg^-1 C^-1 /(J kg^-1)=m/C yr +- double supice,supcap,diffndd; +- double fsupT=0.5, fsupndd=0.5; // Tsurf mode factors for supice +- double pddtj, hmx2; ++ IssmDouble dfrz=1.5, CovrLm=2009./3.35e+5, dCovrLm=dfrz*CovrLm; //m*J kg^-1 C^-1 /(J kg^-1)=m/C yr ++ IssmDouble supice,supcap,diffndd; ++ IssmDouble fsupT=0.5, fsupndd=0.5; // Tsurf mode factors for supice ++ IssmDouble pddtj, hmx2; + + sconv=(rho_water/rho_ice)/12.; //rhow_rain/rhoi / 12 months + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12704) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12705) +@@ -50,9 +50,9 @@ + void GetInputValue(int* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time); +- void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; ++ void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time); + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); Index: /issm/oecreview/Archive/12678-13393/ISSM-12710-12711.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12710-12711.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12710-12711.diff (revision 13394) @@ -0,0 +1,49 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install-macosx64.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install-macosx64.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install-macosx64.sh (revision 12711) +@@ -0,0 +1,38 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install ++rm -rf modules-3.2.9 ++mkdir install ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/modules-3.2.9.tar.gz' 'modules-3.2.9.tar.gz' ++ ++#Untar ++tar -zxvf modules-3.2.9.tar.gz ++ ++#Move modules into src directory ++ ++#Configure modules ++cd modules-3.2.9 ++./configure \ ++ --prefix=$ISSM_DIR/externalpackages/modules/install\ ++ --with-module-path=$ISSM_DIR/externalpackages/modules/install/modules/files\ ++ --with-version-path=$ISSM_DIR/externalpackages/modules/install/modules/versions\ ++ --with-tcl-lib=$ISSM_DIR/externalpackages/tcl/install/Library/Frameworks/Tcl.framework/Versions/8.5\ ++ --with-tcl-inc=$ISSM_DIR/externalpackages/tcl/install/Library/Frameworks/Tcl.framework/Versions/8.5/Headers\ ++ --with-tcl-ver=8.5\ ++ --with-tclx-lib=$ISSM_DIR/externalpackages/tclx/install/lib/tclx8.4\ ++ --with-tclx-inc=$ISSM_DIR/externalpackages/tclx/install/include\ ++ --with-tclx-ver=8.4\ ++ --with-etc-path=$ISSM_DIR/externalpackages/modules/install/modules/etc\ ++ --with-skel-path=$ISSM_DIR/externalpackages/modules/install/modules/etc/skel\ ++ --disable-dependency-tracking ++ ++#Compile and install modules ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules/install-macosx64.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* Index: /issm/oecreview/Archive/12678-13393/ISSM-12711-12712.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12711-12712.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12711-12712.diff (revision 13394) @@ -0,0 +1,54 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx/install.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx/install.sh (revision 12712) +@@ -0,0 +1,31 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf src ++rm -rf install ++rm -rf tclx8.4 ++mkdir src install ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tclx8.4.tar.gz' 'tclx8.4.tar.gz' ++ ++#Untar ++tar -zxvf tclx8.4.tar.gz ++ ++#Move tclx into src directory ++mv tclx8.4/* src ++rm -rf tclx8.4 ++ ++#Configure tclx ++cd src ++./configure --prefix="$ISSM_DIR/externalpackages/tclx/install" \ ++ --exec-prefix="$ISSM_DIR/externalpackages/tclx/install" \ ++ --with-tcl=$ISSM_DIR/externalpackages/tcl/install/Library/Frameworks/Tcl.framework ++ ++#Compile and install tclx ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx/install.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx (revision 12711) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx (revision 12712) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tclx +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,3 ## ++src ++install ++*.gz Index: /issm/oecreview/Archive/12678-13393/ISSM-12712-12713.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12712-12713.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12712-12713.diff (revision 13394) @@ -0,0 +1,11 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/esmf +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/esmf (revision 12712) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/esmf (revision 12713) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/esmf +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,2 ## ++esmf ++*.gz Index: /issm/oecreview/Archive/12678-13393/ISSM-12713-12714.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12713-12714.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12713-12714.diff (revision 13394) @@ -0,0 +1,40 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/ncview +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/ncview (revision 12713) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/ncview (revision 12714) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/ncview +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,5 ## ++*.gz ++udunits.tar ++install ++genoverlay ++README +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf (revision 12713) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf (revision 12714) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf +___________________________________________________________________ +Modified: svn:ignore +## -1 +1,4 ## ++*.gz + install ++install-* ++src +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/automake +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/automake (revision 12713) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/automake (revision 12714) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/automake +___________________________________________________________________ +Modified: svn:ignore +## -1,3 +1,4 ## + install + src + .ignore.txt ++*.gz Index: /issm/oecreview/Archive/12678-13393/ISSM-12714-12715.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12714-12715.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12714-12715.diff (revision 13394) @@ -0,0 +1,49 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh (revision 12714) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh (revision 12715) +@@ -2,7 +2,7 @@ + + #Some cleanup + version=3.6.1 +-rm -rf src install octave-$version octave-$version.tar.gz ++rm -rf src install octave-$version + mkdir install src + + #Download from ISSM server +@@ -17,14 +17,13 @@ + + #install + cd src ++./configure --prefix=$ISSM_DIR/externalpackages/octave/install --disable-readline + +-exit +-make +- +-#Compile +-cd ../install +-mkdir lib +-cd lib +-cp ../../src/*.a . +-ln -s octave_LINUX.a octave.a +-ln -s octave_LINUX.a liboctave.a ++if [ -z $NUMCPUS ]; ++then ++ make ++ make install ++else ++ make -j $NUMCPUS ++ make -j $NUMCPUS install ++fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave (revision 12714) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave (revision 12715) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,3 ## ++*.gz ++install ++src Index: /issm/oecreview/Archive/12678-13393/ISSM-12715-12716.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12715-12716.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12715-12716.diff (revision 13394) @@ -0,0 +1,23 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf-python +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf-python (revision 12715) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf-python (revision 12716) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf-python +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,2 ## ++install ++*.gz +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl (revision 12715) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl (revision 12716) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl +___________________________________________________________________ +Modified: svn:ignore +## -1,2 +1,3 ## ++*.gz + install + src Index: /issm/oecreview/Archive/12678-13393/ISSM-12716-12717.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12716-12717.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12716-12717.diff (revision 13394) @@ -0,0 +1,27 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/aspell/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/aspell/install.sh (revision 12716) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/aspell/install.sh (revision 12717) +@@ -3,7 +3,7 @@ + #0: cleanup + #1: install aspell + #2: install en dictionary +-step=0 ++step=2 + + + #Some cleanup +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/aspell +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/aspell (revision 12716) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/aspell (revision 12717) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/aspell +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,5 ## ++src ++install ++dicts ++*.gz ++src Index: /issm/oecreview/Archive/12678-13393/ISSM-12717-12718.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12717-12718.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12717-12718.diff (revision 13394) @@ -0,0 +1,25 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install.sh (revision 12717) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal/install.sh (revision 12718) +@@ -21,6 +21,7 @@ + ./configure \ + --prefix="$ISSM_DIR/externalpackages/gdal/install" \ + --without-python \ ++ --without-png \ + --with-netcdf=no \ + --with-jasper=no \ + --without-ld-shared \ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal (revision 12717) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal (revision 12718) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gdal +___________________________________________________________________ +Modified: svn:ignore +## -1,3 +1,4 ## ++*.gz + install* + src + .ignore.txt Index: /issm/oecreview/Archive/12678-13393/ISSM-12718-12719.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12718-12719.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12718-12719.diff (revision 13394) @@ -0,0 +1,44 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl/install.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl/install.sh (revision 12719) +@@ -0,0 +1,23 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf src ++rm -rf install ++rm -rf tcl8.5.11 ++mkdir src install ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tcl8.5.11.tar.gz' 'tcl8.5.11.tar.gz' ++ ++#Untar ++tar -zxvf tcl8.5.11.tar.gz ++ ++#Move tcl into src directory ++mv tcl8.5.11/* src ++rm -rf tcl8.5.11 ++ ++#Configure tcl ++ver="8.4.12" ++ ++cd src ++make -C ./macosx install INSTALL_ROOT="$ISSM_DIR/externalpackages/tcl/install" + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl/install.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl (revision 12718) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl (revision 12719) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1 ## ++*.gz Index: /issm/oecreview/Archive/12678-13393/ISSM-12719-12720.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12719-12720.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12719-12720.diff (revision 13394) @@ -0,0 +1,68 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-snowleopard.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-snowleopard.sh (revision 12719) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-snowleopard.sh (revision 12720) +@@ -26,6 +26,8 @@ + # --enable-framework needs to have the form "$SOME_PATH/Library/Frameworks" to avoid installing components in /Applications directory + # --prefix is recognized as $SOME_PATH as long as this form is taken, so it's not necessary to include + ./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" ++ ++#make + if [ -z $1 ]; then + make + else +@@ -47,4 +49,8 @@ + cd ../install + ln -s Library/Frameworks/Python.framework/Headers include + ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib ++ ++ #Patch pyport.h: ++ cd include ++ patch pyport.h ../patch/pyport.h.patch + fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh (revision 12719) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh (revision 12720) +@@ -22,7 +22,11 @@ + + #Configure doxygen + cd src +-./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" ++./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" ++#obsolete? ++#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" ++ ++#make + if [ -z $1 ]; then + make + else +@@ -37,6 +41,15 @@ + cd ../ + ln -s Python.framework/Versions/3.2/include/python3.2m include + ln -s Python.framework/Versions/3.2/lib/ lib ++fi + ++#Some modifications to be done in case version is 2.7 ++if [[ $version == "2.7.2" ]]; then ++ cd ../install ++ ln -s Library/Frameworks/Python.framework/Headers include ++ ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib + ++ #Patch pyport.h: ++ cd include ++ patch pyport.h ../patch/pyport.h.patch + fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python (revision 12719) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python (revision 12720) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python +___________________________________________________________________ +Modified: svn:ignore +## -1,3 +1,4 ## + install ++install-python* + src + *.tgz Index: /issm/oecreview/Archive/12678-13393/ISSM-12720-12721.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12720-12721.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12720-12721.diff (revision 13394) @@ -0,0 +1,30 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-emulators +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-emulators (revision 12720) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-emulators (revision 12721) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-emulators +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1 ## ++Android-* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-ndk +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-ndk (revision 12720) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-ndk (revision 12721) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-ndk +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1 ## ++install +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android (revision 12720) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android (revision 12721) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1 ## ++arm-linux* Index: /issm/oecreview/Archive/12678-13393/ISSM-12721-12722.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12721-12722.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12721-12722.diff (revision 13394) @@ -0,0 +1,109 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/modules +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,2 ## ++modules-* ++install +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autoconf +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autoconf (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autoconf (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/autoconf +___________________________________________________________________ +Modified: svn:ignore +## -1,3 +1,4 ## ++*.gz + install + src + .ignore.txt +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tcl +___________________________________________________________________ +Modified: svn:ignore +## -1 +1,4 ## + *.gz ++build ++src ++install +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/hdf5 +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/hdf5 (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/hdf5 (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/hdf5 +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,3 ## ++install ++src ++*.gz +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/pcre +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/pcre (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/pcre (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/pcre +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,2 ## ++install ++*.gz +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libtool +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libtool (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libtool (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/libtool +___________________________________________________________________ +Modified: svn:ignore +## -1,3 +1,4 ## ++*.gz + install + src + .ignore.txt +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adolc +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adolc (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adolc (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/adolc +___________________________________________________________________ +Modified: svn:ignore +## -1,3 +1,4 ## ++*.gz + install* + src + configure.sh +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/h5py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/h5py (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/h5py (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/h5py +___________________________________________________________________ +Added: svn:ignore +## -0,0 +1,2 ## ++*.gz ++install +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages (revision 12721) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages (revision 12722) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages +___________________________________________________________________ +Modified: svn:ignore +## -1,2 +1,3 ## + MITgcm + OpenAD ++ivins Index: /issm/oecreview/Archive/12678-13393/ISSM-12722-12723.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12722-12723.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12722-12723.diff (revision 13394) @@ -0,0 +1,47 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh (revision 12723) +@@ -0,0 +1,36 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install petsc-3.3-p2 src ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/petsc-lite-3.3-p2.tar.gz' 'petsc-3.3-p2.tar.gz' ++ ++#Untar and move petsc to install directory ++tar -zxvf petsc-3.3-p2.tar.gz ++mv petsc-3.3-p2/* src/ ++rm -rf petsc-3.3-p2 ++ ++#configure ++cd src ++./config/configure.py \ ++ --prefix="$ISSM_DIR/externalpackages/petsc/install" \ ++ --with-mpi-dir=$ISSM_DIR/externalpackages/mpich2/install \ ++ --PETSC_ARCH=linux-gnu-amd64 \ ++ --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \ ++ --with-debugging=0 \ ++ --with-shared-libraries=0 \ ++ --download-mumps=yes \ ++ --download-scalapack=yes \ ++ --download-blacs=yes \ ++ --download-blas=yes \ ++ --download-f-blas-lapack=yes \ ++ --download-plapack=yes \ ++ --download-parmetis=yes \ ++ --download-metis=yes \ ++ --with-pic=1 ++ ++#Compile petsc and install it ++make ++make install + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/petsc/install-3.3-linux64.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* Index: /issm/oecreview/Archive/12678-13393/ISSM-12723-12724.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12723-12724.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12723-12724.diff (revision 13394) @@ -0,0 +1,95 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install.sh (revision 12723) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install.sh (revision 12724) +@@ -1,22 +0,0 @@ +-#!/bin/bash +-#http://www.mcs.anl.gov/research/projects/tao/download/index.html +-#wget http://www.mcs.anl.gov/research/projects/tao/download/tao-2.0-p3.tar.gz +- +-#Some cleanup +-rm -rf install tao-2.0-p3 +-mkdir install +- +-#Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tao-2.0-p3.tar.gz' 'tao-2.0-p3.tar.gz' +- +-#Untar +-tar -zxvf tao-2.0-p3.tar.gz +- +-#move into place +-mv tao-2.0-p3/* install/ +-rm -rf tao-2.0-p3 +-cd install +-export TAO_DIR="$ISSM_DIR/externalpackages/tao/install/" +- +-#petsc needs to be compiled with --with-clanguage=C++ +-make +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.0.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.0.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.0.sh (revision 12724) +@@ -0,0 +1,23 @@ ++#!/bin/bash ++#http://www.mcs.anl.gov/research/projects/tao/download/index.html ++ ++#Compatible with PETSc 3.2 ++ ++#Some cleanup ++rm -rf install tao-2.0-p3 ++mkdir install ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tao-2.0-p3.tar.gz' 'tao-2.0-p3.tar.gz' ++ ++#Untar ++tar -zxvf tao-2.0-p3.tar.gz ++ ++#move into place ++mv tao-2.0-p3/* install/ ++rm -rf tao-2.0-p3 ++cd install ++export TAO_DIR="$ISSM_DIR/externalpackages/tao/install/" ++ ++#petsc needs to be compiled with --with-clanguage=C++ ++make + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.0.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.1.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.1.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.1.sh (revision 12724) +@@ -0,0 +1,23 @@ ++#!/bin/bash ++#http://www.mcs.anl.gov/research/projects/tao/download/index.html ++ ++#compatible with PETSc 3.3 ++ ++#Some cleanup ++rm -rf install tao-2.1-p0 ++mkdir install ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/tao-2.1-p0.tar.gz' 'tao-2.1-p0.tar.gz' ++ ++#Untar ++tar -zxvf tao-2.1-p0.tar.gz ++ ++#move into place ++mv tao-2.1-p0/* install/ ++rm -rf tao-2.1-p0 ++cd install ++export TAO_DIR="$ISSM_DIR/externalpackages/tao/install/" ++ ++#petsc needs to be compiled with --with-clanguage=C++ ++make + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/tao/install-2.1.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* Index: /issm/oecreview/Archive/12678-13393/ISSM-12724-12725.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12724-12725.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12724-12725.diff (revision 13394) @@ -0,0 +1,27 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Bamg/Mesh.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12724) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12725) +@@ -5320,8 +5320,8 @@ + + int i; + for (i=0;i= maxnbv){ +- delete [] bcurve; + _error2_("too many vertices on geometry: " << NbVerticesOnGeomVertex << " >= " << maxnbv); + } + +@@ -5347,10 +5347,10 @@ + BamgVertex *bv = vog; + _assert_(gv->MeshVertexHook); // use of Geom -> Th + VertexOnBThVertex[NbVertexOnBThVertex++]=VertexOnVertex(gv->MeshVertexHook,bv); +- gv->MeshVertexHook->m = bv->m; // for taking the metrix of the background mesh ++ gv->MeshVertexHook->m = bv->m; // for taking the metric of the background mesh + } + } +- _assert_(NbVertexOnBThVertex==NbVerticesOnGeomVertex); ++ _assert_(NbVertexOnBThVertex==NbVerticesOnGeomVertex); /*This might be due to MaxCornerAngle too small*/ + + /*STEP 2: reseed boundary edges*/ + Index: /issm/oecreview/Archive/12678-13393/ISSM-12725-12726.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12725-12726.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12725-12726.diff (revision 13394) @@ -0,0 +1,24 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Observations.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Observations.cpp (revision 12725) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Observations.cpp (revision 12726) +@@ -41,7 +41,6 @@ + int xi,yi; + IssmDouble xmin,xmax,ymin,ymax; + IssmDouble offset,minlength,minspacing,mintrimming,maxtrimming; +- int *indices = NULL; + Observation *observation = NULL; + + /*Get extrema*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.h (revision 12725) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.h (revision 12726) +@@ -11,7 +11,6 @@ + #include "../EnumDefinitions/EnumDefinitions.h" + + /*forward declarations */ +- + class Elements; + class Loads; + class Nodes; Index: /issm/oecreview/Archive/12678-13393/ISSM-12726-12727.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12726-12727.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12726-12727.diff (revision 13394) @@ -0,0 +1,45 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 12726) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 12727) +@@ -95,6 +95,8 @@ + xDelete(gate.percent); + } + else if(strcmp(output,"idw")==0){ //Inverse distance weighting ++ double power; ++ options->Get(&power,"power",2.); + /*initialize thread parameters: */ + gate.n_interp = n_interp; + gate.x_interp = x_interp; +@@ -107,6 +109,7 @@ + gate.predictions = predictions; + gate.error = error; + gate.percent = xNewZeroInit(num); ++ gate.power = power; + + /*launch the thread manager with Krigingxt as a core: */ + LaunchThread(idwt,(void*)&gate,num); +@@ -269,10 +272,10 @@ + double *predictions = gate->predictions; + double *error = gate->error; + double *percent = gate->percent; ++ double power = gate->power; + + /*Intermediaries*/ + double localpercent; +- double power = 2.; + + /*partition loop across threads: */ + PartitionRange(&i0,&i1,n_interp,num_threads,my_thread); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.h (revision 12726) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.h (revision 12727) +@@ -28,6 +28,7 @@ + double *predictions; + double *error; + double *percent; ++ double power;//for idw + }KrigingxThreadStruct; + + void* Krigingxt(void*); Index: /issm/oecreview/Archive/12678-13393/ISSM-12727-12728.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12727-12728.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12727-12728.diff (revision 13394) @@ -0,0 +1,48 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 12727) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 12728) +@@ -19,6 +19,7 @@ + double* data_interp=NULL; + + /*Intermediary*/ ++ double xmin,xmax,ymin,ymax; + bool isdefault; + double defaultvalue; + R2 r; +@@ -56,9 +57,27 @@ + Th.TriangleReferenceList(reft); + Th.CreateSingleVertexToTriangleConnectivity(); + ++ /*Get domain boundaries*/ ++ xmin=x_data[0]; ymin=y_data[0]; ++ xmax=x_data[0]; ymax=y_data[0]; ++ for(i=1;ixmax) xmax=x_data[i]; ++ if(y_data[i]ymax) ymax=y_data[i]; ++ } ++ + /*Loop over output nodes*/ + for(i=0;ixmax || y_interp[i]ymax){ ++ for(j=0;j=100) _printLine_("\r interpolation progress: "<(reft); Index: /issm/oecreview/Archive/12678-13393/ISSM-12728-12729.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12728-12729.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12728-12729.diff (revision 13394) @@ -0,0 +1,56 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp (revision 12728) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp (revision 12729) +@@ -47,14 +47,14 @@ + if (strcmp(type,"mpiaij")==0){ + d_nz=0; + o_nz=0; +- #ifdef _HAVE_PETSCDEV_ ++ #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2 + MatCreateAIJ(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,d_nz,PETSC_NULL,o_nz,PETSC_NULL,&outmatrix); + #else + MatCreateMPIAIJ(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,d_nz,PETSC_NULL,o_nz,PETSC_NULL,&outmatrix); + #endif + } + else if (strcmp(type,"mpidense")==0){ +- #ifdef _HAVE_PETSCDEV_ ++ #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2 + MatCreateDense(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,PETSC_NULL,&outmatrix); + #else + MatCreateMPIDense(MPI_COMM_WORLD,PETSC_DETERMINE,PETSC_DETERMINE, 0,0,PETSC_NULL,&outmatrix); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 12728) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 12729) +@@ -89,7 +89,7 @@ + } + } + +-#ifdef _HAVE_PETSCDEV_ ++#if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2 + PetscTokenDestroy(&token); + #else + PetscTokenDestroy(token); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 12728) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 12729) +@@ -38,7 +38,7 @@ + d_nz=(int)((double)nnz/(double)M/2.0); //number of non zeros per row/2 + o_nz=(int)((double)nnz/(double)M/2.0); //number of non zeros per row/2 + +- #ifdef _HAVE_PETSCDEV_ ++ #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2 + MatCreateAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); + #else + MatCreateMPIAIJ(MPI_COMM_WORLD,m,n,M,N,d_nz,NULL,o_nz,NULL,&outmatrix); +@@ -66,7 +66,7 @@ + d_nz=(int)((double)nnz/(double)M/2.0); //number of non zeros per row/2 + o_nz=(int)((double)nnz/(double)M/2.0); //number of non zeros per row/2 + +- #ifdef _HAVE_PETSCDEV_ ++ #if _PETSC_MAJOR_ == 3 && _PETSC_MINOR_ > 2 + if(sparsity==1){ + MatCreateDense(MPI_COMM_WORLD,m,n,M,N,NULL,&outmatrix); + } Index: /issm/oecreview/Archive/12678-13393/ISSM-12729-12730.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12729-12730.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12729-12730.diff (revision 13394) @@ -0,0 +1,44 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh (revision 12730) +@@ -0,0 +1,33 @@ ++#!/bin/sh ++ ++#External packages versions: ++#petsc 3.3 ++#mpich 1.4 ++ ++./configure \ ++ --prefix=$ISSM_DIR \ ++ --with-matlab-dir=$MATLAB_DIR \ ++ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \ ++ --with-metis-dir=$ISSM_DIR/externalpackages/petsc/src/externalpackages/metis-5.0.2-p3 \ ++ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \ ++ --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \ ++ --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \ ++ --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \ ++ --with-petsc-arch=$ISSM_ARCH \ ++ --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \ ++ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \ ++ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \ ++ --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \ ++ --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \ ++ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \ ++ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \ ++ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \ ++ --with-scotch-dir="$ISSM_DIR/externalpackages/scotch/install" \ ++ --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \ ++ --with-shapelib-dir="$ISSM_DIR/externalpackages/shapelib/install" \ ++ --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" \ ++ --with-graphics-lib=/usr/lib64/libX11.so \ ++ --with-cxxoptflags="-march=opteron -O2" \ ++ --with-numthreads=16 \ ++ --enable-debugging ++ #--with-serial=no \ + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* Index: /issm/oecreview/Archive/12678-13393/ISSM-12730-12731.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12730-12731.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12730-12731.diff (revision 13394) @@ -0,0 +1,15 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp (revision 12730) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp (revision 12731) +@@ -54,6 +54,10 @@ + METIS_PartMeshNodal(pnumberofelements,pnumberofnodes, eptr, index, + NULL, NULL, pnum_procs, tpwgts, options, &objval,epart, npart); + ++ /*clean-up*/ ++ xDelete(eptr); ++ xDelete(tpwgts); ++ + #else + _error2_("METIS version not supported yet"); + #endif Index: /issm/oecreview/Archive/12678-13393/ISSM-12731-12732.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12731-12732.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12731-12732.diff (revision 13394) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/plot/plot_gridded.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/plot/plot_gridded.m (revision 12731) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/plot/plot_gridded.m (revision 12732) +@@ -49,7 +49,7 @@ + data_grid(isnan(data_grid))=white; + + %Select plot area +-subplot(plotlines,plotcols,i); ++subplotmodel(plotlines,plotcols,i,options); + + %shading interp; + h=imagesc(xlim,ylim,data_grid);set(gca,'YDir','normal'); Index: /issm/oecreview/Archive/12678-13393/ISSM-12732-12733.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12732-12733.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12732-12733.diff (revision 13394) @@ -0,0 +1,522 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.m (revision 12732) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.m (revision 12733) +@@ -171,7 +171,7 @@ + end + % }}} + function result=ReadDataDimensions(fid) % {{{ +-%READDATA - read data dimensions, step and time, but not the data itself. ++%READDATADIMENSIONS - read data dimensions, step and time, but not the data itself. + % + % Usage: + % field=ReadDataDimensions(fid) +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/marshall.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/marshall.py (revision 12732) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/marshall.py (revision 12733) +@@ -15,10 +15,9 @@ + + #open file for binary writing + try: +- fid=open(md.miscellaneous.name+'.bin','wb'); ++ fid=open(md.miscellaneous.name+'.bin','wb') + except IOError as e: +- print "marshall error message: could not open '%s.bin' file for binary writing." % md.miscellaneous.name +- raise IOError(e) ++ raise IOError("marshall error message: could not open '%s.bin' file for binary writing." % md.miscellaneous.name) + + #First, write MaximumNumberOfEnum to make sure that the Enums are synchronized + WriteData(fid,'enum',MaximumNumberOfEnums(),'data',true,'format','Boolean') +@@ -44,6 +43,5 @@ + try: + f.close(fid) + except IOError as e: +- print "marshall error message: could not close file '%s.bin'." % md.miscellaneous.name +- raise IOError(e) ++ raise IOError("marshall error message: could not close file '%s.bin'." % md.miscellaneous.name) + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.py (revision 12733) +@@ -0,0 +1,20 @@ ++""" ++PROCESSPATCH - create a structure from a patch ++ ++ Usage: ++ Result=ProcessPatch(Result); ++""" ++ ++def MatlabProcessPatch(structure): ++ ++ #loop over steps ++ for structurei in structure.itervalues(): ++ ++ #return if there is no field Patch ++ if not 'Patch' in structurei: ++ continue ++ ++ raise SystemError("MatlabProcessPatch not implemented in Python.") ++ ++ return structure ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromdisk.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromdisk.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromdisk.py (revision 12733) +@@ -0,0 +1,61 @@ ++""" ++LOADRESULTSFROMDISK - load results of solution sequence from disk file "filename" ++ ++ Usage: ++ md=loadresultsfromdisk(md=False,filename=False); ++""" ++ ++import os ++ ++def loadresultsfromdisk(md,filename): ++ ++ #check number of inputs/outputs ++ if not md or not filename: ++ raise ValueError("loadresultsfromdisk: error message.") ++ ++ if not md.qmu.isdakota: ++ ++ #Check that file exists ++ if not os.path.exists(filename): ++ raise ValueError("binary file '%s' not found." % filename) ++ ++ #initialize md.results if not a structure yet ++ if not isinstance(md.results,dict): ++ md.results={} ++ ++ #load results onto model ++ structure=parseresultsfromdisk(filename,~md.settings.io_gather) ++ if not len(structure): ++ raise RuntimeError("No result found in binary file '%s'. Check for solution crash." % filename) ++ end ++ md.results[structure[1]['SolutionType']]=structure; ++ ++ #recover solution_type from results ++ md.private.solution=structure[1]['SolutionType'] ++ ++ #read log files onto fields ++ if os.path.exists(md.miscellaneous.name+'.errlog'): ++ with open(md.miscellaneous.name+'.errlog','r') as f: ++ md.results[structure[1]['SolutionType']]['errlog']=[line[:-1] for line in f] ++ else: ++ md.results[structure[1]['SolutionType']]['errlog']=[] ++ ++ if os.path.exists(md.miscellaneous.name+'.outlog'): ++ with open(md.miscellaneous.name+'.outlog','r') as f: ++ md.results[structure[1]['SolutionType']]['outlog']=[line[:-1] for line in f] ++ else: ++ md.results[structure[1]['SolutionType']]['outlog']=[] ++ ++ if len(md.results[structure[1]['SolutionType']]['errlog']): ++ print ("loadresultsfromcluster info message: error during solution. Check your errlog and outlog model fields.") ++ ++ #post processes qmu results if necessary ++ else: ++ ++ if not isinstance(md.private.solution,str): ++ md.private.solution=EnumToString(md.private.solution) ++ md=postqmu(md) ++ os.chdir('..') ++ ++ return md ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromcluster.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromcluster.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/loadresultsfromcluster.py (revision 12733) +@@ -0,0 +1,62 @@ ++""" ++LOADRESULTSFROMCLUSTER - load results of solution sequence from cluster ++ ++ Usage: ++ md=loadresultsfromcluster(md,runtimename); ++""" ++ ++import os ++import platform ++import socket ++from MatlabFuncs import * ++ ++def loadresultsfromcluster(md,runtimename=False): ++ ++ #retrieve cluster, to be able to call its methods ++ cluster=md.cluster ++ ++ if runtimename: ++ md.private.runtimename=runtimename ++ end ++ ++ #Download outputs from the cluster ++ filelist=[md.miscellaneous.name+'.outlog',md.miscellaneous.name+'.errlog'] ++ if md.qmu.isdakota: ++ filelist.append(md.miscellaneous.name+'.qmu.err') ++ filelist.append(md.miscellaneous.name+'.qmu.out') ++ if 'tabular_graphics_data' in md.qmu.params: ++ if md.qmu.params['tabular_graphics_data']: ++ filelist.append('dakota_tabular.dat') ++ filelist.append(md.miscellaneous.name+'.outbin') ++ Download(cluster,md.private.runtimename,filelist) ++ ++ #If we are here, no errors in the solution sequence, call loadresultsfromdisk. ++ md=loadresultsfromdisk(md,md.miscellaneous.name+'.outbin') ++ ++ #erase the log and output files ++ if md.qmu.isdakota: ++ os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.outlog')) ++ os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.errlog')) ++ else: ++ os.remove(md.miscellaneous.name+'.outlog') ++ os.remove(md.miscellaneous.name+'.errlog') ++ os.remove(md.miscellaneous.name+'.outbin') ++ if not 'Windows' in platform.system(): ++ os.remove(md.private.runtimename+'.tar.gz') ++ ++ #erase input file if run was carried out on same platform. ++ hostname=socket.gethostname().lower().split('.')[0] ++ if strcmpi(hostname,cluster.name): ++ if md.qmu.isdakota: ++ os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.bin')) ++ os.remove(os.path.join('qmu'+str(os.getpid()),md.miscellaneous.name+'.queue')) ++ else: ++ os.remove(md.miscellaneous.name+'.bin') ++ os.remove(md.miscellaneous.name+'.petsc') ++ if not 'Windows' in platform.system(): ++ os.remove(md.miscellaneous.name+'.queue') ++ else: ++ os.remove(md.miscellaneous.name+'.bat') ++ ++ return md ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/parseresultsfromdisk.py (revision 12733) +@@ -0,0 +1,235 @@ ++import struct ++import numpy ++from MatlabFuncs import * ++from MatlabProcessPatch import * ++ ++def parseresultsfromdisk(filename,iosplit): ++ """ ++ PARSERESULTSFROMDISK - ... ++ ++ Usage: ++ results=parseresultsfromdisk(filename,iosplit) ++ """ ++ ++ if iosplit: ++ results=parseresultsfromdiskiosplit(filename) ++ else: ++ results=parseresultsfromdiskioserial(filename) ++ ++ #process patch if necessary ++ results=MatlabProcessPatch(results) ++ ++ return results ++ ++def parseresultsfromdiskioserial(filename): # {{{ ++ """ ++ PARSERESULTSFROMDISK - ... ++ ++ Usage: ++ results=parseresultsfromdiskioserial(filename) ++ """ ++ ++ #Open file ++ try: ++ fid=open(filename,'rb') ++ except IOError as e: ++ raise IOError("loadresultsfromdisk error message: could not open '%s' for binary reading." % filename) ++ ++ results={} ++ ++ #Read fields until the end of the file. ++ result=ReadData(fid) ++ while result: ++ #Get time and step ++ if not result['step'] in results: ++ results[result['step']]={} ++ results[result['step']]['step']=result['step'] ++ results[result['step']]['time']=result['time'] ++ ++ #Add result ++ if result['step'] in results and \ ++ result['fieldname'] in results[result['step']] and \ ++ not strcmp(result['fieldname'],'SolutionType'): ++ results[result['step']][result['fieldname']]=numpy.concatenate((results[result['step']][result['fieldname']],result['field']),axis=0) ++ else: ++ results[result['step']][result['fieldname']]=result['field'] ++ ++ #read next result ++ result=ReadData(fid) ++ ++ fid.close() ++ ++ return results ++ # }}} ++ ++def parseresultsfromdiskiosplit(filename): # {{{ ++ """ ++ PARSERESULTSFROMDISKIOSPLIT - ... ++ ++ Usage: ++ results=parseresultsfromdiskiosplit(filename) ++ """ ++ ++ #Open file ++ try: ++ fid=open(filename,'rb') ++ except IOError as e: ++ raise IOError("loadresultsfromdisk error message: could not open '%s' for binary reading." % filename) ++ ++ results={} ++ ++ #if we have done split I/O, ie, we have results that are fragmented across patches, ++ #do a first pass, and figure out the structure of results ++ result=ReadDataDimensions(fid) ++ while result: ++ ++ #Get time and step ++ if not result['step'] in results: ++ results[result['step']]={} ++ results[result['step']]['step']=result['step'] ++ results[result['step']]['time']=result['time'] ++ ++ #Add result ++ if strcmpi(result['fieldname'],'Patch'): ++ results[result['step']][result['fieldname']]=[0,result['N']] ++ else: ++ results[result['step']][result['fieldname']]=float('NaN') ++ ++ #read next result ++ result=ReadDataDimensions(fid) ++ ++ #do a second pass, and figure out the size of the patches ++ fid.seek(0) #rewind ++ result=ReadDataDimensions(fid) ++ while result: ++ ++ #Add result ++ if strcmpi(result['fieldname'],'Patch'): ++ patchdimensions=results[result['step']][result['fieldname']] ++ results[result['step']][result['fieldname']]=[patchdimensions[0]+result['M'],result['N']] ++ ++ #read next result ++ result=ReadDataDimensions(fid) ++ ++ #allocate patches ++ for result in results.itervalues(): ++ if 'Patch' in result: ++ result['Patch']=numpy.zeros(shape=(result['Patch'][0],result['Patch'][1]),dtype=float) ++ result['counter']=0 #use to index into the patch ++ ++ #third pass, this time to read the real information ++ fid.seek(0) #rewind ++ result=ReadData(fid) ++ while result: ++ ++ #Get time and step ++ if not result['step'] in results: ++ results[result['step']]={} ++ results[result['step']]['step']=result['step'] ++ results[result['step']]['time']=result['time'] ++ ++ #Add result ++ if strcmpi(result['fieldname'],'Patch'): ++ counter=results[result['step']]['counter'] ++ counter2=counter+result['field'].shape[0]-1 ++ results[result['step']][result['fieldname']][counter:counter2,:]=result['field'] ++ ++ #increment counter: ++ results[result['step']]['counter']=counter2+1 ++ else: ++ results[result['step']][result['fieldname']]=result['field'] ++ ++ #read next result ++ result=ReadData(fid) ++ ++ #close file ++ fid.close() ++ ++ return results ++ # }}} ++ ++def ReadData(fid): # {{{ ++ """ ++ READDATA - ... ++ ++ Usage: ++ field=ReadData(fid) ++ """ ++ ++ #read field ++ try: ++ length=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ ++ fieldname=struct.unpack('%ds' % length,fid.read(length))[0][:-1] ++ time=struct.unpack('d',fid.read(struct.calcsize('d')))[0] ++ step=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ ++ type=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ M=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ if type==1: ++ field=numpy.array(struct.unpack('%dd' % M,fid.read(M*struct.calcsize('d'))),dtype=float) ++ elif type==2: ++ field=struct.unpack('%ds' % M,fid.read(M))[0][:-1] ++ elif type==3: ++ N=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++# field=transpose(fread(fid,[N M],'double')); ++ field=numpy.zeros(shape=(M,N),dtype=float) ++ for i in xrange(M): ++ field[i,:]=struct.unpack('%dd' % N,fid.read(N*struct.calcsize('d'))) ++ else: ++ raise TypeError("cannot read data of type %d" % type) ++ ++ result={} ++ result['fieldname']=fieldname ++ result['time']=time ++ result['step']=step ++ result['field']=field ++ ++ except struct.error as e: ++ result={} ++ ++ return result ++ # }}} ++ ++def ReadDataDimensions(fid): # {{{ ++ """ ++ READDATADIMENSIONS - read data dimensions, step and time, but not the data itself. ++ ++ Usage: ++ field=ReadDataDimensions(fid) ++ """ ++ ++ #read field ++ try: ++ length=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ ++ fieldname=struct.unpack('%ds' % length,fid.read(length))[0][:-1] ++ time=struct.unpack('d',fid.read(struct.calcsize('d')))[0] ++ step=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ ++ type=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ M=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ N=1 #default ++ if type==1: ++ fid.seek(M*8,1) ++ elif type==2: ++ fid.seek(M,1) ++ elif type==3: ++ N=struct.unpack('i',fid.read(struct.calcsize('i')))[0] ++ fid.seek(N*M*8,1) ++ else: ++ raise TypeError("cannot read data of type %d" % type) ++ ++ result={} ++ result['fieldname']=fieldname ++ result['time']=time ++ result['step']=step ++ result['M']=M ++ result['N']=N ++ ++ except struct.error as e: ++ result={} ++ ++ return result ++ # }}} ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.m (revision 12732) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/MatlabProcessPatch.m (revision 12733) +@@ -4,7 +4,7 @@ + % Usage: + % Result=ProcessPatch(Result); + +-%return if there is no fiel Patch ++%return if there is no field Patch + if (~isfield(structure,'Patch')), + return; + end +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py (revision 12733) +@@ -0,0 +1,38 @@ ++""" ++%ISPETSC - figure out if PETSC package was compiled with ISSM ++% ++% Usage: ++% flag=ispetsc(); ++""" ++ ++import os ++from issmdir import * ++from MatlabFuncs import * ++ ++def ispetsc(): ++ ++ configfile=os.path.join(issmdir(),'bin','config.h') #should find it in the install target ++ if not os.path.exists(configfile): ++ raise RuntimeError("File '%s' not found. ISSM has not been configured yet!" % configfile) ++ ++ #go through the file, and recover the line we want ++ flag=2 ++ try: ++ fid=open(configfile,'r') ++ except IOError as e: ++ print "could not open file: '%s'" % configfile ++ raise IOError(e) ++ ++ for tline in fid: ++ if strncmp(tline,'/* #undef _HAVE_PETSC_ */',25): ++ flag=0 ++ break ++ if strncmp(tline,'#define _HAVE_PETSC_',20): ++ flag=1 ++ break ++ ++ fid.close() ++ if flag==2: ++ raise RuntimeError("could not determine whether PETSC was or was not compiled.") ++ ++ return flag +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Shell/issmdir.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Shell/issmdir.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Shell/issmdir.py (revision 12733) +@@ -0,0 +1,25 @@ ++""" ++ISSMDIR - Get ISSM_DIR environment variable ++ ++ Usage: ++ ISSM_DIR=issmdir() ++""" ++ ++import platform ++import os ++from MatlabFuncs import * ++ ++def issmdir(): ++ ++ if not 'Windows' in platform.system(): ++ ISSM_DIR =os.environ['ISSM_DIR'] ++ else: ++ ISSM_DIR =os.environ['ISSM_DIR_WIN'] ++ if strcmpi(ISSM_DIR[-1],'/') or strcmpi(ISSM_DIR[-1],'\\'): ++ ISSM_DIR = ISSM_DIR[:-1] #shave off the last '/' ++ ++ if not ISSM_DIR: ++ raise RuntimeError("issmdir error message: 'ISSM_DIR' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!") ++ ++ return ISSM_DIR ++ Index: /issm/oecreview/Archive/12678-13393/ISSM-12733-12734.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12733-12734.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12733-12734.diff (revision 13394) @@ -0,0 +1,117 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patch/pyport.h.patch +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patch/pyport.h.patch (revision 12733) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patch/pyport.h.patch (revision 12734) +@@ -1,42 +0,0 @@ +-Index: Include/pyport.h +-=================================================================== +---- Include/pyport.h (revision 933) +-+++ Include/pyport.h (working copy) +-@@ -514,22 +514,40 @@ +-#if __FreeBSD_version > 500039 +-#include +-#include +-+/* If the source file #includes before "Python.h" then +-+ * these macros will not be defined at this point and we +-+ * should not define them either. +-+ */ +-+#ifdef isalnum +-#undef isalnum +-#define isalnum(c) iswalnum(btowc(c)) +-+#endif +-+#ifdef isalpha +-#undef isalpha +-#define isalpha(c) iswalpha(btowc(c)) +-+#endif +-+#ifdef islower +-#undef islower +-#define islower(c) iswlower(btowc(c)) +-+#endif +-+#ifdef isspace +-#undef isspace +-#define isspace(c) iswspace(btowc(c)) +-+#endif +-+#ifdef isupper +-#undef isupper +-#define isupper(c) iswupper(btowc(c)) +-+#endif +-+#ifdef tolower +-#undef tolower +-#define tolower(c) towlower(btowc(c)) +-+#endif +-+#ifdef toupper +-#undef toupper +-#define toupper(c) towupper(btowc(c)) +-#endif +-#endif +-+#endif +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patch/pyport.h.patch.bugreport +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patch/pyport.h.patch.bugreport (revision 12733) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patch/pyport.h.patch.bugreport (revision 12734) +@@ -1 +0,0 @@ +-http://bugs.python.org/issue10910 +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh (revision 12733) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh (revision 12734) +@@ -1,6 +1,5 @@ + #!/bin/bash + #wget http://python.org/ftp/python/version/Python-version.tgz +- + #version=3.2.2 + version=2.7.2 + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patches/pyport.h.patch +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patches/pyport.h.patch (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patches/pyport.h.patch (revision 12734) +@@ -0,0 +1,42 @@ ++Index: Include/pyport.h ++=================================================================== ++--- Include/pyport.h (revision 933) +++++ Include/pyport.h (working copy) ++@@ -514,22 +514,40 @@ ++#if __FreeBSD_version > 500039 ++#include ++#include +++/* If the source file #includes before "Python.h" then +++ * these macros will not be defined at this point and we +++ * should not define them either. +++ */ +++#ifdef isalnum ++#undef isalnum ++#define isalnum(c) iswalnum(btowc(c)) +++#endif +++#ifdef isalpha ++#undef isalpha ++#define isalpha(c) iswalpha(btowc(c)) +++#endif +++#ifdef islower ++#undef islower ++#define islower(c) iswlower(btowc(c)) +++#endif +++#ifdef isspace ++#undef isspace ++#define isspace(c) iswspace(btowc(c)) +++#endif +++#ifdef isupper ++#undef isupper ++#define isupper(c) iswupper(btowc(c)) +++#endif +++#ifdef tolower ++#undef tolower ++#define tolower(c) towlower(btowc(c)) +++#endif +++#ifdef toupper ++#undef toupper ++#define toupper(c) towupper(btowc(c)) ++#endif ++#endif +++#endif +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patches/pyport.h.patch.bugreport +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patches/pyport.h.patch.bugreport (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/patches/pyport.h.patch.bugreport (revision 12734) +@@ -0,0 +1 @@ ++http://bugs.python.org/issue10910 Index: /issm/oecreview/Archive/12678-13393/ISSM-12734-12735.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12734-12735.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12734-12735.diff (revision 13394) @@ -0,0 +1,469 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-snowleopard.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-snowleopard.sh (revision 12734) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-snowleopard.sh (revision 12735) +@@ -1,56 +0,0 @@ +-#!/bin/bash +-#wget http://python.org/ftp/python/version/Python-version.tgz +- +-#version=3.2.2 +-version=2.7.2 +- +-#Some cleanup +-rm -rf install src +-rm -rf Python-$version +-mkdir install src +- +-#Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-$version.tgz Python-$version.tgz +- +-#exports +-export CC +-export MACOSX_DEPLOYMENT_TARGET=10.6 +- +-#Untar and move python into install directory +-tar -zxvf Python-$version.tgz +-mv Python-$version/* src +-rm -rf Python-$version +- +-#Configure doxygen +-cd src +-# --enable-framework needs to have the form "$SOME_PATH/Library/Frameworks" to avoid installing components in /Applications directory +-# --prefix is recognized as $SOME_PATH as long as this form is taken, so it's not necessary to include +-./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" +- +-#make +-if [ -z $1 ]; then +- make +-else +- make -j $1 +-fi +-make install +- +-#Some modifications to be done in case version is 3.2: +-if [[ $version == "3.2.2" ]]; then +- cd install/bin +- ln -s python3.2 python +- cd ../ +- ln -s Python.framework/Versions/3.2/include/python3.2m include +- ln -s Python.framework/Versions/3.2/lib/ lib +-fi +- +-#Some modifications to be done in case version is 2.7 +-if [[ $version == "2.7.2" ]]; then +- cd ../install +- ln -s Library/Frameworks/Python.framework/Headers include +- ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib +- +- #Patch pyport.h: +- cd include +- patch pyport.h ../patch/pyport.h.patch +-fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh (revision 12734) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-macosx-lion.sh (revision 12735) +@@ -1,54 +0,0 @@ +-#!/bin/bash +-#wget http://python.org/ftp/python/version/Python-version.tgz +-#version=3.2.2 +-version=2.7.2 +- +-#Some cleanup +-rm -rf install src +-rm -rf Python-$version +-mkdir install src +- +-#Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-$version.tgz Python-$version.tgz +- +-#exports +-export CC +- +-#Untar and move python into install directory +-tar -zxvf Python-$version.tgz +-mv Python-$version/* src +-rm -rf Python-$version +- +-#Configure doxygen +-cd src +-./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" +-#obsolete? +-#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" +- +-#make +-if [ -z $1 ]; then +- make +-else +- make -j $1 +-fi +-make install +- +-#Some modifications to be done in case version is 3.2: +-if [[ $version == "3.2.2" ]]; then +- cd install/bin +- ln -s python3.2 python +- cd ../ +- ln -s Python.framework/Versions/3.2/include/python3.2m include +- ln -s Python.framework/Versions/3.2/lib/ lib +-fi +- +-#Some modifications to be done in case version is 2.7 +-if [[ $version == "2.7.2" ]]; then +- cd ../install +- ln -s Library/Frameworks/Python.framework/Headers include +- ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib +- +- #Patch pyport.h: +- cd include +- patch pyport.h ../patch/pyport.h.patch +-fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-linux64-astrid.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-linux64-astrid.sh (revision 12734) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-linux64-astrid.sh (revision 12735) +@@ -1,48 +0,0 @@ +-#!/bin/bash +-#wget http://python.org/ftp/python/version/Python-version.tgz +- +-#version=3.2.2 +-version=2.7.2 +- +-#Some cleanup +-rm -rf install src +-rm -rf Python-$version +-mkdir install src +- +-#Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-$version.tgz Python-$version.tgz +- +-#exports +-export CC +- +-#Untar and move python into install directory +-tar -zxvf Python-$version.tgz +-mv Python-$version/* src +-rm -rf Python-$version +- +-#Configure python +-cd src +-./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-shared +- +-if [ -z $1 ]; then +- make +-else +- make -j $1 +-fi +-make install +- +-#Some modifications to be done in case version is 3.2: +-if [[ $version == "3.2.2" ]]; then +- cd ../install/bin +- ln -s python3.2 python +- cd ../ +- ln -s Python.framework/Versions/3.2/include/python3.2m include +- ln -s Python.framework/Versions/3.2/lib/ lib +-fi +-if [[ $version == "2.7.2" ]]; then +- cd ../install/include +- cp python2.7/* ./ +- cd ../lib +- ln -s libpython2.7.so.1.0 libpython.so +- +-fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh (revision 12735) +@@ -0,0 +1,39 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src ++rm -rf Python-3.2.2 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-3.2.2.tgz Python-3.2.2.tgz ++ ++#exports ++export CC ++export MACOSX_DEPLOYMENT_TARGET=10.6 ++ ++#Untar and move python into install directory ++tar -zxvf Python-3.2.2.tgz ++mv Python-3.2.2/* src ++rm -rf Python-3.2.2 ++ ++#Configure doxygen ++cd src ++# --enable-framework needs to have the form "$SOME_PATH/Library/Frameworks" to avoid installing components in /Applications directory ++# --prefix is recognized as $SOME_PATH as long as this form is taken, so it's not necessary to include ++./configure \ ++ --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" ++ ++#make ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install ++ ++cd install/bin ++ln -s python3.2 python ++cd ../ ++ln -s Python.framework/Versions/3.2/include/python3.2m include ++ln -s Python.framework/Versions/3.2/lib/ lib + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh (revision 12735) +@@ -0,0 +1,40 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src ++rm -rf Python-2.7.2 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-2.7.2.tgz Python-2.7.2.tgz ++ ++#exports ++export CC ++export MACOSX_DEPLOYMENT_TARGET=10.6 ++ ++#Untar and move python into install directory ++tar -zxvf Python-2.7.2.tgz ++mv Python-2.7.2/* src ++rm -rf Python-2.7.2 ++ ++#Configure doxygen ++cd src ++# --enable-framework needs to have the form "$SOME_PATH/Library/Frameworks" to avoid installing components in /Applications directory ++# --prefix is recognized as $SOME_PATH as long as this form is taken, so it's not necessary to include ++./configure --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" ++ ++#make ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install ++ ++cd ../install ++ln -s Library/Frameworks/Python.framework/Headers include ++ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib ++ ++#Patch pyport.h: ++cd include ++patch pyport.h ../patch/pyport.h.patch + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh (revision 12735) +@@ -0,0 +1,36 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src ++rm -rf Python-3.2.2 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-3.2.2.tgz Python-3.2.2.tgz ++ ++#exports ++export CC ++ ++#Untar and move python into install directory ++tar -zxvf Python-3.2.2.tgz ++mv Python-3.2.2/* src ++rm -rf Python-3.2.2 ++ ++#Configure python ++cd src ++./configure \ ++ --prefix="$ISSM_DIR/externalpackages/python/install" \ ++ --enable-shared ++ ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install ++ ++cd ../install/bin ++ln -s python3.2 python ++cd ../ ++ln -s Python.framework/Versions/3.2/include/python3.2m include ++ln -s Python.framework/Versions/3.2/lib/ lib + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh (revision 12735) +@@ -0,0 +1,39 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src ++rm -rf Python-3.2.2 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-3.2.2.tgz Python-3.2.2.tgz ++ ++#exports ++export CC ++ ++#Untar and move python into install directory ++tar -zxvf Python-3.2.2.tgz ++mv Python-3.2.2/* src ++rm -rf Python-3.2.2 ++ ++#Configure doxygen ++cd src ++./configure \ ++ --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" ++ ++#obsolete? ++#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" ++ ++#make ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install ++ ++cd install/bin ++ln -s python3.2 python ++cd ../ ++ln -s Python.framework/Versions/3.2/include/python3.2m include ++ln -s Python.framework/Versions/3.2/lib/ lib + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh (revision 12735) +@@ -0,0 +1,35 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src ++rm -rf Python-2.7.2 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-2.7.2.tgz Python-2.7.2.tgz ++ ++#exports ++export CC ++ ++#Untar and move python into install directory ++tar -zxvf Python-2.7.2.tgz ++mv Python-2.7.2/* src ++rm -rf Python-2.7.2 ++ ++#Configure python ++cd src ++./configure \ ++ --prefix="$ISSM_DIR/externalpackages/python/install" \ ++ --enable-shared ++ ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install ++ ++cd ../install/include ++cp python2.7/* ./ ++cd ../lib ++ln -s libpython2.7.so.1.0 libpython.so + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh (revision 12735) +@@ -0,0 +1,41 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf install src ++rm -rf Python-2.7.2 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py http://issm.jpl.nasa.gov/files/externalpackages/Python-2.7.2.tgz Python-2.7.2.tgz ++ ++#exports ++export CC ++ ++#Untar and move python into install directory ++tar -zxvf Python-2.7.2.tgz ++mv Python-2.7.2/* src ++rm -rf Python-2.7.2 ++ ++#Configure doxygen ++cd src ++./configure \ ++ --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" ++ ++#obsolete? ++#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install" ++ ++#make ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install ++ ++cd ../install ++ln -s Library/Frameworks/Python.framework/Headers include ++ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib ++ ++#Patch pyport.h: ++cd include ++patch pyport.h ../patch/pyport.h.patch + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* Index: /issm/oecreview/Archive/12678-13393/ISSM-12735-12736.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12735-12736.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12735-12736.diff (revision 13394) @@ -0,0 +1,114 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install.sh (revision 12735) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install.sh (revision 12736) +@@ -1,35 +0,0 @@ +-#!/bin/bash +- +-version=4.0.1 +-#version=4.2 +- +-#for versions 4.2, you need hdf5 compiled, as well as doxygen for the +-#documentation! +- +-#Some cleanup +-rm -rf src install netcdf-$version +-mkdir install src +- +-#Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/netcdf-$version.tar.gz" "netcdf-$version.tar.gz" +- +-#Untar +-tar -zxvf netcdf-$version.tar.gz +- +-#Move netcdf to install directory +-rm -rf src/* +-mv netcdf-$version/* src/ +-rm -rf netcdf-$version +- +-#Configure and compile +-cd src +- +-#version dependent: +-./configure --prefix="$ISSM_DIR/externalpackages/netcdf/install" +- +-if [ -z $1 ]; then +- make +-else +- make -j $1 +-fi +-make install +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.2.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.2.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.2.sh (revision 12736) +@@ -0,0 +1,28 @@ ++#!/bin/bash ++ ++#you need hdf5 compiled, as well as doxygen for the documentation ++ ++#Some cleanup ++rm -rf src install netcdf-4.2 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/netcdf-4.2.tar.gz" "netcdf-4.2.tar.gz" ++ ++#Untar ++tar -zxvf netcdf-4.2.tar.gz ++ ++#Move netcdf to install directory ++rm -rf src/* ++mv netcdf-4.2/* src/ ++rm -rf netcdf-4.2 ++ ++#Configure and compile ++cd src ++./configure --prefix="$ISSM_DIR/externalpackages/netcdf/install" ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.2.sh +___________________________________________________________________ +Added: svn:executable +## -0,0 +1 ## ++* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.0.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.0.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.0.sh (revision 12736) +@@ -0,0 +1,26 @@ ++#!/bin/bash ++ ++#Some cleanup ++rm -rf src install netcdf-4.0.1 ++mkdir install src ++ ++#Download from ISSM server ++$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/netcdf-4.0.1.tar.gz" "netcdf-4.0.1.tar.gz" ++ ++#Untar ++tar -zxvf netcdf-4.0.1.tar.gz ++ ++#Move netcdf to install directory ++rm -rf src/* ++mv netcdf-4.0.1/* src/ ++rm -rf netcdf-4.0.1 ++ ++#Configure and compile ++cd src ++./configure --prefix="$ISSM_DIR/externalpackages/netcdf/install" ++if [ -z $1 ]; then ++ make ++else ++ make -j $1 ++fi ++make install + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/netcdf/install-4.0.sh +___________________________________________________________________ +Added: svn:executable Index: /issm/oecreview/Archive/12678-13393/ISSM-12736-12737.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12736-12737.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12736-12737.diff (revision 13394) @@ -0,0 +1,36 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh (revision 12736) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/octave/install.sh (revision 12737) +@@ -1,23 +1,24 @@ + #!/bin/bash + + #Some cleanup +-version=3.6.1 +-rm -rf src install octave-$version ++rm -rf src install octave-3.6.2 + mkdir install src + + #Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/octave-$version.tar.gz" "octave-$version.tar.gz" ++$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/octave-3.6.2.tar.gz" "octave-3.6.2.tar.gz" + + #Untar +-tar -zxvf octave-$version.tar.gz ++tar -zxvf octave-3.6.2.tar.gz + + #Move octave into install directory +-mv octave-$version/* src +-rm -rf octave-$version ++mv octave-3.6.2/* src ++rm -rf octave-3.6.2 + + #install + cd src +-./configure --prefix=$ISSM_DIR/externalpackages/octave/install --disable-readline ++./configure \ ++ --prefix=$ISSM_DIR/externalpackages/octave/install \ ++ --disable-readline + + if [ -z $NUMCPUS ]; + then Index: /issm/oecreview/Archive/12678-13393/ISSM-12737-12738.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12737-12738.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12737-12738.diff (revision 13394) @@ -0,0 +1,4614 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/libtool.m4 +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/libtool.m4 (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/libtool.m4 (revision 12738) +@@ -1,7 +1,8 @@ + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software ++# Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +@@ -10,7 +11,8 @@ + + m4_define([_LT_COPYING], [dnl + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software ++# Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -37,7 +39,7 @@ + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ]) + +-# serial 56 LT_INIT ++# serial 57 LT_INIT + + + # LT_PREREQ(VERSION) +@@ -66,6 +68,7 @@ + # ------------------ + AC_DEFUN([LT_INIT], + [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl + AC_BEFORE([$0], [LT_LANG])dnl + AC_BEFORE([$0], [LT_OUTPUT])dnl + AC_BEFORE([$0], [LTDL_INIT])dnl +@@ -82,6 +85,8 @@ + AC_REQUIRE([LTOBSOLETE_VERSION])dnl + m4_require([_LT_PROG_LTMAIN])dnl + ++_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) ++ + dnl Parse OPTIONS + _LT_SET_OPTIONS([$0], [$1]) + +@@ -118,7 +123,7 @@ + *) break;; + esac + done +-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + ]) + + +@@ -138,6 +143,11 @@ + m4_defun([_LT_SETUP], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl ++ ++_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl ++dnl + _LT_DECL([], [host_alias], [0], [The host system])dnl + _LT_DECL([], [host], [0])dnl + _LT_DECL([], [host_os], [0])dnl +@@ -160,10 +170,13 @@ + dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl + m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_WITH_SYSROOT])dnl + + _LT_CONFIG_LIBTOOL_INIT([ + # See if we are running on zsh, and set the options which allow our +@@ -179,7 +192,6 @@ + _LT_CHECK_OBJDIR + + m4_require([_LT_TAG_COMPILER])dnl +-_LT_PROG_ECHO_BACKSLASH + + case $host_os in + aix3*) +@@ -193,23 +205,6 @@ + ;; + esac + +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' +- +-# Same as above, but do not quote variable references. +-double_quote_subst='s/\([["`\\]]\)/\\\1/g' +- +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +- +-# Sed substitution to delay expansion of an escaped single quote. +-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- + # Global variables: + ofile=libtool + can_build_shared=yes +@@ -250,6 +245,28 @@ + ])# _LT_SETUP + + ++# _LT_PREPARE_SED_QUOTE_VARS ++# -------------------------- ++# Define a few sed substitution that help us do robust quoting. ++m4_defun([_LT_PREPARE_SED_QUOTE_VARS], ++[# Backslashify metacharacters that are still active within ++# double-quoted strings. ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++]) ++ + # _LT_PROG_LTMAIN + # --------------- + # Note that this code is called both from `configure', and `config.status' +@@ -408,7 +425,7 @@ + # declaration there will have the same value as in `configure'. VARNAME + # must have a single quote delimited value for this to work. + m4_define([_LT_CONFIG_STATUS_DECLARE], +-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) + + + # _LT_CONFIG_STATUS_DECLARATIONS +@@ -418,7 +435,7 @@ + # embedded single quotes properly. In configure, this macro expands + # each variable declared with _LT_DECL (and _LT_TAGDECL) into: + # +-# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' + m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], + [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) +@@ -517,12 +534,20 @@ + LTCFLAGS='$LTCFLAGS' + compiler='$compiler_DEFAULT' + ++# A function that is used when there is no print builtin or printf. ++func_fallback_echo () ++{ ++ eval 'cat <<_LTECHO_EOF ++\$[]1 ++_LTECHO_EOF' ++} ++ + # Quote evaled strings. + for var in lt_decl_all_varnames([[ \ + ]], lt_decl_quote_varnames); do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -533,9 +558,9 @@ + # Double-quote double-evaled strings. + for var in lt_decl_all_varnames([[ \ + ]], lt_decl_dquote_varnames); do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -543,16 +568,38 @@ + esac + done + +-# Fix-up fallback echo if it was mangled by the above quoting rules. +-case \$lt_ECHO in +-*'\\\[$]0 --fallback-echo"')dnl " +- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` +- ;; +-esac +- + _LT_OUTPUT_LIBTOOL_INIT + ]) + ++# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) ++# ------------------------------------ ++# Generate a child script FILE with all initialization necessary to ++# reuse the environment learned by the parent script, and make the ++# file executable. If COMMENT is supplied, it is inserted after the ++# `#!' sequence but before initialization text begins. After this ++# macro, additional text can be appended to FILE to form the body of ++# the child script. The macro ends with non-zero status if the ++# file could not be fully written (such as if the disk is full). ++m4_ifdef([AS_INIT_GENERATED], ++[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], ++[m4_defun([_LT_GENERATED_FILE_INIT], ++[m4_require([AS_PREPARE])]dnl ++[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl ++[lt_write_fail=0 ++cat >$1 <<_ASEOF || lt_write_fail=1 ++#! $SHELL ++# Generated by $as_me. ++$2 ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$1 <<\_ASEOF || lt_write_fail=1 ++AS_SHELL_SANITIZE ++_AS_PREPARE ++exec AS_MESSAGE_FD>&1 ++_ASEOF ++test $lt_write_fail = 0 && chmod +x $1[]dnl ++m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + + # LT_OUTPUT + # --------- +@@ -562,20 +609,11 @@ + AC_DEFUN([LT_OUTPUT], + [: ${CONFIG_LT=./config.lt} + AC_MSG_NOTICE([creating $CONFIG_LT]) +-cat >"$CONFIG_LT" <<_LTEOF +-#! $SHELL +-# Generated by $as_me. +-# Run this file to recreate a libtool stub with the current configuration. ++_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], ++[# Run this file to recreate a libtool stub with the current configuration.]) + ++cat >>"$CONFIG_LT" <<\_LTEOF + lt_cl_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_LTEOF +- +-cat >>"$CONFIG_LT" <<\_LTEOF +-AS_SHELL_SANITIZE +-_AS_PREPARE +- +-exec AS_MESSAGE_FD>&1 + exec AS_MESSAGE_LOG_FD>>config.log + { + echo +@@ -601,7 +639,7 @@ + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2011 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation + gives unlimited permision to copy, distribute and modify it." + +@@ -646,15 +684,13 @@ + # appending to config.log, which fails on DOS, as config.log is still kept + # open by configure. Here we exec the FD to /dev/null, effectively closing + # config.log, so it can be properly (re)opened and appended to by config.lt. +-if test "$no_create" != yes; then +- lt_cl_success=: +- test "$silent" = yes && +- lt_config_lt_args="$lt_config_lt_args --quiet" +- exec AS_MESSAGE_LOG_FD>/dev/null +- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +- exec AS_MESSAGE_LOG_FD>>config.log +- $lt_cl_success || AS_EXIT(1) +-fi ++lt_cl_success=: ++test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++exec AS_MESSAGE_LOG_FD>/dev/null ++$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++exec AS_MESSAGE_LOG_FD>>config.log ++$lt_cl_success || AS_EXIT(1) + ])# LT_OUTPUT + + +@@ -717,15 +753,12 @@ + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- _LT_PROG_XSI_SHELLFNS ++ _LT_PROG_REPLACE_SHELLFNS + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + ], +@@ -770,6 +803,7 @@ + m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], ++ [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], +@@ -791,6 +825,31 @@ + ])# _LT_LANG + + ++m4_ifndef([AC_PROG_GO], [ ++############################################################ ++# NOTE: This macro has been submitted for inclusion into # ++# GNU Autoconf as AC_PROG_GO. When it is available in # ++# a released version of Autoconf we should remove this # ++# macro and use it instead. # ++############################################################ ++m4_defun([AC_PROG_GO], ++[AC_LANG_PUSH(Go)dnl ++AC_ARG_VAR([GOC], [Go compiler command])dnl ++AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl ++_AC_ARG_VAR_LDFLAGS()dnl ++AC_CHECK_TOOL(GOC, gccgo) ++if test -z "$GOC"; then ++ if test -n "$ac_tool_prefix"; then ++ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) ++ fi ++fi ++if test -z "$GOC"; then ++ AC_CHECK_PROG(GOC, gccgo, gccgo, false) ++fi ++])#m4_defun ++])#m4_ifndef ++ ++ + # _LT_LANG_DEFAULT_CONFIG + # ----------------------- + m4_defun([_LT_LANG_DEFAULT_CONFIG], +@@ -821,6 +880,10 @@ + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + ++AC_PROVIDE_IFELSE([AC_PROG_GO], ++ [LT_LANG(GO)], ++ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) ++ + AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +@@ -831,11 +894,13 @@ + AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) + AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) + AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) + dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([AC_LIBTOOL_CXX], []) + dnl AC_DEFUN([AC_LIBTOOL_F77], []) + dnl AC_DEFUN([AC_LIBTOOL_FC], []) + dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + + # _LT_TAG_COMPILER +@@ -921,7 +986,13 @@ + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? +- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ # If there is a non-empty error log, and "single_module" ++ # appears in it, assume the flag caused a linker warning ++ if test -s conftest.err && $GREP single_module conftest.err; then ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ # Otherwise, if the output was created with a 0 exit code from ++ # the compiler, it worked. ++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD +@@ -929,6 +1000,7 @@ + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) ++ + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no +@@ -940,6 +1012,34 @@ + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) ++ ++ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], ++ [lt_cv_ld_force_load=no ++ cat > conftest.c << _LT_EOF ++int forced_loaded() { return 2;} ++_LT_EOF ++ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD ++ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD ++ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD ++ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD ++ cat > conftest.c << _LT_EOF ++int main() { return 0;} ++_LT_EOF ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err ++ _lt_result=$? ++ if test -s conftest.err && $GREP force_load conftest.err; then ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then ++ lt_cv_ld_force_load=yes ++ else ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ fi ++ rm -f conftest.err libconftest.a conftest conftest.c ++ rm -rf conftest.dSYM ++ ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +@@ -967,7 +1067,7 @@ + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi +- if test "$DSYMUTIL" != ":"; then ++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= +@@ -977,8 +1077,8 @@ + ]) + + +-# _LT_DARWIN_LINKER_FEATURES +-# -------------------------- ++# _LT_DARWIN_LINKER_FEATURES([TAG]) ++# --------------------------------- + # Checks for linker and compiler features on darwin + m4_defun([_LT_DARWIN_LINKER_FEATURES], + [ +@@ -987,7 +1087,13 @@ + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ if test "$lt_cv_ld_force_load" = "yes"; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], ++ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in +@@ -995,7 +1101,7 @@ + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then +- output_verbose_link_cmd=echo ++ output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +@@ -1011,203 +1117,142 @@ + fi + ]) + +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- ++# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) ++# ---------------------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # If we don't find anything, use the default library path according + # to the aix ld manual. ++# Store the results from the different compilers for each TAGNAME. ++# Allow to override them for all tags through lt_cv_aix_libpath. + m4_defun([_LT_SYS_MODULE_PATH_AIX], + [m4_require([_LT_DECL_SED])dnl +-AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ ++ lt_aix_libpath_sed='[ ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }]' ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi],[]) ++ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then ++ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" ++ fi ++ ]) ++ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) ++fi + ])# _LT_SYS_MODULE_PATH_AIX + + + # _LT_SHELL_INIT(ARG) + # ------------------- + m4_define([_LT_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_SHELL_INIT ++[m4_divert_text([M4SH-INIT], [$1 ++])])# _LT_SHELL_INIT + + ++ + # _LT_PROG_ECHO_BACKSLASH + # ----------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. ++# Find how we can fake an echo command that does not interpret backslash. ++# In particular, with Autoconf 2.60 or later we add some code to the start ++# of the generated configure script which will find a shell with a builtin ++# printf (which we can use as an echo command). + m4_defun([_LT_PROG_ECHO_BACKSLASH], +-[_LT_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} ++[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +-case X$lt_ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` +- ;; +-esac +- +-ECHO=${lt_ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then +- # Yippee, $ECHO works! +- : ++AC_MSG_CHECKING([how to print strings]) ++# Test print first, because it will be a builtin if present. ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ ++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ++ ECHO='print -r --' ++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then ++ ECHO='printf %s\n' + else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ # Use this function as a fallback that always works. ++ func_fallback_echo () ++ { ++ eval 'cat <<_LTECHO_EOF ++$[]1 ++_LTECHO_EOF' ++ } ++ ECHO='func_fallback_echo' + fi + +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat <<_LT_EOF +-[$]* +-_LT_EOF +- exit 0 +-fi ++# func_echo_all arg... ++# Invoke $ECHO with all args, space-separated. ++func_echo_all () ++{ ++ $ECHO "$*" ++} + +-# The HP-UX ksh and POSIX shell print the target directory to stdout +-# if CDPATH is set. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++case "$ECHO" in ++ printf*) AC_MSG_RESULT([printf]) ;; ++ print*) AC_MSG_RESULT([print -r]) ;; ++ *) AC_MSG_RESULT([cat]) ;; ++esac + +-if test -z "$lt_ECHO"; then +- if test "X${echo_test_string+set}" != Xset; then +- # find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if { echo_test_string=`eval $cmd`; } 2>/dev/null && +- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null +- then +- break +- fi +- done +- fi ++m4_ifdef([_AS_DETECT_SUGGESTED], ++[_AS_DETECT_SUGGESTED([ ++ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( ++ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ++ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO ++ PATH=/empty FPATH=/empty; export PATH FPATH ++ test "X`printf %s $ECHO`" = "X$ECHO" \ ++ || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +- else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH + +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- ECHO="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" + +- if test "X$ECHO" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- ECHO='print -r' +- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- ECHO='printf %s\n' +- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: ++# _LT_WITH_SYSROOT ++# ---------------- ++AC_DEFUN([_LT_WITH_SYSROOT], ++[AC_MSG_CHECKING([for sysroot]) ++AC_ARG_WITH([sysroot], ++[ --with-sysroot[=DIR] Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified).], ++[], [with_sysroot=no]) + +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done ++dnl lt_sysroot will always be passed unquoted. We quote it here ++dnl in case the user passed a directory name. ++lt_sysroot= ++case ${with_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ AC_MSG_RESULT([${with_sysroot}]) ++ AC_MSG_ERROR([The sysroot must be an absolute path.]) ++ ;; ++esac + +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- ECHO=echo +- fi +- fi +- fi +- fi +- fi +-fi ++ AC_MSG_RESULT([${lt_sysroot:-no}]) ++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl ++[dependent libraries, and in which our libraries should be installed.])]) + +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-lt_ECHO=$ECHO +-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +-fi +- +-AC_SUBST(lt_ECHO) +-]) +-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +-_LT_DECL([], [ECHO], [1], +- [An echo program that does not interpret backslashes]) +-])# _LT_PROG_ECHO_BACKSLASH +- +- + # _LT_ENABLE_LOCK + # --------------- + m4_defun([_LT_ENABLE_LOCK], +@@ -1236,7 +1281,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in +@@ -1329,14 +1374,27 @@ + CFLAGS="$SAVE_CFLAGS" + fi + ;; +-sparc*-*solaris*) ++*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ yes*) ++ case $host in ++ i?86-*-solaris*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ sparc*-*-solaris*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available. ++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then ++ LD="${LD-ld}_sol2" ++ fi ++ ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" +@@ -1354,14 +1412,47 @@ + ])# _LT_ENABLE_LOCK + + ++# _LT_PROG_AR ++# ----------- ++m4_defun([_LT_PROG_AR], ++[AC_CHECK_TOOLS(AR, [ar], false) ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) ++ ++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], ++ [lt_cv_ar_at_file=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], ++ [echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ AC_TRY_EVAL([lt_ar_try]) ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ]) ++ ]) ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++_LT_DECL([], [archiver_list_spec], [1], ++ [How to feed a file listing to the archiver]) ++])# _LT_PROG_AR ++ ++ + # _LT_CMD_OLD_ARCHIVE + # ------------------- + m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) ++[_LT_PROG_AR + + AC_CHECK_TOOL(STRIP, strip, :) + test -z "$STRIP" && STRIP=: +@@ -1380,18 +1471,27 @@ + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + fi ++ ++case $host_os in ++ darwin*) ++ lock_old_archive_extraction=yes ;; ++ *) ++ lock_old_archive_extraction=no ;; ++esac + _LT_DECL([], [old_postinstall_cmds], [2]) + _LT_DECL([], [old_postuninstall_cmds], [2]) + _LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) ++_LT_DECL([], [lock_old_archive_extraction], [0], ++ [Whether to use a lock for old archive extraction]) + ])# _LT_CMD_OLD_ARCHIVE + + +@@ -1416,15 +1516,15 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes +@@ -1464,7 +1564,7 @@ + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes +@@ -1527,6 +1627,11 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + ++ mint*) ++ # On MiNT this can take a long time and run out of memory. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. +@@ -1552,6 +1657,11 @@ + lt_cv_sys_max_cmd_len=196608 + ;; + ++ os2*) ++ # The test takes a long time on OS/2. ++ lt_cv_sys_max_cmd_len=8192 ++ ;; ++ + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +@@ -1591,8 +1701,8 @@ + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. +- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ +- = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ ++ = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` +@@ -1643,7 +1753,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" ++[#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -1684,7 +1794,13 @@ + # endif + #endif + +-void fnord() { int i=42;} ++/* When -fvisbility=hidden is used, assume the code has been annotated ++ correspondingly for the symbols needed. */ ++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++int fnord () __attribute__((visibility("default"))); ++#endif ++ ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -1693,7 +1809,11 @@ + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ else ++ { ++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ else puts (dlerror ()); ++ } + /* dlclose (self); */ + } + else +@@ -1869,16 +1989,16 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +@@ -2037,6 +2157,7 @@ + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_OBJDUMP])dnl + m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl + AC_MSG_CHECKING([dynamic linker characteristics]) + m4_if([$1], + [], [ +@@ -2045,16 +2166,23 @@ + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac +- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++ case $host_os in ++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; ++ *) lt_sed_strip_eq="s,=/,/,g" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` ++ case $lt_search_path_spec in ++ *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. +- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` +- else +- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` ++ ;; ++ *) ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= +@@ -2067,7 +2195,7 @@ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done +- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; +@@ -2087,7 +2215,13 @@ + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } + }'` +- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++ # AWK program above erroneously prepends '/' to C:/dos/paths ++ # for these hosts. ++ case $host_os in ++ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ ++ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; ++ esac ++ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi]) +@@ -2113,7 +2247,7 @@ + + case $host_os in + aix3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + +@@ -2122,7 +2256,7 @@ + ;; + + aix[[4-9]]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes +@@ -2175,7 +2309,7 @@ + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; +@@ -2187,7 +2321,7 @@ + ;; + + bsdi[[45]]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -2206,8 +2340,9 @@ + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -2228,36 +2363,83 @@ + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` +- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- else +- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` +- fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' + ;; + ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' ++ ;; ++ + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -2278,7 +2460,7 @@ + ;; + + dgux*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +@@ -2286,10 +2468,6 @@ + shlibpath_var=LD_LIBRARY_PATH + ;; + +-freebsd1*) +- dynamic_linker=no +- ;; +- + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -2297,7 +2475,7 @@ + objformat=`/usr/bin/objformat` + else + case $host_os in +- freebsd[[123]]*) objformat=aout ;; ++ freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi +@@ -2315,7 +2493,7 @@ + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in +- freebsd2*) ++ freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) +@@ -2335,15 +2513,29 @@ + ;; + + gnu*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + ++haiku*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ dynamic_linker="$host_os runtime_loader" ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' ++ hardcode_into_libs=yes ++ ;; ++ + hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. +@@ -2386,12 +2578,14 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' ++ # or fails outright, so override atomically: ++ install_override_mode=555 + ;; + + interix[[3-9]]*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +@@ -2407,7 +2601,7 @@ + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; +@@ -2444,9 +2638,9 @@ + dynamic_linker=no + ;; + +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- version_type=linux ++# This must be glibc/ELF. ++linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -2454,16 +2648,21 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ + # Some binutils ld are patched to set DT_RUNPATH +- save_LDFLAGS=$LDFLAGS +- save_libdir=$libdir +- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ +- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], +- [shlibpath_overrides_runpath=yes])]) +- LDFLAGS=$save_LDFLAGS +- libdir=$save_libdir ++ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], ++ [lt_cv_shlibpath_overrides_runpath=no ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [lt_cv_shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ ]) ++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install +@@ -2472,7 +2671,7 @@ + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then +- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + +@@ -2504,7 +2703,7 @@ + ;; + + newsos6) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +@@ -2573,7 +2772,7 @@ + ;; + + solaris*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -2598,7 +2797,7 @@ + ;; + + sysv4 | sysv4.3*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -2622,7 +2821,7 @@ + + sysv4*MP*) + if test -d /usr/nec ;then +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -2653,7 +2852,7 @@ + + tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -2663,7 +2862,7 @@ + ;; + + uts4*) +- version_type=linux ++ version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH +@@ -2705,6 +2904,8 @@ + The last name is the one that the linker finds with -lNAME]]) + _LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) ++_LT_DECL([], [install_override_mode], [1], ++ [Permission mode override for installation of shared libraries]) + _LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) + _LT_DECL([], [postuninstall_cmds], [2], +@@ -2817,6 +3018,7 @@ + AC_REQUIRE([AC_CANONICAL_BUILD])dnl + m4_require([_LT_DECL_SED])dnl + m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + + AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], +@@ -2938,6 +3140,11 @@ + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -2946,8 +3153,8 @@ + fi + ;; + esac +-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl +-_LT_DECL([], [reload_cmds], [2])dnl ++_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl ++_LT_TAGDECL([], [reload_cmds], [2])dnl + ])# _LT_CMD_RELOAD + + +@@ -2999,16 +3206,18 @@ + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. +- if ( file / ) >/dev/null 2>&1; then ++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. ++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +-cegcc) ++cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' +@@ -3038,6 +3247,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++haiku*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in +@@ -3046,11 +3259,11 @@ + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) +- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac +@@ -3071,8 +3284,8 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) ++# This must be glibc/ELF. ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -3150,6 +3363,21 @@ + ;; + esac + ]) ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -3157,7 +3385,11 @@ + _LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) + _LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) ++ [Command to use when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [file_magic_glob], [1], ++ [How to find potential files when deplibs_check_method = "file_magic"]) ++_LT_DECL([], [want_nocaseglob], [1], ++ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + ])# _LT_CHECK_MAGIC_METHOD + + +@@ -3214,7 +3446,19 @@ + NM="$lt_cv_path_NM" + else + # Didn't find any BSD compatible name lister, look for dumpbin. +- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) ++ if test -n "$DUMPBIN"; then : ++ # Let the user override the test. ++ else ++ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) ++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in ++ *COFF*) ++ DUMPBIN="$DUMPBIN -symbols" ++ ;; ++ *) ++ DUMPBIN=: ++ ;; ++ esac ++ fi + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" +@@ -3227,13 +3471,13 @@ + AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD +- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD +- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) ++ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -3248,7 +3492,68 @@ + dnl AC_DEFUN([AM_PROG_NM], []) + dnl AC_DEFUN([AC_PROG_NM], []) + ++# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++# -------------------------------- ++# how to determine the name of the shared library ++# associated with a specific link library. ++# -- PORTME fill in with the dynamic library characteristics ++m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++m4_require([_LT_DECL_DLLTOOL]) ++AC_CACHE_CHECK([how to associate runtime and link libraries], ++lt_cv_sharedlib_from_linklib_cmd, ++[lt_cv_sharedlib_from_linklib_cmd='unknown' + ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++]) ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++_LT_DECL([], [sharedlib_from_linklib_cmd], [1], ++ [Command to associate shared and link libraries]) ++])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB ++ ++ ++# _LT_PATH_MANIFEST_TOOL ++# ---------------------- ++# locate the manifest tool ++m4_defun([_LT_PATH_MANIFEST_TOOL], ++[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], ++ [lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest*]) ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ++])# _LT_PATH_MANIFEST_TOOL ++ ++ + # LT_LIB_M + # -------- + # check for math library +@@ -3256,7 +3561,7 @@ + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + LIBM= + case $host in +-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +@@ -3284,7 +3589,12 @@ + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + + if test "$GCC" = yes; then +- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ case $cc_basename in ++ nvcc*) ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; ++ esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, +@@ -3301,6 +3611,7 @@ + m4_defun([_LT_CMD_GLOBAL_SYMBOLS], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_AWK])dnl + AC_REQUIRE([LT_PATH_NM])dnl + AC_REQUIRE([LT_PATH_LD])dnl + m4_require([_LT_DECL_SED])dnl +@@ -3368,8 +3679,8 @@ + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -3393,6 +3704,7 @@ + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ + " {last_section=section; section=\$ 3};"\ ++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ + " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ + " \$ 0!~/External *\|/{next};"\ + " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +@@ -3405,6 +3717,7 @@ + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -3426,7 +3739,7 @@ + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm +- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then ++ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -3438,6 +3751,18 @@ + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT@&t@_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT@&t@_DLSYM_CONST ++#else ++# define LT@&t@_DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -3449,7 +3774,7 @@ + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -3475,15 +3800,15 @@ + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +@@ -3516,6 +3841,13 @@ + AC_MSG_RESULT(ok) + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ + _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) + _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +@@ -3526,6 +3858,8 @@ + _LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) ++_LT_DECL([], [nm_file_list_spec], [1], ++ [Specify filename containing input files for $NM]) + ]) # _LT_CMD_GLOBAL_SYMBOLS + + +@@ -3537,7 +3871,6 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)= + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) + m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -3588,6 +3921,11 @@ + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; ++ haiku*) ++ # PIC is the default for Haiku. ++ # The "-static" flag exists, but is broken. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)= ++ ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. +@@ -3637,6 +3975,12 @@ + ;; + esac + ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + dgux*) + case $cc_basename in + ec++*) +@@ -3693,7 +4037,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -3726,8 +4070,8 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; +- xlc* | xlC*) +- # IBM XL 8.0 on PPC ++ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) ++ # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' +@@ -3789,7 +4133,7 @@ + ;; + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +@@ -3893,6 +4237,12 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + ++ haiku*) ++ # PIC is the default for Haiku. ++ # The "-static" flag exists, but is broken. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)= ++ ;; ++ + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag +@@ -3935,6 +4285,15 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac ++ ++ case $cc_basename in ++ nvcc*) # Cuda Compiler Driver 2.2 ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' ++ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ++ fi ++ ;; ++ esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in +@@ -3977,7 +4336,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -3998,7 +4357,13 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; +- pgcc* | pgf77* | pgf90* | pgf95*) ++ nagfor*) ++ # NAG Fortran compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -4010,25 +4375,40 @@ + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; +- xl*) +- # IBM XL C 8.0/Fortran 10.1 on PPC ++ xl* | bgxl* | bgf* | mpixl*) ++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ *Sun\ F* | *Sun*Fortran*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; +- *Sun\ F*) +- # Sun Fortran 8.3 passes all unrecognized flags to the linker +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ *Intel*\ [[CF]]*Compiler*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ *Portland\ Group*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; +@@ -4060,7 +4440,7 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +@@ -4117,10 +4497,12 @@ + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; + esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) + ++AC_CACHE_CHECK([for $compiler option to produce PIC], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) ++ + # + # Check to make sure the PIC flag actually works. + # +@@ -4138,6 +4520,8 @@ + _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) + # + # Check to make sure the static flag actually works. + # +@@ -4158,6 +4542,7 @@ + m4_defun([_LT_LINKER_SHLIBS], + [AC_REQUIRE([LT_PATH_LD])dnl + AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + m4_require([_LT_FILEUTILS_DEFAULTS])dnl + m4_require([_LT_DECL_EGREP])dnl + m4_require([_LT_DECL_SED])dnl +@@ -4166,27 +4551,37 @@ + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ # Also, AIX nm treats weak defined symbols like other global defined ++ # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ case $cc_basename in ++ cl*) ++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ++ ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ ;; ++ esac ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + ], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -4201,7 +4596,6 @@ + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +@@ -4249,7 +4643,33 @@ + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes ++ ++ # On some targets, GNU ld is compatible enough with the native linker ++ # that we're better off using the native interface for both. ++ lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then ++ case $host_os in ++ aix*) ++ # The AIX port of GNU ld has always aspired to compatibility ++ # with the native linker. However, as the warning in the GNU ld ++ # block says, versions before 2.19.5* couldn't really create working ++ # shared libraries, regardless of the interface used. ++ case `$LD -v 2>&1` in ++ *\ \(GNU\ Binutils\)\ 2.19.5*) ;; ++ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; ++ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; ++ *) ++ lt_use_gnu_ld_interface=yes ++ ;; ++ esac ++ ;; ++ *) ++ lt_use_gnu_ld_interface=yes ++ ;; ++ esac ++ fi ++ ++ if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + +@@ -4267,6 +4687,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -4282,11 +4703,12 @@ + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** Warning: the GNU linker, at least up to release 2.19, is reported + *** to be unable to reliably create shared libraries on AIX. + *** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. ++*** really care for shared libraries, you may want to install binutils ++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. ++*** You will then need to restart the configuration process. + + _LT_EOF + fi +@@ -4322,10 +4744,12 @@ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -4343,6 +4767,11 @@ + fi + ;; + ++ haiku*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4358,7 +4787,7 @@ + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -4368,15 +4797,16 @@ + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then +- tmp_addflag= ++ tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ pgf77* | pgf90* | pgf95* | pgfortran*) ++ # Portland Group f77 and f90 compilers ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; +@@ -4387,13 +4817,17 @@ + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; +- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; ++ nvcc*) # Cuda Compiler Driver 2.2 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes ++ ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 +@@ -4409,17 +4843,16 @@ + fi + + case $cc_basename in +- xlf*) ++ xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -4433,8 +4866,8 @@ + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -4452,8 +4885,8 @@ + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4499,8 +4932,8 @@ + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -4540,8 +4973,10 @@ + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ # Also, AIX nm treats weak defined symbols like other global ++ # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi +@@ -4628,9 +5063,9 @@ + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +@@ -4639,14 +5074,19 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ if test "$with_gnu_ld" = yes; then ++ # We only use this code for GNU lds that support --whole-archive. ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ else ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +@@ -4678,20 +5118,64 @@ + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -4704,10 +5188,6 @@ + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +- freebsd1*) +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little +@@ -4720,7 +5200,7 @@ + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) ++ freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes +@@ -4729,7 +5209,7 @@ + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4737,7 +5217,7 @@ + + hpux9*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -4752,14 +5232,13 @@ + ;; + + hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +@@ -4771,16 +5250,16 @@ + ;; + + hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -4792,7 +5271,14 @@ + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ m4_if($1, [], [ ++ # Older versions of the 11.00 compiler do not understand -b yet ++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) ++ _LT_LINKER_OPTION([if $CC understands -b], ++ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], ++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], ++ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], ++ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi +@@ -4820,19 +5306,34 @@ + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE(int foo(void) {}, +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" ++ # This should be the same for all languages, so no per-tag cache variable. ++ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], ++ [lt_cv_irix_exported_symbol], ++ [save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE( ++ [AC_LANG_SOURCE( ++ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], ++ [C++], [[int foo (void) { return 0; }]], ++ [Fortran 77], [[ ++ subroutine foo ++ end]], ++ [Fortran], [[ ++ subroutine foo ++ end]])])], ++ [lt_cv_irix_exported_symbol=yes], ++ [lt_cv_irix_exported_symbol=no]) ++ LDFLAGS="$save_LDFLAGS"]) ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +@@ -4894,17 +5395,17 @@ + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +@@ -4914,13 +5415,13 @@ + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ +- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -4933,9 +5434,9 @@ + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -5111,36 +5612,38 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $RM conftest* +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ AC_CACHE_CHECK([whether -lc should be explicitly linked in], ++ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), ++ [$RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) +- _LT_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) +- then +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- else +- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes +- fi +- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $RM conftest* +- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) ++ then ++ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ ]) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi +@@ -5177,9 +5680,6 @@ + _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], +- [[If ld is used when linking, flag to hardcode $libdir into a binary +- during linking. This must work even if $libdir does not exist]]) + _LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) + _LT_TAGDECL([], [hardcode_direct], [0], +@@ -5205,8 +5705,6 @@ + to runtime path list]) + _LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) + _LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) + _LT_TAGDECL([], [export_symbols_cmds], [2], +@@ -5217,6 +5715,8 @@ + [Symbols that must always be exported]) + _LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [postlink_cmds], [2], ++ [Commands necessary for finishing linking programs]) + _LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) + dnl FIXME: Not yet implemented +@@ -5310,14 +5810,15 @@ + ])# _LT_LANG_C_CONFIG + + +-# _LT_PROG_CXX +-# ------------ +-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ +-# compiler, we have our own version here. +-m4_defun([_LT_PROG_CXX], +-[ +-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) +-AC_PROG_CXX ++# _LT_LANG_CXX_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for a C++ compiler are suitably ++# defined. These variables are subsequently used by _LT_CONFIG to write ++# the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_CXX_CONFIG], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PATH_MANIFEST_TOOL])dnl + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then +@@ -5325,23 +5826,7 @@ + else + _lt_caught_CXX_error=yes + fi +-popdef([AC_MSG_ERROR]) +-])# _LT_PROG_CXX + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([_LT_PROG_CXX], []) +- +- +-# _LT_LANG_CXX_CONFIG([TAG]) +-# -------------------------- +-# Ensure that the configuration variables for a C++ compiler are suitably +-# defined. These variables are subsequently used by _LT_CONFIG to write +-# the compiler configuration to `libtool'. +-m4_defun([_LT_LANG_CXX_CONFIG], +-[AC_REQUIRE([_LT_PROG_CXX])dnl +-m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_DECL_EGREP])dnl +- + AC_LANG_PUSH(C++) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -5352,7 +5837,6 @@ + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +@@ -5362,6 +5846,8 @@ + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(reload_flag, $1)=$reload_flag ++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + _LT_TAGVAR(no_undefined_flag, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +@@ -5393,6 +5879,7 @@ + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX +@@ -5410,6 +5897,7 @@ + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} ++ CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -5431,8 +5919,8 @@ + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -5464,7 +5952,7 @@ + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no +@@ -5573,10 +6061,10 @@ + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +@@ -5585,14 +6073,19 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- _LT_SYS_MODULE_PATH_AIX ++ _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ if test "$with_gnu_ld" = yes; then ++ # We only use this code for GNU lds that support --whole-archive. ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ else ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. +@@ -5622,28 +6115,75 @@ + ;; + + cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ case $GXX,$cc_basename in ++ ,cl* | no,cl*) ++ # Native MSVC ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ # Don't use ranlib ++ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' ++ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ func_to_tool_file "$lt_outputfile"~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # g++ ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; +@@ -5666,7 +6206,7 @@ + esac + ;; + +- freebsd[[12]]*) ++ freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5685,6 +6225,11 @@ + gnu*) + ;; + ++ haiku*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -5709,11 +6254,11 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +@@ -5774,7 +6319,7 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then +@@ -5784,10 +6329,10 @@ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -5817,7 +6362,7 @@ + case $cc_basename in + CC*) + # SGI C++ +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is +@@ -5828,9 +6373,9 @@ + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +@@ -5841,7 +6386,7 @@ + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +@@ -5859,7 +6404,7 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -5896,26 +6441,26 @@ + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in +- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) ++ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; +- *) # Version 6 will use weak symbols ++ *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; +@@ -5923,7 +6468,7 @@ + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ +@@ -5942,9 +6487,9 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; +- xl*) ++ xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -5964,13 +6509,13 @@ + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. +- output_verbose_link_cmd='echo' ++ output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is +@@ -6039,7 +6584,7 @@ + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi +- output_verbose_link_cmd=echo ++ output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +@@ -6074,15 +6619,15 @@ + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; +@@ -6098,17 +6643,17 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -6118,7 +6663,7 @@ + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support +@@ -6154,7 +6699,7 @@ + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +@@ -6175,7 +6720,7 @@ + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + +- output_verbose_link_cmd='echo' ++ output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is +@@ -6195,14 +6740,14 @@ + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. +@@ -6213,7 +6758,7 @@ + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +@@ -6267,6 +6812,10 @@ + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ ++ '"$_LT_TAGVAR(old_archive_cmds, $1)" ++ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ ++ '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +@@ -6322,6 +6871,7 @@ + fi # test -n "$compiler" + + CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -6336,6 +6886,29 @@ + ])# _LT_LANG_CXX_CONFIG + + ++# _LT_FUNC_STRIPNAME_CNF ++# ---------------------- ++# func_stripname_cnf prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# ++# This function is identical to the (non-XSI) version of func_stripname, ++# except this one can be used by m4 code that may be executed by configure, ++# rather than the libtool script. ++m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl ++AC_REQUIRE([_LT_DECL_SED]) ++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) ++func_stripname_cnf () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} # func_stripname_cnf ++])# _LT_FUNC_STRIPNAME_CNF ++ + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) + # --------------------------------- + # Figure out "hidden" library dependencies from verbose +@@ -6344,6 +6917,7 @@ + # objects, libraries and library flags. + m4_defun([_LT_SYS_HIDDEN_LIBDEPS], + [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl + # Dependencies to place before and after the object being linked: + _LT_TAGVAR(predep_objects, $1)= + _LT_TAGVAR(postdep_objects, $1)= +@@ -6393,7 +6967,20 @@ + } + }; + _LT_EOF ++], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF ++package foo ++func foo() { ++} ++_LT_EOF + ]) ++ ++_lt_libdeps_save_CFLAGS=$CFLAGS ++case "$CC $CFLAGS " in #( ++*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; ++*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; ++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; ++esac ++ + dnl Parse the compiler output and extract the necessary + dnl objects, libraries and library flags. + if AC_TRY_EVAL(ac_compile); then +@@ -6405,7 +6992,7 @@ + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case $p in ++ case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -6414,13 +7001,22 @@ + test $p = "-R"; then + prev=$p + continue +- else +- prev= + fi + ++ # Expand the sysroot to ease extracting the directories later. ++ if test -z "$prev"; then ++ case $p in ++ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; ++ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; ++ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; ++ esac ++ fi ++ case $p in ++ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; ++ esac + if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) ++ case ${prev} in ++ -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. +@@ -6440,8 +7036,10 @@ + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi ++ prev= + ;; + ++ *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. +@@ -6477,6 +7075,7 @@ + fi + + $RM -f confest.$objext ++CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], +@@ -6513,7 +7112,7 @@ + + solaris*) + case $cc_basename in +- CC*) ++ CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -6557,32 +7156,16 @@ + ])# _LT_SYS_HIDDEN_LIBDEPS + + +-# _LT_PROG_F77 +-# ------------ +-# Since AC_PROG_F77 is broken, in that it returns the empty string +-# if there is no fortran compiler, we have our own version here. +-m4_defun([_LT_PROG_F77], +-[ +-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) +-AC_PROG_F77 +-if test -z "$F77" || test "X$F77" = "Xno"; then +- _lt_disable_F77=yes +-fi +-popdef([AC_MSG_ERROR]) +-])# _LT_PROG_F77 +- +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([_LT_PROG_F77], []) +- +- + # _LT_LANG_F77_CONFIG([TAG]) + # -------------------------- + # Ensure that the configuration variables for a Fortran 77 compiler are + # suitably defined. These variables are subsequently used by _LT_CONFIG + # to write the compiler configuration to `libtool'. + m4_defun([_LT_LANG_F77_CONFIG], +-[AC_REQUIRE([_LT_PROG_F77])dnl +-AC_LANG_PUSH(Fortran 77) ++[AC_LANG_PUSH(Fortran 77) ++if test -z "$F77" || test "X$F77" = "Xno"; then ++ _lt_disable_F77=yes ++fi + + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(allow_undefined_flag, $1)= +@@ -6592,7 +7175,6 @@ + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=no +@@ -6601,6 +7183,8 @@ + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(reload_flag, $1)=$reload_flag ++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + _LT_TAGVAR(no_undefined_flag, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +@@ -6640,7 +7224,9 @@ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} ++ CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6694,39 +7280,25 @@ + + GCC=$lt_save_GCC + CC="$lt_save_CC" ++ CFLAGS="$lt_save_CFLAGS" + fi # test "$_lt_disable_F77" != yes + + AC_LANG_POP + ])# _LT_LANG_F77_CONFIG + + +-# _LT_PROG_FC +-# ----------- +-# Since AC_PROG_FC is broken, in that it returns the empty string +-# if there is no fortran compiler, we have our own version here. +-m4_defun([_LT_PROG_FC], +-[ +-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) +-AC_PROG_FC +-if test -z "$FC" || test "X$FC" = "Xno"; then +- _lt_disable_FC=yes +-fi +-popdef([AC_MSG_ERROR]) +-])# _LT_PROG_FC +- +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([_LT_PROG_FC], []) +- +- + # _LT_LANG_FC_CONFIG([TAG]) + # ------------------------- + # Ensure that the configuration variables for a Fortran compiler are + # suitably defined. These variables are subsequently used by _LT_CONFIG + # to write the compiler configuration to `libtool'. + m4_defun([_LT_LANG_FC_CONFIG], +-[AC_REQUIRE([_LT_PROG_FC])dnl +-AC_LANG_PUSH(Fortran) ++[AC_LANG_PUSH(Fortran) + ++if test -z "$FC" || test "X$FC" = "Xno"; then ++ _lt_disable_FC=yes ++fi ++ + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no +@@ -6735,7 +7307,6 @@ + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=no +@@ -6744,6 +7315,8 @@ + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(reload_flag, $1)=$reload_flag ++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + _LT_TAGVAR(no_undefined_flag, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +@@ -6783,7 +7356,9 @@ + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC ++ lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} ++ CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + +@@ -6839,7 +7414,8 @@ + fi # test -n "$compiler" + + GCC=$lt_save_GCC +- CC="$lt_save_CC" ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS + fi # test "$_lt_disable_FC" != yes + + AC_LANG_POP +@@ -6876,10 +7452,12 @@ + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. +-lt_save_CC="$CC" ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC=yes + CC=${GCJ-"gcj"} ++CFLAGS=$GCJFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_TAGVAR(LD, $1)="$LD" +@@ -6889,6 +7467,8 @@ + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + + _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(reload_flag, $1)=$reload_flag ++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change +@@ -6908,10 +7488,82 @@ + AC_LANG_RESTORE + + GCC=$lt_save_GCC +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_GCJ_CONFIG + + ++# _LT_LANG_GO_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for the GNU Go compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_GO_CONFIG], ++[AC_REQUIRE([LT_PROG_GO])dnl ++AC_LANG_SAVE ++ ++# Source file extension for Go test sources. ++ac_ext=go ++ ++# Object file extension for compiled Go test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="package main; func main() { }" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='package main; func main() { }' ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC=$CC ++lt_save_CFLAGS=$CFLAGS ++lt_save_GCC=$GCC ++GCC=yes ++CC=${GOC-"gccgo"} ++CFLAGS=$GOFLAGS ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_TAGVAR(LD, $1)="$LD" ++_LT_CC_BASENAME([$compiler]) ++ ++# Go did not exist at the time GCC didn't implicitly link libc in. ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(reload_flag, $1)=$reload_flag ++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ++ ++## CAVEAT EMPTOR: ++## There is no encapsulation within the following macros, do not change ++## the running order or otherwise move them around unless you know exactly ++## what you are doing... ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++fi ++ ++AC_LANG_RESTORE ++ ++GCC=$lt_save_GCC ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS ++])# _LT_LANG_GO_CONFIG ++ ++ + # _LT_LANG_RC_CONFIG([TAG]) + # ------------------------- + # Ensure that the configuration variables for the Windows resource compiler +@@ -6943,9 +7595,11 @@ + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" ++lt_save_CFLAGS=$CFLAGS + lt_save_GCC=$GCC + GCC= + CC=${RC-"windres"} ++CFLAGS= + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) +@@ -6958,7 +7612,8 @@ + + GCC=$lt_save_GCC + AC_LANG_RESTORE +-CC="$lt_save_CC" ++CC=$lt_save_CC ++CFLAGS=$lt_save_CFLAGS + ])# _LT_LANG_RC_CONFIG + + +@@ -6978,6 +7633,13 @@ + dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + ++# LT_PROG_GO ++# ---------- ++AC_DEFUN([LT_PROG_GO], ++[AC_CHECK_TOOL(GOC, gccgo,) ++]) ++ ++ + # LT_PROG_RC + # ---------- + AC_DEFUN([LT_PROG_RC], +@@ -7017,6 +7679,15 @@ + AC_SUBST([OBJDUMP]) + ]) + ++# _LT_DECL_DLLTOOL ++# ---------------- ++# Ensure DLLTOOL variable is set. ++m4_defun([_LT_DECL_DLLTOOL], ++[AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) ++AC_SUBST([DLLTOOL]) ++]) + + # _LT_DECL_SED + # ------------ +@@ -7110,8 +7781,8 @@ + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -7150,208 +7821,162 @@ + ])# _LT_CHECK_SHELL_FEATURES + + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" ++# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) ++# ------------------------------------------------------ ++# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and ++# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. ++m4_defun([_LT_PROG_FUNCTION_REPLACE], ++[dnl { ++sed -e '/^$1 ()$/,/^} # $1 /c\ ++$1 ()\ ++{\ ++m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) ++} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++]) + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} + +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} ++# _LT_PROG_REPLACE_SHELLFNS ++# ------------------------- ++# Replace existing portable implementations of several shell functions with ++# equivalent extended shell implementations where those features are available.. ++m4_defun([_LT_PROG_REPLACE_SHELLFNS], ++[if test x"$xsi_shell" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac]) + +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} ++ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl ++ func_basename_result="${1##*/}"]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} ++ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}"]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} ++ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"}]) + +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl ++ func_split_long_opt_name=${1%%=*} ++ func_split_long_opt_arg=${1#*=}]) + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} ++ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl ++ func_split_short_opt_arg=${1#??} ++ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} ++ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac]) + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" ++ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) ++fi + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +-} ++if test x"$lt_shell_append" = xyes; then ++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. ++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl ++ func_quote_for_eval "${2}" ++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ ++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; +- esac +-} ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++if test x"$_lt_function_replace_fail" = x":"; then ++ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) ++fi ++]) + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF ++# _LT_PATH_CONVERSION_FUNCTIONS ++# ----------------------------- ++# Determine which file name conversion functions should be used by ++# func_to_host_file (and, implicitly, by func_to_host_path). These are needed ++# for certain cross-compile configurations and native mingw. ++m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_MSG_CHECKING([how to convert $build file names to $host format]) ++AC_CACHE_VAL(lt_cv_to_host_file_cmd, ++[case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; + esac ++]) ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) ++_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], ++ [0], [convert $build file names to $host format])dnl + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF ++AC_MSG_CHECKING([how to convert $build file names to toolchain format]) ++AC_CACHE_VAL(lt_cv_to_tool_file_cmd, ++[#assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac + ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} +- +-_LT_EOF +- ;; +- esac ++esac + ]) ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) ++_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], ++ [0], [convert $build files to toolchain format])dnl ++])# _LT_PATH_CONVERSION_FUNCTIONS +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/ltversion.m4 +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/ltversion.m4 (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/ltversion.m4 (revision 12738) +@@ -7,17 +7,17 @@ + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# Generated from ltversion.in. ++# @configure_input@ + +-# serial 3017 ltversion.m4 ++# serial 3337 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +-m4_define([LT_PACKAGE_REVISION], [1.3017]) ++m4_define([LT_PACKAGE_VERSION], [2.4.2]) ++m4_define([LT_PACKAGE_REVISION], [1.3337]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.6b' +-macro_revision='1.3017' ++[macro_version='2.4.2' ++macro_revision='1.3337' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 (revision 12738) +@@ -11,7 +11,16 @@ + if test "x$enable_debugging" = xyes; then + AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM]) + fi ++ + dnl }}} ++ dnl shared build {{{ ++ AC_ARG_ENABLE([shared], dnl feature ++ AS_HELP_STRING([--enable-shared], [produce libISSM.so.0]), dnl help string ++ [enable_shared=$enableval], dnl action if given ++ [enable_shared=no]) dnl action if not given ++ AM_CONDITIONAL([SHARED], [test $enable_shared = yes]) ++ dnl }}} ++ + dnl Modules build {{{ + AC_ARG_WITH([modules], + AS_HELP_STRING([--with-modules = value],[modules compilation. ]), +@@ -492,7 +501,7 @@ + dnl defaults + HAVE_GSL=yes + GSLINCL="-I$GSL_ROOT/include" +- GSLLIB="-L$GSL_ROOT/lib/ -lgsl -lgslcblas -lm" ++ GSLLIB="-dy -L$GSL_ROOT/lib/ -lgsl -lgslcblas -lm" + + AC_DEFINE([_HAVE_GSL_],[1],[with gsl in ISSM src]) + AC_SUBST([GSLINCL]) +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/lt~obsolete.m4 +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/lt~obsolete.m4 (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/lt~obsolete.m4 (revision 12738) +@@ -1,13 +1,13 @@ + # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- + # +-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. + # Written by Scott James Remnant, 2004. + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 4 lt~obsolete.m4 ++# serial 5 lt~obsolete.m4 + + # These exist entirely to fool aclocal when bootstrapping libtool. + # +@@ -77,7 +77,6 @@ + m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) + m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) + m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) + m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) + m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) + m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +@@ -90,3 +89,10 @@ + m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) + m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) + m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) ++m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) ++m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) ++m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) ++m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) ++m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) ++m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) ++m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/ltoptions.m4 +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/ltoptions.m4 (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/ltoptions.m4 (revision 12738) +@@ -1,13 +1,14 @@ + # Helper functions for option handling. -*- Autoconf -*- + # +-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # Written by Gary V. Vaughan, 2004 + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +-# serial 6 ltoptions.m4 ++# serial 7 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +@@ -125,7 +126,7 @@ + [enable_win32_dll=yes + + case $host in +-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) +@@ -133,13 +134,13 @@ + esac + + test -z "$AS" && AS=as +-_LT_DECL([], [AS], [0], [Assembler program])dnl ++_LT_DECL([], [AS], [1], [Assembler program])dnl + + test -z "$DLLTOOL" && DLLTOOL=dlltool +-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl ++_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + + test -z "$OBJDUMP" && OBJDUMP=objdump +-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ++_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl + ])# win32-dll + + AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +@@ -325,9 +326,24 @@ + # MODE is either `yes' or `no'. If omitted, it defaults to `both'. + m4_define([_LT_WITH_PIC], + [AC_ARG_WITH([pic], +- [AS_HELP_STRING([--with-pic], ++ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], ++ [lt_p=${PACKAGE-default} ++ case $withval in ++ yes|no) pic_mode=$withval ;; ++ *) ++ pic_mode=default ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for lt_pkg in $withval; do ++ IFS="$lt_save_ifs" ++ if test "X$lt_pkg" = "X$lt_p"; then ++ pic_mode=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], + [pic_mode=default]) + + test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android_variables.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android_variables.sh (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android_variables.sh (revision 12738) +@@ -1,5 +0,0 @@ +-sdk_rev=20 +-ndk_rev=8 +-api_levels="android-14,android-15,android-16" +-host_triplet="arm-linux-androideabi" +-default_droid="android-4.1" +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-sdk/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-sdk/install.sh (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-sdk/install.sh (revision 12738) +@@ -1,60 +1,54 @@ +-#This installs the Android SDK (Software Development Kit) +-#which is needed for the compilation of the Java project. +-source $ANDROID_DIR/android_variables.sh ++#!/bin/bash + +-step=1; ++# This installs the Android SDK (Software Development Kit) ++# which is needed for the compilation of the Java project. + +-#Different steps here. +-#1: install sdk, ant and sdk tools +-#2: install an emulator. +-#3: test the emulator +-#4: cleanup ++source $ANDROID_DIR/android_aux.sh + ++# Different steps here. ++# 0: do all ++# 1: install sdk, ant and sdk tools ++# 2: install an emulator. ++# 3: test the emulator ++# 4: cleanup ++ + present_dir=`pwd`; + sd_card="issm-sdcard" + +-((tmp=$1 )) ++if [[ $step == "1" || $step == "0" ]]; then + +-if [[ $tmp -ge "1" && $tmp -le "4" ]]; then +- step=$1 +-else +- echo "Using default step: " $step +-fi +- +-if [[ $step == "1" ]]; then +- +- #Cleanup the install ++ # Cleanup the install + rm -rf install-sdk + +- #Download from ISSM server ++ # Download from ISSM server + $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-sdk_r'$sdk_rev'-macosx.zip' 'android-sdk_r'${sdk_rev}'-macosx.zip' + + # Install Android SDK and NDK. + unzip -o android-sdk_r${sdk_rev}-macosx.zip + +- #Move to install ++ # Move to install + mv -f android-sdk-macosx install-sdk + +- #Post_install configuration: +- #We need specific settings for specific platforms, for the SDK to +- #function properly ++ # Post_install configuration: ++ # We need specific settings for specific platforms, for the SDK to ++ # function properly + +- #For now, we need to install: +- #android sdk platform tools +- #and a specific android api: API 16, API 15 and API 14 +- #Note: API 16, API 15 and 14 correspond to Android 4.1, 4.0.3 and 4.0 respectively. ++ # For now, we need to install: ++ # android sdk platform tools ++ # and a specific android api: API 16, API 15 and API 14 ++ # Note: API 16, API 15 and 14 correspond to Android 4.1, 4.0.3 and 4.0 respectively. + + cd install-sdk/tools/ && source ./android update sdk -t platform-tool,${api_levels},system-image --no-ui + + fi + +-if [[ $step == "2" ]]; then ++if [[ $step == "2" || $step == "0" ]]; then + +- #Once this is done, we need to install an emulator. Location will default to ~/.android/avd, +- #which we will move to $ISSM_DIR/externalpackages/android-emulators. +- #For now, it's called: Android-4.0.3 ++ # Once this is done, we need to install an emulator. Location will default to ~/.android/avd, ++ # which we will move to $ISSM_DIR/externalpackages/android-emulators. ++ # For now, it's called: Android-4.0.3 + +- #Here we delete the Android-4.0.3 device if it already exists. ++ # Here we delete the Android-4.0.3 device if it already exists. + cd $present_dir/install-sdk/tools + + if [ -e $ANDROID_DIR/android-emulators/$default_droid ] +@@ -63,31 +57,26 @@ + ./android delete avd -n $default_droid + fi + +- #Android will prompt the user to specify hardware emulation options. For now, default +- #default settings will suffice. Press 'enter' to take default settings or enter 'no'. ++ # Android will prompt the user to specify hardware emulation options. For now, default ++ # default settings will suffice. Press 'enter' to take default settings or enter 'no'. + + ./android create avd -f -n $default_droid -t 1 -p $ANDROID_DIR/android-emulators/$default_droid --abi armeabi-v7a + echo "Creating an SD Card" + ./mksdcard -l $sd_card 2G $ANDROID_DIR/android-emulators/$sd_card.img + fi + +-if [[ $step == "3" ]]; then +- #Here we will start up our default emulator to test that it is working properly. +- #Once the device has booted we will use the Android Debug Bridge tool to gain +- #a terminal in our device. ++if [[ $step == "3" || $step == "0" ]]; then ++ # Here we will start up our default emulator to test that it is working properly. ++ # Once the device has booted we will use the Android Debug Bridge tool to gain ++ # a terminal in our device. + + cd $present_dir/install-sdk/tools + ./emulator -avd $default_droid -sdcard $ANDROID_DIR/android-emulators/$sd_card.img & + + cd ../platform-tools + ./adb wait-for-device shell +- #./adb wait-for-device shell mount -o rw,remount -t yaffs2 /dev/block/mtdblock1 /system +- #./adb wait-for-device shell +- #./adb push $ISSM_TIER/src/c/issm.exe /data/issm.exe +- #./adb shell chmod 777 /data/issm.exe +- #./adb shell /data/issm.exe + fi + +-if [[ $step == "4" ]]; then ++if [[ $step == "4" || $step == "0" ]]; then + rm -rf install-sdk + fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android_aux.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android_aux.sh (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android_aux.sh (revision 12738) +@@ -0,0 +1,30 @@ ++#!/bin/bash ++# ++# android_aux.sh serves as an auxiliary script for all installation ++# scripts with the Android suffix. ++# ++# TODO: include M4 macros for generic options. ++# ++ ++sdk_rev=20 ++ndk_rev=8 ++api_levels="android-14,android-15,android-16" ++host_triplet="arm-linux-androideabi" ++default_droid="android-4.1" ++ ++step=0; ++j=1; ++ ++echo Number of arguments is: $# ++for arg in $* ++do ++ if [[ "$arg" =~ --step=([0-9])* ]]; then ++ step=${BASH_REMATCH[1]}; ++ echo "Setting step to: " $step ++ elif [[ "$arg" =~ -j=([0-9])* ]]; then ++ j=${BASH_REMATCH[1]}; ++ echo "Number of jobs set to: " $j ++ else ++ echo "Option not recognized" ++ fi ++done +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-ndk/install.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-ndk/install.sh (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/android/android-ndk/install.sh (revision 12738) +@@ -1,27 +1,31 @@ +-#This installs the Android NDK (Native Development Kit) +-#which is needed for the compilation of C/C++ code into the +-#native architecture of the Android device. ++#!/bin/bash + +-#The android-ndk-r8-darwin-x86.tar.bz2 ndk.tar.bz2 file was downloaded +-#from the android developer website: +-source $ANDROID_DIR/android_variables.sh ++# This installs the Android NDK (Native Development Kit) ++# which is needed for the compilation of C/C++ code into the ++# native architecture of the Android device. + +-#Cleanup the install +-rm -rf install +-rm -rf $ANDROID_DIR/arm-linux-android-${default_droid} ++# The android-ndk-r8-darwin-x86.tar.bz2 ndk.tar.bz2 file was downloaded ++# from the android developer website: ++source $ANDROID_DIR/android_aux.sh + +-#Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-ndk-r'${ndk_rev}'-darwin-x86.tar.bz2' 'ndk.tar.bz2' ++if [[ $step == "1" || $step == "0" ]]; then ++ # Cleanup the install ++ rm -rf install ++ rm -rf $ANDROID_DIR/arm-linux-android-${default_droid} + +-# Install Android SDK and NDK. +-bunzip2 ndk.tar.bz2 +-tar -xvf ndk.tar +-rm -rf ndk.tar ndk.tar.bz2 ++ # Download from ISSM server ++ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/android-ndk-r'${ndk_rev}'-darwin-x86.tar.bz2' 'ndk.tar.bz2' + +-#Move to install +-mv android-ndk-r${ndk_rev} install ++ # Untar ++ tar -zxvf ndk.tar.bz2 ++ rm -rf ndk.tar ndk.tar.bz2 + +-#Create Standalone Development Directory +-#Note: API-14 corresponds to Android 4.0 although we are +-#calling our toolchain 4.1 to agree with our device. +-$ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-14 --install-dir=$ANDROID_DIR/arm-linux-android-4.0 ++ # Move to install ++ mv android-ndk-r${ndk_rev} install ++fi ++ ++# Create Standalone Development Directory ++# Note: API-14 corresponds to Android 4.0. ++if [[ $step == "2" || $step == "0" ]]; then ++ $ANDROID_NDK_DIR/build/tools/make-standalone-toolchain.sh --platform=android-14 --install-dir=$ANDROID_DIR/arm-linux-android-4.0 ++fi +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-android.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-android.sh (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/gsl/install-android.sh (revision 12738) +@@ -1,33 +1,43 @@ + #!/bin/bash +-source $ANDROID_DIR/android_variables.sh + +-#Some cleanup +-rm -rf src install gsl-1.15 +-mkdir src install ++source $ANDROID_DIR/android_aux.sh + +-#Download from ISSM server +-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' ++if [[ $step == "1" || $step == "0" ]]; then + +-#Untar +-tar -zxvf gsl-1.15.tar.gz ++ #Some cleanup ++ rm -rf src install gsl-1.15 ++ mkdir src install + +-#Move gsl into src directory +-mv gsl-1.15/* src +-rm -rf gsl-1.15 ++ #Download from ISSM server ++ $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/gsl-1.15.tar.gz' 'gsl-1.15.tar.gz' + ++ #Untar ++ tar -zxvf gsl-1.15.tar.gz ++ ++ #Move gsl into src directory ++ mv gsl-1.15/* src ++ rm -rf gsl-1.15 ++fi ++ + #Configure gsl +-cd src ++if [[ $step == "2" || $step == "0" ]]; then ++ cd src ++ ++ autoreconf -iv --force -I "$ISSM_DIR/m4/" + +-./configure \ +- --build="i386-apple-darwin10.8.0" \ +- --host=$host_triplet\ +- --prefix="$ISSM_DIR/externalpackages/gsl/install" ++ ./configure \ ++ --build="i386-apple-darwin10.8.0" \ ++ --host=$host_triplet\ ++ --prefix="$ISSM_DIR/externalpackages/gsl/install/" ++fi + + #Compile gsl +-if [ -z $1 ]; then +- make +-else +- make -j $1 ++if [[ $step == "3" || $step == "0" ]]; then ++ if [ -z $1 ]; then ++ make 12 ++ else ++ make -j 12 ++ fi ++ ++ make install + fi +- +-make install +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/triangle/install-android.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/triangle/install-android.sh (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/externalpackages/triangle/install-android.sh (revision 12738) +@@ -1,35 +1,34 @@ + #!/bin/bash +-source $ANDROID_DIR/android_variables.sh +-export toolchain_path ++source $ANDROID_DIR/android_aux.sh + +-#use matlab? ++# use matlab? + matlab=0 + +-#Some cleanup ++# Some cleanup + rm -rf install triangle + mkdir install + +-#Download from ISSM server ++# Download from ISSM server + $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/triangle.zip' 'triangle.zip' + +-#Untar ++# Untar + cd install + cp ../triangle.zip ./ + unzip triangle.zip + +-#copy new makefile ++# copy new makefile + cp ../configs//android/configure.make ./ + cp ../makefile ./ + +-#Patch triangle.c ++# Patch triangle.c + if [[ $matlab == "1" ]];then + patch triangle.c ../triangle.c.patch.matlab + else + patch triangle.c ../triangle.c.patch.python + fi + +-#Compile triangle +-make ++# Compile triangle ++make -j $j + +-#Patch triangle.h ++# Patch triangle.h + patch triangle.h ../triangle.h.patch +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12738) +@@ -4,6 +4,10 @@ + + #Library declaration {{{ + lib_LIBRARIES = libISSMCore.a libISSMOverload.a ++ ++if SHARED ++lib_LTLIBRARIES = libISSM.la libISSMCore.la libISSMOverload.la ++endif + if PYTHON + lib_LIBRARIES += libISSMPython.a + endif +@@ -997,6 +1001,15 @@ + libISSMCore_a_SOURCES = $(issm_sources) + libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS) + ++if SHARED ++libISSM_la_SOURCES = solutions/issm.cpp ++libISSM_la_LIBADD = @LTLIBOBJS@ ++libISSM_la_LDFLAGS = -prefer-pic ++ ++libISSMCore_la_SOURCES = $(issm_sources) ++libISSMOverload_la_SOURCES = ./shared/String/stricmp.c ++endif ++ + if MODULES + libISSMModules_a_SOURCES = $(module_sources) + libISSMModules_a_SOURCES += $(bamg_sources) +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-arm-linux.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-arm-linux.sh (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configs/config-arm-linux.sh (revision 12738) +@@ -4,6 +4,7 @@ + --prefix=$ISSM_DIR \ + --build="i386-apple-darwin10.8.0" \ + --host="arm-linux-androideabi" \ ++ --enable-shared \ + --without-fortran \ + --without-modules \ + --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12738) +@@ -11,7 +11,6 @@ + AC_PROG_CXX([cccl cl icl g++]) + AC_PROG_F77([ifort g77 gfortran]) + #Libraries and linking +-AC_PROG_RANLIB + AC_F77_LIBRARY_LDFLAGS + AC_PATH_XTRA #figure out X library and include paths + +@@ -22,15 +21,18 @@ + AM_SILENT_RULES([yes]) #Do not show compilation command by default + AM_PROG_CC_C_O + +-##LIBTOOL? +-#AC_PROG_LIBTOOL ++AM_PROG_AR ++ ++# To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized ++# even if all linking is static, since, if not shared libraries are to be produce, libtool ++# will act simply as a wrapper around AR and Ranlib. ++# + #LT_INIT + + #Run issm_options.m4 + ISSM_OPTIONS + + #AM_PROG_AR must be placed after ISSM_OPTIONS +-AM_PROG_AR + + #List all Makefiles + AC_CONFIG_FILES([Makefile +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/Makefile.am +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/Makefile.am (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/Makefile.am (revision 12738) +@@ -1,3 +1,3 @@ +-EXTRA_DIST = reconf scripts test m4 examples cron etc doc packages contributors.txt ++EXTRA_DIST = reconf scripts test m4 examples cron etc doc packages contributors.txt + SUBDIRS = src bin + bin_SCRIPTS=config.h startup.m README.rtf +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment_variables.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment_variables.sh (revision 12737) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment_variables.sh (revision 12738) +@@ -181,9 +181,6 @@ + #android-sdk + ANDROID_SDK_DIR="$ANDROID_DIR/android-sdk/install-sdk" + +-#android-ant +-ANDROID_ANT_DIR="$ANDROID_DIR/android-sdk/install-ant" +- + #gsl + GSL_DIR="$ISSM_DIR/externalpackages/gsl/install" + Index: /issm/oecreview/Archive/12678-13393/ISSM-12738-12739.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12738-12739.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12738-12739.diff (revision 13394) @@ -0,0 +1,25 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 (revision 12738) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 (revision 12739) +@@ -541,10 +541,10 @@ + AS_HELP_STRING([--with-metis-dir=DIR],[metis root directory. necessary for serial build]), + [METIS_ROOT=$withval],[METIS_ROOT=""]) + ++ AC_MSG_CHECKING(for metis headers and libraries in $METIS_ROOT) ++ + if test -d "$METIS_ROOT"; then + +- AC_MSG_CHECKING(for metis headers and libraries in $METIS_ROOT) +- + dnl first figure out version of metis: does the VERSION file exist? + if test -e "$METIS_ROOT/VERSION"; then + METIS_VERSION=4 +@@ -597,6 +597,7 @@ + HAVE_METIS=no + fi + AM_CONDITIONAL([METIS], [test x$HAVE_METIS = xyes]) ++ AC_MSG_RESULT($HAVE_METIS) + dnl }}} + dnl mpi{{{ + AC_MSG_CHECKING(for mpi) Index: /issm/oecreview/Archive/12678-13393/ISSM-12739-12740.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12739-12740.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12739-12740.diff (revision 13394) @@ -0,0 +1,42 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12739) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12740) +@@ -3,11 +3,11 @@ + EXEEXT=$(ISSMEXT) + + #Library declaration {{{ +-lib_LIBRARIES = libISSMCore.a libISSMOverload.a ++#lib_LIBRARIES = libISSMCore.a libISSMOverload.a + +-if SHARED +-lib_LTLIBRARIES = libISSM.la libISSMCore.la libISSMOverload.la +-endif ++#if SHARED ++#lib_LTLIBRARIES = libISSM.la libISSMCore.la libISSMOverload.la ++#endif + if PYTHON + lib_LIBRARIES += libISSMPython.a + endif +@@ -1001,14 +1001,14 @@ + libISSMCore_a_SOURCES = $(issm_sources) + libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS) + +-if SHARED +-libISSM_la_SOURCES = solutions/issm.cpp +-libISSM_la_LIBADD = @LTLIBOBJS@ +-libISSM_la_LDFLAGS = -prefer-pic ++#if SHARED ++#libISSM_la_SOURCES = solutions/issm.cpp ++#libISSM_la_LIBADD = @LTLIBOBJS@ ++#libISSM_la_LDFLAGS = -prefer-pic + +-libISSMCore_la_SOURCES = $(issm_sources) +-libISSMOverload_la_SOURCES = ./shared/String/stricmp.c +-endif ++#libISSMCore_la_SOURCES = $(issm_sources) ++#libISSMOverload_la_SOURCES = ./shared/String/stricmp.c ++#endif + + if MODULES + libISSMModules_a_SOURCES = $(module_sources) Index: /issm/oecreview/Archive/12678-13393/ISSM-12740-12741.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12740-12741.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12740-12741.diff (revision 13394) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12740) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12741) +@@ -3,7 +3,7 @@ + EXEEXT=$(ISSMEXT) + + #Library declaration {{{ +-#lib_LIBRARIES = libISSMCore.a libISSMOverload.a ++lib_LIBRARIES = libISSMCore.a libISSMOverload.a + + #if SHARED + #lib_LTLIBRARIES = libISSM.la libISSMCore.la libISSMOverload.la Index: /issm/oecreview/Archive/12678-13393/ISSM-12741-12742.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12741-12742.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12741-12742.diff (revision 13394) @@ -0,0 +1,12 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12741) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12742) +@@ -22,6 +22,7 @@ + AM_PROG_CC_C_O + + AM_PROG_AR ++AC_PROG_RANLIB + + # To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized + # even if all linking is static, since, if not shared libraries are to be produce, libtool Index: /issm/oecreview/Archive/12678-13393/ISSM-12742-12743.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12742-12743.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12742-12743.diff (revision 13394) @@ -0,0 +1,246 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.py (revision 12743) +@@ -0,0 +1,79 @@ ++""" ++SCPIN get packages from host, using scp on unix, and pscp on windows ++ ++ usage: scpin(host,packages,path) ++ ++ ++""" ++ ++import socket ++import platform ++import subprocess ++import os ++import shutil ++from MatlabFuncs import * ++ ++def scpin(host, login,port,path, packages): ++ ++ #first get hostname ++ hostname=socket.gethostname().lower().split('.')[0] ++ ++ #first be sure packages are not in the current directory, this could conflict with pscp on windows. ++ #remove warnings in case the files do not exist ++ for package in packages: ++ try: ++ os.remove(package) ++ except OSError as e: ++ pass ++ ++ #if hostname and host are the same, do a simple copy ++ if strcmpi(hostname,host): ++ ++ for package in packages: ++ try: ++ shutil.copy(os.path.join(path,package),os.getcwd()) #keep going, even if success=0 ++ except OSError as e: ++ pass ++ ++ else: ++ ++ if 'Windows' in platform.system(): ++ #use the putty project pscp.exe: it should be in the path. ++ ++ #get ISSM_DIR variable ++ if 'ISSM_DIR_WIN' in os.environ: ++ ISSM_DIR=os.environ['ISSM_DIR_WIN'][1:-2] ++ else: ++ raise OSError("scpin error message: could not find ISSM_DIR_WIN environment variable.") ++ ++ username=raw_input('Username: (quoted string) ') ++ key=raw_input('Key: (quoted string) ') ++ ++ for package in packages: ++ try: ++ subprocess.check_call('%s/externalpackages/ssh/pscp.exe -l "%s" -pw "%s" %s:%s %s' % (ISSM_DIR,username,key,host,os.path.join(path,package),os.getcwd()),shell=True) ++ except CalledProcessError as e: ++ raise CalledProcessError("scpin error message: could not call putty pscp.") ++ ++ else: ++ #just use standard unix scp ++ #string to copy multiple files using scp: ++ if len(packages)==1: ++ string=packages[0] ++ else: ++ string='{' ++ for package in packages: ++ string+=packages[i]+',' ++ string=string[:-1]+'}' ++ ++ ++ if port: ++ subprocess.call('scp -P %d %s@localhost:%s %s' % (port,login,os.path.join(path,string),os.getcwd),shell=True) ++ else: ++ subprocess.call('scp %s@%s:%s %s' % (login,host,os.path.join(path,string),os.getcwd),shell=True) ++ ++ #check scp worked ++ for package in packages: ++ if not os.path.exists(os.path.join('.',package)): ++ raise OSError("scpin error message: could not call scp on *nix system.") ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.py (revision 12743) +@@ -0,0 +1,61 @@ ++""" ++SCPOUT send packages to a host, using scp on unix, and pscp on windows ++ ++ usage: scpout(host,path,packages) ++ ++ ++""" ++ ++import socket ++import platform ++import subprocess ++import os ++import shutil ++from MatlabFuncs import * ++ ++def issmscpout(host,path,login,port,packages): ++ ++ #get hostname ++ hostname=socket.gethostname().lower().split('.')[0] ++ ++ #if hostname and host are the same, do a simple copy ++ ++ if strcmpi(host,hostname): ++ for package in packages: ++ here=os.getcwd() ++ os.chdir(path) ++ shutil.rmtree(package) ++ subprocess.call('ln -s %s %s' % (os.path.join(here,package),path),shell=True) ++ os.chdir(here) ++ else: ++ if 'Windows' in platform.system(): ++ #use the putty project pscp.exe: it should be in the path. ++ ++ #get ISSM_DIR variable ++ if 'ISSM_DIR_WIN' in os.environ: ++ ISSM_DIR=os.environ['ISSM_DIR_WIN'][1:-2] ++ else: ++ raise OSError("scpout error message: could not find ISSM_DIR_WIN environment variable.") ++ ++ username=raw_input('Username: (quoted string) ') ++ key=raw_input('Key: (quoted string) ') ++ ++ for package in packages: ++ try: ++ subprocess.check_call('%s/externalpackages/ssh/pscp.exe -l "%s" -pw "%s" %s %s:%s' % (ISSM_DIR,username,key,package,host,path),shell=True) ++ except CalledProcessError as e: ++ raise CalledProcessError("scpout error message: could not call putty pscp.") ++ ++ else: ++ #just use standard unix scp ++ #create string of packages being sent ++ string='' ++ for package in packages: ++ string+=' '+package ++ string+=' ' ++ ++ if port: ++ subprocess.call('scp -P %d %s %s@localhost:%s' % (port,string,login,path),shell=True) ++ else: ++ subprocess.call('scp %s %s@%s:%s' % (string,login,host,path),shell=True) ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.py (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.py (revision 12743) +@@ -0,0 +1,43 @@ ++""" ++ISSMSSH - wrapper for OS independent ssh command. ++ ++ usage: ++ issmssh(host,command) ++""" ++ ++import socket ++import platform ++import subprocess ++import os ++from MatlabFuncs import * ++ ++def issmssh(host,login,port,command): ++ ++ #first get hostname ++ hostname=socket.gethostname().lower().split('.')[0] ++ ++ #if same as host, just run the command. ++ if strcmpi(host,hostname): ++ subprocess.call(command,shell=True) ++ else: ++ if 'Windows' in platform.system(): ++ #use the putty project plink.exe: it should be in the path. ++ ++ #get ISSM_DIR variable ++ if 'ISSM_DIR_WIN' in os.environ: ++ ISSM_DIR=os.environ['ISSM_DIR_WIN'][1:-2] ++ else: ++ raise OSError("issmssh error message: could not find ISSM_DIR_WIN environment variable.") ++ ++ username=raw_input('Username: (quoted string) ') ++ key=raw_input('Key: (quoted string) ') ++ ++ subprocess.call('%s/externalpackages/ssh/plink.exe -ssh -l "%s" -pw "%s" %s "%s"' % (ISSM_DIR,username,key,host,command),shell=True); ++ ++ else: ++ #just use standard unix ssh ++ if port: ++ subprocess.call('ssh -l %s -p %d localhost "%s"' % (login,port,command),shell=True) ++ else: ++ subprocess.call('ssh -l %s %s "%s"' % (login,host,command),shell=True) ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py (revision 12742) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/ispetsc.py (revision 12743) +@@ -36,3 +36,4 @@ + raise RuntimeError("could not determine whether PETSC was or was not compiled.") + + return flag ++ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.m (revision 12742) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpin.m (revision 12743) +@@ -34,7 +34,7 @@ + %get ISSM_DIR variable + [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); + if status, +- error('scpin error message: could not find ISSM_DIR_WIN envirnoment variable'); ++ error('scpin error message: could not find ISSM_DIR_WIN environment variable'); + end + ISSM_DIR=ISSM_DIR(2:end-2); + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.m (revision 12742) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmscpout.m (revision 12743) +@@ -25,7 +25,7 @@ + %get ISSM_DIR variable + [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); + if status, +- error('scpout error message: could not find ISSM_DIR_WIN envirnoment variable'); ++ error('scpout error message: could not find ISSM_DIR_WIN environment variable'); + end + ISSM_DIR=ISSM_DIR(2:end-2); + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.m (revision 12742) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/OS/issmssh.m (revision 12743) +@@ -17,7 +17,7 @@ + %get ISSM_DIR variable + [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); + if status, +- error('issmssh error message: could not find ISSM_DIR_WIN envirnoment variable'); ++ error('issmssh error message: could not find ISSM_DIR_WIN environment variable'); + end + ISSM_DIR=ISSM_DIR(2:end-2); + Index: /issm/oecreview/Archive/12678-13393/ISSM-12743-12744.diff =================================================================== --- /issm/oecreview/Archive/12678-13393/ISSM-12743-12744.diff (revision 13394) +++ /issm/oecreview/Archive/12678-13393/ISSM-12743-12744.diff (revision 13394) @@ -0,0 +1,1157 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12744) +@@ -269,6 +269,7 @@ + IntInputEnum, + IntParamEnum, + IntVecParamEnum, ++ TransientParamEnum, + MacAyeal2dIceFrontEnum, + MacAyeal3dIceFrontEnum, + MaticeEnum, +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12744) +@@ -273,6 +273,7 @@ + else if (strcmp(name,"IntInput")==0) return IntInputEnum; + else if (strcmp(name,"IntParam")==0) return IntParamEnum; + else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; ++ else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; + else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; + else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; + else if (strcmp(name,"Matice")==0) return MaticeEnum; +@@ -382,11 +383,11 @@ + else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; + else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; + else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; +- else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; + else stage=4; + } + if(stage==4){ +- if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; ++ if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; ++ else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; + else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; + else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; + else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12744) +@@ -266,6 +266,7 @@ + case IntInputEnum : return "IntInput"; + case IntParamEnum : return "IntParam"; + case IntVecParamEnum : return "IntVecParam"; ++ case TransientParamEnum : return "TransientParam"; + case MacAyeal2dIceFrontEnum : return "MacAyeal2dIceFront"; + case MacAyeal3dIceFrontEnum : return "MacAyeal3dIceFront"; + case MaticeEnum : return "Matice"; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12744) +@@ -153,6 +153,8 @@ + ./objects/Params/MatrixParam.cpp\ + ./objects/Params/VectorParam.h\ + ./objects/Params/VectorParam.cpp\ ++ ./objects/Params/TransientParam.h\ ++ ./objects/Params/TransientParam.cpp\ + ./Container/Container.h\ + ./Container/Constraints.h\ + ./Container/Constraints.cpp\ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12744) +@@ -42,33 +42,34 @@ + /*}}}*/ + /*Param virtual functions definitions: {{{*/ + int InstanceEnum(){return enum_type;} +- void GetParameterValue(bool* pbool){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a bool");} +- void GetParameterValue(int* pinteger){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");} ++ void GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");} ++ void GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");} + void GetParameterValue(int** pintarray,int* pM); +- void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");}; +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} ++ void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}; ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");} + void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM); + void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN); +- void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");} + +- void SetValue(bool boolean){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a boolean");} +- void SetValue(int integer){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an integer");} +- void SetValue(IssmDouble scalar){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a scalar");} +- void SetValue(char* string){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} ++ void SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");} ++ void SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");} + void SetValue(IssmDouble* IssmDoublearray,int M); +- void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble mat array");} +- void SetValue(int* intarray,int M){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int mat array");}; +- void SetValue(int* pintarray,int M,int N){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int mat array");} +- void SetValue(Vector* vec){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} +- void SetValue(FILE* fid){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} +- void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} ++ void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");} ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");}; ++ void SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");} ++ void SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");} ++ void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} + void UnitConversion(int direction_enum); + + void GetParameterName(char**pname); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12744) +@@ -47,28 +47,29 @@ + void GetParameterValue(int** pintarray,int* pM); + void GetParameterValue(int** pintarray,int* pM,int* pN); + void GetParameterValue(IssmDouble* pIssmDouble){*pIssmDouble=value;} +- void GetParameterValue(char** pstring){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");} + void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM); + void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN); +- void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");} + + void SetValue(bool boolean){this->value=(IssmDouble)boolean;} + void SetValue(int integer){this->value=(IssmDouble)integer;} + void SetValue(IssmDouble scalar){this->value=(IssmDouble)scalar;} +- void SetValue(char* string){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(int* intarray,int M){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");} +- void SetValue(int* pintarray,int M,int N){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");} +- void SetValue(Vector* vec){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} +- void SetValue(FILE* fid){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} +- void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");} ++ void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");} ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");} ++ void SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");} ++ void SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");} ++ void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} + void UnitConversion(int direction_enum); + + void GetParameterName(char**pname); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12744) +@@ -44,31 +44,32 @@ + /*}}}*/ + /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} +- void GetParameterValue(bool* pbool){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a bool");} +- void GetParameterValue(int* pinteger){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");} +- void GetParameterValue(int** pintarray,int* pM){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} +- void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} ++ void GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a bool");} ++ void GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return an integer");} ++ void GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return an array of integers");} ++ void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return an array of integers");} ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a string array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble array");} + void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims); +- void GetParameterValue(Vector** pvec){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a FILE");} + +- void SetValue(bool boolean){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a boolean");} +- void SetValue(int integer){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an integer");} +- void SetValue(IssmDouble scalar){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a scalar");} +- void SetValue(char* string){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble vec array");} +- void SetValue(IssmDouble* IssmDoublearray,int M,int N){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble mat array");} +- void SetValue(int* intarray,int M){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int vec array");} +- void SetValue(int* intarray,int M,int N){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int mat array");} +- void SetValue(Vector* vec){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("DoubleMatArray param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} ++ void SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a boolean");} ++ void SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold an integer");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a scalar");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a IssmDouble vec array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a IssmDouble mat array");} ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a int vec array");} ++ void SetValue(int* intarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a int mat array");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a Mat");} + void SetValue(FILE* fid){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} + void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array); + void UnitConversion(int direction_enum); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12744) +@@ -43,33 +43,34 @@ + /*}}}*/ + /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} +- void GetParameterValue(bool* pbool){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a bool");} +- void GetParameterValue(int* pinteger){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");} +- void GetParameterValue(int** pintarray,int* pM){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} ++ void GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");} ++ void GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");} ++ void GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");} + void GetParameterValue(int** pintarray,int* pM,int* pN); +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");} + void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN); +- void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");} + +- void SetValue(bool boolean){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a boolean");} +- void SetValue(int integer){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an integer");} +- void SetValue(IssmDouble scalar){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a scalar");} +- void SetValue(char* string){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble vec array");} ++ void SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");} ++ void SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");} + void SetValue(IssmDouble* IssmDoublearray,int M,int N); +- void SetValue(int* intarray,int M){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int vec array");} +- void SetValue(int* intarray,int M,int N){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int mat array");}; +- void SetValue(Vector* vec){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} +- void SetValue(FILE* fid){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} +- void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("DoubleMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int vec array");} ++ void SetValue(int* intarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");}; ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");} ++ void SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");} ++ void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} + void UnitConversion(int direction_enum); + IssmDouble* GetPointer(void); + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/Param.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/Param.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/Param.h (revision 12744) +@@ -31,6 +31,7 @@ + virtual void GetParameterValue(int** pintarray,int* pM)=0; + virtual void GetParameterValue(int** pintarray,int* pM,int* pN)=0; + virtual void GetParameterValue(IssmDouble* pIssmDouble)=0; ++ virtual void GetParameterValue(IssmDouble* pdouble,IssmDouble time)=0; + virtual void GetParameterValue(char** pstring)=0; + virtual void GetParameterValue(char*** pstringarray,int* pM)=0; + virtual void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM)=0; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.h (revision 12744) +@@ -41,31 +41,32 @@ + /*}}}*/ + /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} +- void GetParameterValue(bool* pbool){ _error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a bool");} +- void GetParameterValue(int* pinteger){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(int** pintarray,int* pM){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} ++ void GetParameterValue(bool* pbool){ _error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");} ++ void GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");} + void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");} + void GetParameterValue(FILE** pfid){*pfid=value;}; + +- void SetValue(bool boolean){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(int integer){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(IssmDouble scalar){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char* string){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(int* intarray,int M){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");} +- void SetValue(int* pintarray,int M,int N){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");} +- void SetValue(Vector* vec){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("FileParam of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} ++ void SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");} ++ void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");} ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");} ++ void SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");} + void SetValue(FILE* fid){_error2_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} + void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} + void UnitConversion(int direction_enum); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12744) +@@ -43,33 +43,34 @@ + /*}}}*/ + /*Param virtual functions definitions: {{{*/ + int InstanceEnum(){return enum_type;} +- void GetParameterValue(bool* pbool){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a bool");} +- void GetParameterValue(int* pinteger){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");} ++ void GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");} ++ void GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");} + void GetParameterValue(int** pintarray,int* pM); +- void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix");} +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array (maybe in serial?)");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix");} ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array (maybe in serial?)");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");} + +- void SetValue(bool boolean){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a boolean");} +- void SetValue(int integer){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an integer");} +- void SetValue(IssmDouble scalar){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a scalar");} +- void SetValue(char* string){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble mat array");} +- void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble mat array");} ++ void SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");} ++ void SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");} ++ void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");} + void SetValue(int* intarray,int M); +- void SetValue(int* pintarray,int M,int N){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int mat array");} +- void SetValue(Vector* vec){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} +- void SetValue(FILE* fid){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} +- void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("IntVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} ++ void SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");} ++ void SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");} ++ void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} + void UnitConversion(int direction_enum); + + void GetParameterName(char**pname); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.h (revision 12744) +@@ -42,33 +42,34 @@ + /*}}}*/ + /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} +- void GetParameterValue(bool* pbool){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a bool");} ++ void GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");} + void GetParameterValue(int* pinteger){*pinteger=value;} +- void GetParameterValue(int** pintarray,int* pM){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} +- void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");} ++ void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");} ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");} + +- void SetValue(bool boolean){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a bool");} ++ void SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a bool");} + void SetValue(int integer){this->value=integer;} +- void SetValue(int* intarray,int M){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an int array");} +- void SetValue(int* intarray,int M,int N){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an int array");} +- void SetValue(IssmDouble scalar){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an IssmDouble");} +- void SetValue(char* string){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(Vector* vec){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} +- void SetValue(FILE* fid){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} +- void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Int param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an int array");} ++ void SetValue(int* intarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an int array");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an IssmDouble");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");} ++ void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");} ++ void SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");} ++ void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} + void UnitConversion(int direction_enum); + + void GetParameterName(char**pname); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12744) +@@ -42,32 +42,33 @@ + /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){*pbool=value;} +- void GetParameterValue(int* pinteger){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");} +- void GetParameterValue(int** pintarray,int* pM){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} +- void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return an integer");} ++ void GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return an array of integers");} ++ void GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return an array of integers");} ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a string array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a matrix array");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a FILE");} + + void SetValue(bool boolean){this->value=boolean;} +- void SetValue(int integer){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an int");} +- void SetValue(IssmDouble scalar){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an IssmPDouble");} +- void SetValue(char* string){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} +- void SetValue(int* intarray,int M){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");} +- void SetValue(int* pintarray,int M,int N){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");} +- void SetValue(Vector* vec){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} +- void SetValue(FILE* fid){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} +- void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} ++ void SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold an int");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold an IssmPDouble");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} ++ void SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");} ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a int array");} ++ void SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a int array");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a Mat");} ++ void SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a FILE");} ++ void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold an array of matrices");} + void UnitConversion(int direction_enum); + + void GetParameterName(char**pname); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12744) +@@ -43,33 +43,34 @@ + /*}}}*/ + /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} +- void GetParameterValue(bool* pbool){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a bool");} +- void GetParameterValue(int* pinteger){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");} +- void GetParameterValue(int** pintarray,int* pM){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");} ++ void GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");} ++ void GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");} ++ void GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");} + void GetParameterValue(int** pintarray,int* pM,int* pN); +- void GetParameterValue(IssmDouble* pIssmDouble){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble");} +- void GetParameterValue(char** pstring){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string");} +- void GetParameterValue(char*** pstringarray,int* pM){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a string array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a IssmDouble array");} +- void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");}; +- void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");} +- void GetParameterValue(Vector** pvec){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Vec");} +- void GetParameterValue(Matrix** pmat){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a Mat");} +- void GetParameterValue(FILE** pfid){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");} ++ void GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");} ++ void GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");} ++ void GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");} ++ void GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");} ++ void GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}; ++ void GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");} ++ void GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");} ++ void GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");} ++ void GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");} + +- void SetValue(bool boolean){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a boolean");} +- void SetValue(int integer){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an integer");} +- void SetValue(IssmDouble scalar){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a scalar");} +- void SetValue(char* string){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");} +- void SetValue(char** stringarray,int M){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");} +- void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble vec array");} +- void SetValue(IssmDouble* IssmDoublearray,int M,int N){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble vec array");}; +- void SetValue(int* intarray,int M){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int vec array");}; ++ void SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");} ++ void SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");} ++ void SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");} ++ void SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");} ++ void SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");} ++ void SetValue(IssmDouble* IssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");}; ++ void SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int vec array");}; + void SetValue(int* intarray,int M,int N); +- void SetValue(Vector* vec){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Vec");} +- void SetValue(Matrix* mat){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");} +- void SetValue(FILE* fid){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");} +- void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("IntMat param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");} ++ void SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");} ++ void SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");} ++ void SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");} ++ void SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");} + void UnitConversion(int direction_enum); + + void GetParameterName(char**pname); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp (revision 12743) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp (revision 12744) +@@ -23,7 +23,6 @@ + DoubleTransientMatParam::DoubleTransientMatParam(int in_enum_type,IssmDouble* in_value, int in_M,int in_N):DoubleMatParam(in_enum_type,in_value,in_M,in_N){ + } + /*}}}*/ +- + /*FUNCTION DoubleTransientMatParam::UnitConversion{{{*/ + void DoubleTransientMatParam::UnitConversion(int direction_enum){ + ::UnitConversion(this->value,(this->M-1)*this->N,direction_enum,this->enum_type); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/TransientParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/TransientParam.cpp (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/TransientParam.cpp (revision 12744) +@@ -0,0 +1,158 @@ ++/*!\file TransientParam.c ++ * \brief: implementation of the TransientParam object ++ */ ++ ++/*header files: */ ++/*{{{*/ ++#ifdef HAVE_CONFIG_H ++ #include ++#else ++#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" ++#endif ++ ++#include ++#include ++#include "../objects.h" ++#include "../../EnumDefinitions/EnumDefinitions.h" ++#include "../../shared/shared.h" ++#include "../../Container/Container.h" ++#include "../../include/include.h" ++/*}}}*/ ++ ++/*TransientParam constructors and destructor*/ ++/*FUNCTION TransientParam::TransientParam(){{{*/ ++TransientParam::TransientParam(){ ++ return; ++} ++/*}}}*/ ++/*FUNCTION TransientParam::TransientParam(int enum_type,IssmDoubleMat value){{{*/ ++TransientParam::TransientParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,int in_N){ ++ ++ _assert_(in_values && in_time); ++ ++ enum_type=in_enum_type; ++ N=in_N; ++ ++ values=xNew(N); ++ xMemCpy(values,in_values,N); ++ ++ timesteps=xNew(N); ++ xMemCpy(timesteps,in_time,N); ++} ++/*}}}*/ ++/*FUNCTION TransientParam::~TransientParam(){{{*/ ++TransientParam::~TransientParam(){ ++ xDelete(values); ++ xDelete(timesteps); ++} ++/*}}}*/ ++ ++/*Object virtual functions definitions:*/ ++/*FUNCTION TransientParam::Echo {{{*/ ++void TransientParam::Echo(void){ ++ ++ _printLine_("TransientParam:"); ++ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); ++ _printLine_(" size: " << this->N); ++ ++} ++/*}}}*/ ++/*FUNCTION TransientParam::DeepEcho{{{*/ ++void TransientParam::DeepEcho(void){ ++ ++ int i,j; ++ ++ _printLine_("TransientParam:"); ++ _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); ++ _printLine_(" size: " << this->N); ++ for(i=0;iN;i++){ ++ _printLine_( "time: " << this->timesteps[i] << " value: " << this->values[i]); ++ } ++} ++/*}}}*/ ++/*FUNCTION TransientParam::Id{{{*/ ++int TransientParam::Id(void){ return -1; } ++/*}}}*/ ++/*FUNCTION TransientParam::MyRank{{{*/ ++int TransientParam::MyRank(void){ ++ extern int my_rank; ++ return my_rank; ++} ++/*}}}*/ ++/*FUNCTION TransientParam::ObjectEnum{{{*/ ++int TransientParam::ObjectEnum(void){ ++ ++ return TransientParamEnum; ++ ++} ++/*}}}*/ ++/*FUNCTION TransientParam::copy{{{*/ ++Object* TransientParam::copy() { ++ ++ return new TransientParam(this->enum_type,this->values,this->timesteps,this->N); ++ ++} ++/*}}}*/ ++ ++/*TransientParam virtual functions definitions: */ ++/*FUNCTION TransientParam::GetParameterValue(IssmDouble* pdouble,IssmDouble time){{{*/ ++void TransientParam::GetParameterValue(IssmDouble* pdouble,IssmDouble time){ ++ ++ double output; ++ bool found; ++ ++ /*Ok, we have the time, go through the timesteps, and figure out which interval we ++ *fall within. Then interpolate the values on this interval: */ ++ if(timetimesteps[0]){ ++ /*get values for the first time: */ ++ output=this->values[0]; ++ found=true; ++ } ++ else if(time>this->timesteps[this->N-1]){ ++ /*get values for the last time: */ ++ output=this->values[this->N-1]; ++ found=true; ++ } ++ else{ ++ /*Find which interval we fall within: */ ++ for(int i=0;iN;i++){ ++ if(time==this->timesteps[i]){ ++ /*We are right on one step time: */ ++ output=this->values[i]; ++ found=true; ++ break; //we are done with the time interpolation. ++ } ++ else{ ++ if(this->timesteps[i]