Skip to content

Minor updates #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Minor updates #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69337e6
Update AbstractKernel_Class@AssembleTanmatMethods.F90
vickysharma0812 Dec 20, 2023
973dff7
Update AbstractNodeField_Class@IOMethods.F90
vickysharma0812 Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions src/submodules/AbstractKernel/src/AbstractKernel_Class@AssembleTanmatMethods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,50 @@
!----------------------------------------------------------------------------

MODULE PROCEDURE obj_AssembleDampingMat
CHARACTER(*), PARAMETER :: myName = "obj_AssembleDampingMat"
CALL e%RaiseError(modName//'::'//myName//' - '// &
& '[WIP ERROR] :: This module has not been implemented yet')
! TODO: Implement obj_AssembleDampingMat
CHARACTER(*), PARAMETER :: myName = "obj_AssembleDampingMat()"

#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[START] ')
#endif DEBUG_VER

IF (obj%isIsotropic) THEN
CALL KernelAssembleDampingMatrix(mat=obj%dampingMat, &
& youngsModulus=obj%youngsModulus, &
& shearModulus=obj%shearModulus, &
& massDensity=obj%massDensity, &
& dampCoeff_alpha=obj%dampCoeff_alpha, &
& dampCoeff_beta=obj%dampCoeff_beta, &
& dom=obj%dom, &
& cellFE=obj%cellFE, &
& linCellFE=obj%linCellFE, &
& spaceElemSD=obj%spaceElemSD, &
& linSpaceElemSD=obj%linSpaceElemSD, &
& reset=.TRUE.)
END IF

IF (.NOT. obj%isIsotropic) THEN

CALL KernelAssembleDampingMatrix( &
& mat=obj%dampingMat, &
& Cijkl=obj%Cijkl, &
& massDensity=obj%massDensity, &
& dampCoeff_alpha=obj%dampCoeff_alpha, &
& dampCoeff_beta=obj%dampCoeff_beta, &
& dom=obj%dom, &
& cellFE=obj%cellFE, &
& linCellFE=obj%linCellFE, &
& spaceElemSD=obj%spaceElemSD, &
& linSpaceElemSD=obj%linSpaceElemSD, &
& reset=.TRUE.)

END IF

#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[END] ')
#endif DEBUG_VER

END PROCEDURE obj_AssembleDampingMat

!----------------------------------------------------------------------------
Expand Down
33 changes: 20 additions & 13 deletions src/submodules/AbstractNodeField/src/AbstractNodeField_Class@IOMethods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@
!----------------------------------------------------------------------------

MODULE PROCEDURE obj_Import
CHARACTER(*), PARAMETER :: myName = "obj_Import"
CHARACTER(*), PARAMETER :: myName = "obj_Import()"
TYPE(String) :: dsetname
LOGICAL(LGT) :: abool
TYPE(ParameterList_) :: param

CALL e%raiseInformation(modName//'::'//myName//' - '// &
& '[START] Import()')
#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[START] ')
#endif

CALL AbstractFieldImport( &
& obj=obj, &
Expand Down Expand Up @@ -70,9 +72,10 @@
& group=dsetname%chars())
END IF

! info
CALL e%raiseInformation(modName//"::"//myName//" - "// &
& "[END] Import()")
#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[END] ')
#endif

END PROCEDURE obj_Import

Expand All @@ -81,11 +84,13 @@
!----------------------------------------------------------------------------

MODULE PROCEDURE obj_Export
CHARACTER(*), PARAMETER :: myName = "obj_Export"
CHARACTER(*), PARAMETER :: myName = "obj_Export()"
TYPE(String) :: strval, dsetname

CALL e%raiseInformation(modName//"::"//myName//" - "// &
& "[START] Export()")
#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[START] ')
#endif

CALL AbstractFieldExport(obj=obj, hdf5=hdf5, group=group)

Expand All @@ -103,8 +108,10 @@
& group=dsetname%chars())

! info
CALL e%raiseInformation(modName//"::"//myName//" - "// &
& "[END] Export()")
#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[END] ')
#endif

END PROCEDURE obj_Export

Expand All @@ -126,7 +133,7 @@

#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[START] WriteData()')
& '[START]')
#endif

NULLIFY (dom, meshPtr)
Expand Down Expand Up @@ -252,7 +259,7 @@

#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[END] WriteData()')
& '[END]')
#endif
END PROCEDURE obj_WriteData_vtk

Expand Down