Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 18921) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 18922) @@ -43,121 +43,73 @@ int ObjectEnum(); /*}}}*/ - /*Update virtual functions definitions: {{{*/ - void InputUpdateFromVector(IssmDouble* vector, int name, int type); - #ifdef _HAVE_DAKOTA_ - void InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type); - void InputUpdateFromMatrixDakota(IssmDouble* matrix, int nows, int ncols, int name, int type); - #endif - void InputUpdateFromIoModel(int index, IoModel* iomodel); - /*}}}*/ - /*Element virtual functions definitions: {{{*/ - IssmDouble CharacteristicLength(void){_error_("not implemented yet");}; - void ComputeBasalStress(Vector* sigma_b); - void ComputeSigmaNN(){_error_("not implemented yet");}; - void ComputeStressTensor(); - void ComputeDeviatoricStressTensor(); - void StressIntensityFactor(); - void StrainRateparallel(); - void StrainRateperpendicular(); - void CalvingRateLevermann(); - void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); - void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz); - int FiniteElement(void); - void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating); - void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters); - void ResetHooks(); - void Delta18oParameterization(void); - Penta* GetUpperPenta(void); - Penta* GetLowerPenta(void); - Penta* GetSurfacePenta(void); - Penta* GetBasalPenta(void); - Element* GetUpperElement(void); - Element* GetBasalElement(void); - void GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues){_error_("not implemented yet");}; - void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); - IssmDouble GetGroundedPortion(IssmDouble* xyz_list); - int GetNodeIndex(Node* node); - int GetNumberOfNodes(void); - int GetNumberOfNodes(int enum_type); - int GetNumberOfVertices(void); - void GetSolutionFromInputsOneDof(Vector* solution,int enum_type); - void GetVerticesCoordinatesBase(IssmDouble** pxyz_list); - void GetVerticesCoordinatesTop(IssmDouble** pxyz_list); - - void InputDepthAverageAtBase(int enum_type,int average_enum_type); - void InputScale(int enum_type,IssmDouble scale_factor); - int NumberofNodesVelocity(void); - int NumberofNodesPressure(void); - int VelocityInterpolation(); - int PressureInterpolation(); - int TensorInterpolation(){_error_("not implemented yet");}; - bool IsZeroLevelset(int levelset_enum); - bool IsIcefront(void); - bool IsFaceOnBoundary(void){_error_("not implemented yet");}; - void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); - void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum); - void GetLevelCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum,IssmDouble level){_error_("not implemented yet");}; - void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm); - void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe); - void ResetFSBasalBoundaryCondition(void); - void SetTemporaryElementType(int element_type_in); - Element* SpawnBasalElement(void); - Element* SpawnTopElement(void); - IssmDouble SurfaceArea(void); - void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement); - int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum); - IssmDouble TimeAdapt(); - void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss); - void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss); - int VertexConnectivity(int vertexindex); - void VerticalSegmentIndices(int** pindices,int* pnumseg); - void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input); - - void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part); - IssmDouble IceVolume(void); - IssmDouble IceVolumeAboveFloatation(void); - IssmDouble TotalSmb(void); - IssmDouble MassFlux(IssmDouble* segment); - IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id); - void ElementResponse(IssmDouble* presponse,int response_enum); - - #ifdef _HAVE_GIA_ - void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); - #endif - - void GetVectorFromControlInputs(Vector* gradient,int control_enum,int control_index,const char* data,bool onsid); - void SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index); - void ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index); - void ControlToVectors(Vector* vector_control, Vector* vector_gradient,int control_enum); - void InputControlUpdate(IssmDouble scalar,bool save_parameter); - IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; - IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; - IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");}; - - void PotentialUngrounding(Vector* potential_sheet_ungrounding); - int UpdatePotentialUngrounding(IssmDouble* potential_sheet_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf); - /*}}}*/ - /*Penta specific routines:{{{*/ + /*Penta routines:{{{*/ void AddBasalInput(int input_enum, IssmDouble* values, int interpolation_enum); void AddInput(int input_enum, IssmDouble* values, int interpolation_enum); - void NormalBase(IssmDouble* bed_normal, IssmDouble* xyz_list); - void NormalSection(IssmDouble* normal,IssmDouble* xyz_list); - void NormalTop(IssmDouble* bed_normal, IssmDouble* xyz_list); + void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part); + IssmDouble CharacteristicLength(void){_error_("not implemented yet");}; + void CalvingRateLevermann(); + void ComputeBasalStress(Vector* sigma_b); + void ComputeDeviatoricStressTensor(); + void ComputeSigmaNN(){_error_("not implemented yet");}; + void ComputeStressTensor(); + void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); + void ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index); + void ControlToVectors(Vector* vector_control, Vector* vector_gradient,int control_enum); ElementMatrix* CreateBasalMassMatrix(void); + void Delta18oParameterization(void); + void ElementResponse(IssmDouble* presponse,int response_enum); + void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz); + int FiniteElement(void); + void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating); void GetAreaCoordinates(IssmDouble *area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints); + Element* GetBasalElement(void); + Penta* GetBasalPenta(void); int GetElementType(void); + void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); + IssmDouble GetGroundedPortion(IssmDouble* xyz_list); + void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum); void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype); + void GetLevelCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum,IssmDouble level){_error_("not implemented yet");}; + void GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues){_error_("not implemented yet");}; Node* GetNode(int node_number); + int GetNodeIndex(Node* node); + int GetNumberOfNodes(void); + int GetNumberOfNodes(int enum_type); + int GetNumberOfVertices(void); + Penta* GetLowerPenta(void); + void GetSolutionFromInputsOneDof(Vector* solution,int enum_type); + Penta* GetSurfacePenta(void); + Element* GetUpperElement(void); + Penta* GetUpperPenta(void); + void GetVectorFromControlInputs(Vector* gradient,int control_enum,int control_index,const char* data,bool onsid); + void GetVerticesCoordinatesBase(IssmDouble** pxyz_list); + void GetVerticesCoordinatesTop(IssmDouble** pxyz_list); + IssmDouble IceVolume(void); + IssmDouble IceVolumeAboveFloatation(void); + void InputControlUpdate(IssmDouble scalar,bool save_parameter); + void InputDepthAverageAtBase(int enum_type,int average_enum_type); void InputExtrude(int enum_type,int start); + void InputScale(int enum_type,IssmDouble scale_factor); + void InputUpdateFromIoModel(int index, IoModel* iomodel); void InputUpdateFromSolutionOneDof(IssmDouble* solutiong,int enum_type); void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solutiong,int enum_type); + void InputUpdateFromVector(IssmDouble* vector, int name, int type); + bool IsFaceOnBoundary(void){_error_("not implemented yet");}; + bool IsIcefront(void); + bool IsNodeOnShelfFromFlags(IssmDouble* flags); + bool IsOnBase(void); bool IsOnSurface(void); - bool IsOnBase(void); - bool IsNodeOnShelfFromFlags(IssmDouble* flags); + bool IsZeroLevelset(int levelset_enum); void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); + void JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss); - void JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss); + IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");}; + IssmDouble MassFlux(IssmDouble* segment); + IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id); + IssmDouble MinEdgeLength(IssmDouble* xyz_list); + IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; + IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; Gauss* NewGauss(void); Gauss* NewGauss(int order); @@ -169,20 +121,60 @@ Gauss* NewGaussTop(int order); void NodalFunctions(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsPressure(IssmDouble* basis,Gauss* gauss); void NodalFunctionsP1(IssmDouble* basis,Gauss* gauss); + void NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); void NodalFunctionsP2(IssmDouble* basis,Gauss* gauss); - void NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); - void NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); - void NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); - void NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss); + void NodalFunctionsTensor(IssmDouble* basis,Gauss* gauss); void NodalFunctionsVelocity(IssmDouble* basis,Gauss* gauss); - void NodalFunctionsPressure(IssmDouble* basis,Gauss* gauss); - void NodalFunctionsTensor(IssmDouble* basis,Gauss* gauss); - IssmDouble MinEdgeLength(IssmDouble* xyz_list); + void NormalBase(IssmDouble* bed_normal, IssmDouble* xyz_list); + void NormalSection(IssmDouble* normal,IssmDouble* xyz_list); + void NormalTop(IssmDouble* bed_normal, IssmDouble* xyz_list); + int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum); + int NumberofNodesPressure(void); + int NumberofNodesVelocity(void); + void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm); + void PotentialUngrounding(Vector* potential_sheet_ungrounding); + int PressureInterpolation(); + void ReduceMatrices(ElementMatrix* Ke,ElementVector* pe); + void ResetFSBasalBoundaryCondition(void); + void ResetHooks(); void SetClone(int* minranks); + void SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index); + void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters); + void SetTemporaryElementType(int element_type_in); + Element* SpawnBasalElement(void); + Element* SpawnTopElement(void); Tria* SpawnTria(int index1,int index2,int index3); IssmDouble StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa); - + void StressIntensityFactor(); + void StrainRateparallel(); + void StrainRateperpendicular(); + IssmDouble SurfaceArea(void); + int TensorInterpolation(){_error_("not implemented yet");}; + IssmDouble TimeAdapt(); + IssmDouble TotalSmb(void); + void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement); void UpdateConstraintsExtrudeFromBase(void); void UpdateConstraintsExtrudeFromTop(void); + int UpdatePotentialUngrounding(IssmDouble* potential_sheet_ungrounding,Vector* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf); + void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss); + void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss); + int VelocityInterpolation(); + int VertexConnectivity(int vertexindex); + void VerticalSegmentIndices(int** pindices,int* pnumseg); + void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input); + void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); + + #ifdef _HAVE_DAKOTA_ + void InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type); + void InputUpdateFromMatrixDakota(IssmDouble* matrix, int nows, int ncols, int name, int type); + #endif + + #ifdef _HAVE_GIA_ + void GiaDeflection(Vector* wg,Vector* dwgdt,IssmDouble* x,IssmDouble* y); + #endif /*}}}*/ };