Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 17925) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 17926) @@ -319,8 +319,4 @@ ./modules/ConfigureObjectsx/ConfigureObjectsx.h\ ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\ - ./modules/ComputeBasalStressx/ComputeBasalStressx.h\ - ./modules/ComputeBasalStressx/ComputeBasalStressx.cpp\ - ./modules/ComputeStrainRatex/ComputeStrainRatex.h\ - ./modules/ComputeStrainRatex/ComputeStrainRatex.cpp\ ./modules/SpcNodesx/SpcNodesx.h\ ./modules/SpcNodesx/SpcNodesx.cpp\ @@ -839,6 +835,4 @@ ./modules/ContourToNodesx/ContourToNodesx.cpp\ ./modules/ContourToNodesx/ContourToNodesx.h\ - ./modules/Reducevectorgtosx/Reducevectorgtosx.cpp\ - ./modules/Reducevectorgtosx/Reducevectorgtosx.h\ ./modules/NodeConnectivityx/NodeConnectivityx.cpp\ ./modules/NodeConnectivityx/NodeConnectivityx.h\ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 17926) @@ -174,6 +174,4 @@ virtual Element* GetUpperElement(void)=0; - virtual Element* GetLowerElement(void)=0; - virtual Element* GetSurfaceElement(void)=0; virtual Element* GetBasalElement(void)=0; @@ -249,5 +247,4 @@ virtual void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0; virtual void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum)=0; - virtual void GetNormalFromLSF(IssmDouble *pnormal)=0; virtual void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17926) @@ -139,51 +139,4 @@ else _error_("not implemented yet"); } -} -/*}}}*/ -/*FUNCTION Penta::BasalFrictionCreateInput {{{*/ -void Penta::BasalFrictionCreateInput(void){ - - /*Intermediaries */ - int count; - IssmDouble basalfriction[NUMVERTICES]; - IssmDouble alpha2 ,vx,vy; - Friction *friction = NULL; - GaussPenta *gauss = NULL; - - /* Basal friction can only be found at the base of an ice sheet: */ - if (!IsOnBase() || IsFloating()){ - //empty friction: - this->inputs->AddInput(new PentaInput(BasalFrictionEnum,&basalfriction[0],P1Enum)); - return; - } - - /*Retrieve all inputs and parameters*/ - Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); - Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - - /*Build friction element, needed later: */ - friction=new Friction(this,3); - - /* Start looping on the number of gauss 2d (nodes on the bedrock) */ - gauss=new GaussPenta(0,1,2,2); - count=0; - for(int ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - friction->GetAlpha2(&alpha2,gauss,vx_input,vy_input,vz_input); - vx_input->GetInputValue(&vx,gauss); - vy_input->GetInputValue(&vy,gauss); - basalfriction[count]=alpha2*(pow(vx,2.0)+pow(vy,2.0)); - count++; - } - - /*Create PentaVertex input, which will hold the basal friction:*/ - this->inputs->AddInput(new PentaInput(BasalFrictionEnum,&basalfriction[0],P1Enum)); - - /*Clean up and return*/ - delete gauss; - delete friction; } /*}}}*/ @@ -738,20 +691,4 @@ Element* upper_element=this->GetUpperPenta(); return upper_element; -} -/*}}}*/ -/*FUNCTION Penta::GetLowerElement{{{*/ -Element* Penta::GetLowerElement(void){ - - /*Output*/ - Element* lower_element=this->GetLowerPenta(); - return lower_element; -} -/*}}}*/ -/*FUNCTION Penta::GetSurfaceElement{{{*/ -Element* Penta::GetSurfaceElement(void){ - - /*Output*/ - Element* element=this->GetSurfacePenta(); - return element; } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 17926) @@ -52,5 +52,4 @@ /*}}}*/ /*Element virtual functions definitions: {{{*/ - void BasalFrictionCreateInput(void); IssmDouble CharacteristicLength(void){_error_("not implemented yet");}; void ComputeBasalStress(Vector* sigma_b); @@ -71,6 +70,4 @@ Penta* GetBasalPenta(void); Element* GetUpperElement(void); - Element* GetLowerElement(void); - Element* GetSurfaceElement(void); Element* GetBasalElement(void); void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); @@ -95,5 +92,4 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");}; - void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");}; void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm); void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe); Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 17926) @@ -799,22 +799,4 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctionsMINI{{{*/ -void PentaRef::GetNodalFunctionsMINI(IssmDouble* l1l7, Gauss* gauss_in){ - /*This routine returns the values of the nodal functions at the gaussian point.*/ - - /*Cast gauss to GaussPenta*/ - _assert_(gauss_in->Enum()==GaussPentaEnum); - GaussPenta* gauss = dynamic_cast(gauss_in); - - l1l7[0]=gauss->coord1*(1.0-gauss->coord4)/2.0; - l1l7[1]=gauss->coord2*(1.0-gauss->coord4)/2.0; - l1l7[2]=gauss->coord3*(1.0-gauss->coord4)/2.0; - l1l7[3]=gauss->coord1*(1.0+gauss->coord4)/2.0; - l1l7[4]=gauss->coord2*(1.0+gauss->coord4)/2.0; - l1l7[5]=gauss->coord3*(1.0+gauss->coord4)/2.0; - l1l7[6]=27*gauss->coord1*gauss->coord2*gauss->coord3*(1.0+gauss->coord4)*(1.0-gauss->coord4); - -} -/*}}}*/ /*FUNCTION PentaRef::GetNodalFunctionsMINIDerivatives{{{*/ void PentaRef::GetNodalFunctionsMINIDerivatives(IssmDouble* dbasismini,IssmDouble* xyz_list, Gauss* gauss){ Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h (revision 17926) @@ -29,5 +29,4 @@ void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement); void GetNodalFunctionsP1(IssmDouble* l1l6, Gauss* gauss); - void GetNodalFunctionsMINI(IssmDouble* l1l7, Gauss* gauss); void GetNodalFunctionsP1Derivatives(IssmDouble* dh1dh6,IssmDouble* xyz_list, Gauss* gauss); void GetNodalFunctionsMINIDerivatives(IssmDouble* dh1dh7,IssmDouble* xyz_list, Gauss* gauss); Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 17926) @@ -66,6 +66,4 @@ int FiniteElement(void); Element* GetUpperElement(void){_error_("not implemented yet");}; - Element* GetLowerElement(void){_error_("not implemented yet");}; - Element* GetSurfaceElement(void){_error_("not implemented yet");}; Element* GetBasalElement(void){_error_("not implemented yet");}; int GetNodeIndex(Node* node){_error_("not implemented yet");}; @@ -127,5 +125,4 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented");}; void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum); - void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");}; void GetSolutionFromInputsOneDof(Vector* solution,int enum_type){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/classes/Elements/SegRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/SegRef.cpp (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/SegRef.cpp (revision 17926) @@ -49,31 +49,4 @@ /*Reference Element numerics*/ -/*FUNCTION SegRef::GetBprimeMasstransport{{{*/ -void SegRef::GetBprimeMasstransport(IssmDouble* Bprime, IssmDouble* xyz_list, GaussSeg* gauss){ - /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. - * For node i, Bi' can be expressed in the actual coordinate system - * by: - * Bi_prime=[ dN/dx ] - * where N is the finiteelement function for node i. - * - * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes) - */ - - /*Fetch number of nodes for this finite element*/ - int numnodes = this->NumberofNodes(); - - /*Get nodal functions derivatives*/ - IssmDouble* dbasis=xNew(2*numnodes); - GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss); - - /*Build B': */ - for(int i=0;i(dbasis); -} -/*}}}*/ /*FUNCTION SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss){{{*/ void SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss){ Index: /issm/trunk-jpl/src/c/classes/Elements/SegRef.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/SegRef.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/SegRef.h (revision 17926) @@ -22,5 +22,4 @@ /*Management*/ void SetElementType(int type,int type_counter); - void GetBprimeMasstransport(IssmDouble* Bprime, IssmDouble* xyz_list, GaussSeg* gauss); void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussSeg* gauss); void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussSeg* gauss); Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17926) @@ -69,6 +69,4 @@ int FiniteElement(void); Element* GetUpperElement(void){_error_("not implemented yet");}; - Element* GetLowerElement(void){_error_("not implemented yet");}; - Element* GetSurfaceElement(void){_error_("not implemented yet");}; Element* GetBasalElement(void){_error_("not implemented yet");}; int GetNodeIndex(Node* node); @@ -132,6 +130,4 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");}; - void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");}; - void GetSolutionFromInputsOneDof(Vector* solution,int enum_type){_error_("not implemented yet");}; void InputDepthAverageAtBase(int enum_type,int average_enum_type){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/classes/Elements/TetraRef.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/TetraRef.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/TetraRef.h (revision 17926) @@ -22,5 +22,4 @@ /*Management*/ void SetElementType(int type,int type_counter); - void GetBprimeMasstransport(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTetra* gauss); void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTetra* gauss); void GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTetra* gauss); Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17926) @@ -913,36 +913,4 @@ xDelete(indicesfront); -}/*}}}*/ -void Tria::GetNormalFromLSF(IssmDouble *pnormal){/*{{{*/ - - /* Intermediaries */ - int i; - const int dim=2; - IssmDouble* xyz_list = NULL; - IssmDouble dlevelset[dim], norm_dlevelset; - IssmDouble normal[dim]={0.}; - - /*Retrieve all inputs and parameters*/ - Input* levelset_input=this->GetInput(MaskIceLevelsetEnum); _assert_(levelset_input); - this->GetVerticesCoordinates(&xyz_list); - - IssmDouble counter=0.; - Gauss* gauss = this->NewGauss(2); - for(int ig=gauss->begin();igend();ig++){ - /* Get normal on node */ - levelset_input->GetInputDerivativeValue(&dlevelset[0],xyz_list,gauss); - norm_dlevelset=0.; - for(i=0;i0.); - for(i=0;i(xyz_list); }/*}}}*/ /*FUNCTION Tria::GetNodeIndex {{{*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 17926) @@ -65,6 +65,4 @@ int FiniteElement(void); Element* GetUpperElement(void){_error_("not implemented yet");}; - Element* GetLowerElement(void){_error_("not implemented yet");}; - Element* GetSurfaceElement(void){_error_("not implemented yet");}; Element* GetBasalElement(void){_error_("not implemented yet");}; void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); @@ -110,5 +108,4 @@ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum); - void GetNormalFromLSF(IssmDouble *pnormal); bool IsZeroLevelset(int levelset_enum); bool IsIcefront(void); Index: /issm/trunk-jpl/src/c/classes/Materials/Material.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Material.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Materials/Material.h (revision 17926) @@ -30,5 +30,4 @@ virtual void GetViscosityDComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon)=0; virtual void GetViscosityDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon)=0; - virtual void GetViscosityDerivativeEpsSquareFS(IssmDouble* pmu_prime, IssmDouble* pepsilon)=0; virtual void GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon)=0; virtual IssmDouble GetA()=0; Index: /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 17926) @@ -485,37 +485,4 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosityDerivativeEpsSquareFS{{{*/ -void Matice::GetViscosityDerivativeEpsSquareFS(IssmDouble* pmu_prime, IssmDouble* epsilon){ - - /*output: */ - IssmDouble mu_prime; - IssmDouble mu,n,eff2; - - /*input strain rate: */ - IssmDouble exx,eyy,exy,exz,eyz,ezz; - - if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && - (epsilon[3]==0) && (epsilon[4]==0) && (epsilon[5]==0)){ - mu_prime=0.5*pow(10.,14); - } - else{ - /*Retrive strain rate components: */ - exx=epsilon[0]; - eyy=epsilon[1]; - ezz=epsilon[2]; - exy=epsilon[3]; - exz=epsilon[4]; - eyz=epsilon[5]; - eff2 = exx*exx + eyy*eyy + exx*eyy + exy*exy + exz*exz + eyz*eyz; - - GetViscosity(&mu,sqrt(eff2)); - n=GetN(); - mu_prime=(1-n)/(2*n) * mu/eff2; - } - - /*Assign output pointers:*/ - *pmu_prime=mu_prime; -} -/*}}}*/ /*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{*/ void Matice::GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* epsilon){ Index: /issm/trunk-jpl/src/c/classes/Materials/Matice.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matice.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Materials/Matice.h (revision 17926) @@ -59,5 +59,4 @@ void GetViscosityDComplement(IssmDouble*, IssmDouble*); void GetViscosityDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon); - void GetViscosityDerivativeEpsSquareFS(IssmDouble* pmu_prime, IssmDouble* pepsilon); void GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon); IssmDouble GetA(); Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 17926) @@ -276,14 +276,4 @@ } /*}}}*/ -/*FUNCTION Matpar::GetHeatCapacity {{{*/ -IssmDouble Matpar::GetHeatCapacity(){ - return heatcapacity; -} -/*}}}*/ -/*FUNCTION Matpar::GetLatentHeat {{{*/ -IssmDouble Matpar::GetLatentHeat(){ - return latentheat; -} -/*}}}*/ /*FUNCTION Matpar::GetMeltingPoint {{{*/ IssmDouble Matpar::GetMeltingPoint(){ @@ -291,14 +281,4 @@ } /*}}}*/ -/*FUNCTION Matpar::GetReferenceTemperature {{{*/ -IssmDouble Matpar::GetReferenceTemperature(){ - return referencetemperature; -} -/*}}}*/ -/*FUNCTION Matpar::GetMixedLayerCapacity {{{*/ -IssmDouble Matpar::GetMixedLayerCapacity(){ - return mixed_layer_capacity; -} -/*}}}*/ /*FUNCTION Matpar::GetRhoIce {{{*/ IssmDouble Matpar::GetRhoIce(){ @@ -317,9 +297,4 @@ } /*}}}*/ -/*FUNCTION Matpar::GetMuWater {{{*/ -IssmDouble Matpar::GetMuWater(){ - return mu_water; -} -/*}}}*/ /*FUNCTION Matpar::GetDesFac {{{*/ IssmDouble Matpar::GetDesFac(){ @@ -332,51 +307,4 @@ } /*}}}*/ -/*FUNCTION Matpar::GetThermalConductivity {{{*/ -IssmDouble Matpar::GetThermalConductivity(){ - return thermalconductivity; -} -/*}}}*/ -/*FUNCTION Matpar::GetTemperateIceConductivity {{{*/ -IssmDouble Matpar::GetTemperateIceConductivity(){ - return temperateiceconductivity; -} -/*}}}*/ -/*FUNCTION Matpar::GetThermalExchangeVelocity {{{*/ -IssmDouble Matpar::GetThermalExchangeVelocity(){ - return thermal_exchange_velocity; -} -/*}}}*/ -/*FUNCTION Matpar::GetSedimentStoring {{{*/ -IssmDouble Matpar::GetSedimentStoring(){ - return this->rho_freshwater * this->g * this->sediment_porosity * this->sediment_thickness * - (this->water_compressibility + (this->sediment_compressibility / this->sediment_porosity)); -} -/*}}}*/ -/*FUNCTION Matpar::GetEplSpecificStoring {{{*/ -IssmDouble Matpar::GetEplSpecificStoring(){ - return this->rho_freshwater * this->g * this->epl_porosity * - (this->water_compressibility + (this->epl_compressibility / this->epl_porosity)); -} -/*}}}*/ -/*FUNCTION Matpar::GetSedimentThickness {{{*/ -IssmDouble Matpar::GetSedimentThickness(){ - return sediment_thickness; -} -/*}}}*/ -/*FUNCTION Matpar::GetEplInitialThickness {{{*/ -IssmDouble Matpar::GetEplInitialThickness(){ - return epl_init_thickness; -} -/*}}}*/ -/*FUNCTION Matpar::GetEplMaxThickness {{{*/ -IssmDouble Matpar::GetEplMaxThickness(){ - return epl_max_thickness; -} -/*}}}*/ -/*FUNCTION Matpar::GetEplConductivity {{{*/ -IssmDouble Matpar::GetEplConductivity(){ - return epl_conductivity; -} -/*}}}*/ /*FUNCTION Matpar::TMeltingPoint {{{*/ IssmDouble Matpar::TMeltingPoint(IssmDouble pressure){ Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matpar.h (revision 17925) +++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.h (revision 17926) @@ -80,5 +80,4 @@ void GetViscosityDComplement(IssmDouble* pviscosity_complement, IssmDouble* pepsilon){_error_("not supported");}; void GetViscosityDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon){_error_("not supported");}; - void GetViscosityDerivativeEpsSquareFS(IssmDouble* pmu_prime, IssmDouble* pepsilon){_error_("not supported");}; void GetViscosity2dDerivativeEpsSquare(IssmDouble* pmu_prime, IssmDouble* pepsilon){_error_("not supported");}; IssmDouble GetA(){_error_("not supported");}; @@ -96,20 +95,6 @@ IssmDouble GetRhoWater(); IssmDouble GetRhoFreshwater(); - IssmDouble GetMuWater(); - IssmDouble GetMixedLayerCapacity(); - IssmDouble GetThermalExchangeVelocity(); - IssmDouble GetHeatCapacity(); - IssmDouble GetThermalConductivity(); - IssmDouble GetTemperateIceConductivity(); - IssmDouble GetLatentHeat(); IssmDouble GetBeta(); IssmDouble GetMeltingPoint(); - IssmDouble GetReferenceTemperature(); - IssmDouble GetSedimentStoring(); - IssmDouble GetEplSpecificStoring(); - IssmDouble GetSedimentThickness(); - IssmDouble GetEplConductivity(); - IssmDouble GetEplInitialThickness(); - IssmDouble GetEplMaxThickness(); IssmDouble TMeltingPoint(IssmDouble pressure); IssmDouble PureIceEnthalpy(IssmDouble pressure); Index: /issm/trunk-jpl/src/c/modules/modules.h =================================================================== --- /issm/trunk-jpl/src/c/modules/modules.h (revision 17925) +++ /issm/trunk-jpl/src/c/modules/modules.h (revision 17926) @@ -14,6 +14,4 @@ #include "./BamgTriangulatex/BamgTriangulatex.h" #include "./Chacox/Chacox.h" -#include "./ComputeBasalStressx/ComputeBasalStressx.h" -#include "./ComputeStrainRatex/ComputeStrainRatex.h" #include "./ConfigureObjectsx/ConfigureObjectsx.h" #include "./ContourToMeshx/ContourToMeshx.h" @@ -79,5 +77,4 @@ #include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h" #include "./Reduceloadx/Reduceloadx.h" -#include "./Reducevectorgtosx/Reducevectorgtosx.h" #include "./Reducevectorgtofx/Reducevectorgtofx.h" #include "./ResetConstraintsx/ResetConstraintsx.h"