Skip to content

Commit

Permalink
Merge pull request #4 from Mohid-Water-Modelling-System/master
Browse files Browse the repository at this point in the history 
new
  • Loading branch information
@sofiasaraiva
sofiasaraiva authored Nov 28, 2018
2 parents 03f9ed9 + d1cb734 commit 1ef1ba5
Show file tree
Hide file tree
Showing 116 changed files with 17,162 additions and 3,440 deletions.
2 changes: 2 additions & 0 deletions ExternalLibs/Netcdf_4.4.1.1/Readme.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
(see for details: http://wiki.mohid.com/index.php?title=Compile/Build_MOHID)

NETCDF:
- UNIDATA supports Windows support via CMake. Download and install Cmake [4]. Cmake
is used to control the software compilation process using simple platform and compiler independent
Expand Down
Binary file modified ExternalLibs/Netcdf_4.4.1.1/VS2015/x64/libifcoremd.dll
View file
Binary file not shown.
Binary file modified ExternalLibs/Netcdf_4.4.1.1/VS2015/x64/libmmd.dll
View file
Binary file not shown.
Binary file modified ExternalLibs/NumericalRecipes/x64/NumericalRecipes.lib
View file
Binary file not shown.
7 changes: 4 additions & 3 deletions Software/DomainDecompositionConsolidation/ModuleDDC.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,7 @@ recursive subroutine WriteConsolidatedHDF( IDOut, ObjHDF5_Out, GroupName,
integer :: JUB
integer :: KLB
integer :: KUB
integer :: status

!------------------------------------------------------------------------

Expand Down Expand Up @@ -754,9 +755,9 @@ recursive subroutine WriteConsolidatedHDF( IDOut, ObjHDF5_Out, GroupName,
KUB = NULL_INT
LimitsArray = NULL_INT

DomainSize = hash_getDomainSize(hash_map_in, FileArrayIn(i))
WindowPosition = hash_getWindowPosition(hash_map_in, FileArrayIn(i))
WindowFrame = hash_getWindowFrame(hash_map_in, FileArrayIn(i))
status = hash_getDomainSize_f (hash_map_in, FileArrayIn(i),DomainSize )
status = hash_getWindowPosition_f(hash_map_in, FileArrayIn(i),WindowPosition)
status = hash_getWindowFrame_f (hash_map_in, FileArrayIn(i),WindowFrame )

!Get Dataset Information
call GetHDF5GroupID(HDF5ID = ObjHDF5_InArray(i), FatherGroupName = adjustl(trim(GroupName))//"/", &
Expand Down
107 changes: 54 additions & 53 deletions Software/DomainDecompositionConsolidation/ModuleHashTable.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ MODULE ModuleHashTable
PUBLIC :: hash_get_next_exists
PUBLIC :: hash_get_next_key
private :: hash_get_next_key2
PUBLIC :: hash_getDomainSize
private :: hash_getDomainSize2
PUBLIC :: hash_getWindowPosition
private :: hash_getWindowPosition2
PUBLIC :: hash_getDomainSize_f
private :: hash_getDomainSize2_f
PUBLIC :: hash_getWindowPosition_f
private :: hash_getWindowPosition2_f
PUBLIC :: hash_getObjID
private :: hash_getObjID2
PUBLIC :: hash_getWindowFrame
private :: hash_getWindowFrame2
PUBLIC :: hash_getWindowFrame_f
private :: hash_getWindowFrame2_f

PUBLIC :: hash_set
private :: hash_set2
Expand Down Expand Up @@ -88,7 +88,6 @@ function hash_init()

!Local-------------------------------------------------------------------
type (T_HashTable), pointer :: NewObjHashTable
INTEGER :: status

!------------------------------------------------------------------------

Expand Down Expand Up @@ -139,8 +138,6 @@ SUBROUTINE hash_set(Me, key, value_)
INTEGER , INTENT(IN) :: value_

!Local-------------------------------------------------------------------
INTEGER :: local_index
LOGICAL :: found

!------------------------------------------------------------------------

Expand Down Expand Up @@ -188,8 +185,6 @@ SUBROUTINE hash_setWindowPosition(Me, key, WindowPosition)
INTEGER, dimension(4) , INTENT(IN) :: WindowPosition

!Local-------------------------------------------------------------------
INTEGER :: local_index
LOGICAL :: found

!------------------------------------------------------------------------

Expand Down Expand Up @@ -232,8 +227,6 @@ SUBROUTINE hash_setObjID(Me, key, ObjID)
INTEGER, INTENT(IN) :: ObjID

!Local-------------------------------------------------------------------
INTEGER :: local_index
LOGICAL :: found

!------------------------------------------------------------------------

Expand Down Expand Up @@ -276,8 +269,6 @@ SUBROUTINE hash_setWindowFrame(Me, key, WindowFrame)
INTEGER, dimension(4) , INTENT(IN) :: WindowFrame

!Local-------------------------------------------------------------------
INTEGER :: local_index
LOGICAL :: found

!------------------------------------------------------------------------

Expand Down Expand Up @@ -320,8 +311,6 @@ SUBROUTINE hash_setDomainSize(Me, key, DomainSize)
INTEGER, dimension(4) , INTENT(IN) :: DomainSize

!Local-------------------------------------------------------------------
INTEGER :: local_index
LOGICAL :: found

!------------------------------------------------------------------------

Expand Down Expand Up @@ -399,103 +388,112 @@ recursive integer function hash_get2(HashList, key)
END function hash_get2
!--------------------------------------------------------------------------

function hash_getDomainSize(Me, key)
function hash_getDomainSize_f(Me, key,hash_getDomainSize)

!Function----------------------------------------------------------------
integer, dimension(4) :: hash_getDomainSize
integer :: hash_getDomainSize_f

!External----------------------------------------------------------------
type (T_HashTable), pointer :: Me
CHARACTER(*), INTENT(IN) :: key

integer, dimension(4) :: hash_getDomainSize
!------------------------------------------------------------------------

if2 : if (associated(Me%HashList)) then
hash_getDomainSize = hash_getDomainSize2(Me%HashList, key = key)
hash_getDomainSize_f = hash_getDomainSize2_f(Me%HashList, key = key, hash_getDomainSize2 = hash_getDomainSize)
else if2
hash_getDomainSize =-1 * NOT_FOUND_ERR_
endif if2

!------------------------------------------------------------------------

END function hash_getDomainSize
END function hash_getDomainSize_f

!--------------------------------------------------------------------------

recursive function hash_getDomainSize2(HashList, key)
recursive function hash_getDomainSize2_f(HashList, key, hash_getDomainSize2)

!Function----------------------------------------------------------------
integer, dimension(4) :: hash_getDomainSize2
integer :: hash_getDomainSize2_f

!External----------------------------------------------------------------
type (T_HashList), pointer :: HashList
type (T_HashList), pointer, INTENT(IN) :: HashList
CHARACTER(*), INTENT(IN) :: key
integer, dimension(4) :: hash_getDomainSize2

!Local-------------------------------------------------------------------
integer :: status

!------------------------------------------------------------------------

if1 : if (adjustl(trim(HashList%key)) .EQ. adjustl(trim(key))) then
hash_getDomainSize2 = HashList%DomainSize
hash_getDomainSize2_f = 0
else if1
if2 : if (associated(HashList%Next)) then
hash_getDomainSize2 = hash_getDomainSize2(HashList%Next, key = key)
status = hash_getDomainSize2_f(HashList%Next, key, hash_getDomainSize2)
else if2
hash_getDomainSize2 =-1 * NOT_FOUND_ERR_
hash_getDomainSize2_f = NOT_FOUND_ERR_
endif if2
endif if1

!------------------------------------------------------------------------

END function hash_getDomainSize2
END function hash_getDomainSize2_f

!--------------------------------------------------------------------------

function hash_getWindowPosition(Me, key)
function hash_getWindowPosition_f(Me, key,hash_getWindowPosition)

!Function----------------------------------------------------------------
integer, dimension(4) :: hash_getWindowPosition
integer :: hash_getWindowPosition_f

!External----------------------------------------------------------------
type (T_HashTable), pointer :: Me
CHARACTER(*), INTENT(IN) :: key

integer, dimension(4) :: hash_getWindowPosition
!------------------------------------------------------------------------

if2 : if (associated(Me%HashList)) then
hash_getWindowPosition = hash_getWindowPosition2(Me%HashList, key = key)
hash_getWindowPosition_f = hash_getWindowPosition2_f(Me%HashList, key = key, hash_getWindowPosition2 = hash_getWindowPosition)
else if2
hash_getWindowPosition =-1 * NOT_FOUND_ERR_
hash_getWindowPosition = -1 * NOT_FOUND_ERR_
hash_getWindowPosition_f = NOT_FOUND_ERR_
endif if2

!------------------------------------------------------------------------

END function hash_getWindowPosition
END function hash_getWindowPosition_f

!--------------------------------------------------------------------------

recursive function hash_getWindowPosition2(HashList, key)
recursive function hash_getWindowPosition2_f(HashList, key,hash_getWindowPosition2)

!Function----------------------------------------------------------------
integer, dimension(4) :: hash_getWindowPosition2
integer :: hash_getWindowPosition2_f

!External----------------------------------------------------------------
type (T_HashList), pointer :: HashList
CHARACTER(*), INTENT(IN) :: key

integer, dimension(4) :: hash_getWindowPosition2
!------------------------------------------------------------------------

if1 : if (adjustl(trim(HashList%key)) .EQ. adjustl(trim(key))) then
hash_getWindowPosition2 = HashList%WindowPosition
hash_getWindowPosition2 = HashList%WindowPosition
hash_getWindowPosition2_f = 0
else if1
if2 : if (associated(HashList%Next)) then
hash_getWindowPosition2 = hash_getWindowPosition2(HashList%Next, key = key)
hash_getWindowPosition2_f = hash_getWindowPosition2_f(HashList%Next, key = key, hash_getWindowPosition2 = hash_getWindowPosition2)
else if2
hash_getWindowPosition2 =-1 * NOT_FOUND_ERR_
hash_getWindowPosition2 = -1 * NOT_FOUND_ERR_
hash_getWindowPosition2_f = NOT_FOUND_ERR_
endif if2
endif if1

!------------------------------------------------------------------------

END function hash_getWindowPosition2
END function hash_getWindowPosition2_f

!--------------------------------------------------------------------------

Expand Down Expand Up @@ -543,53 +541,56 @@ END function hash_getObjID2

!--------------------------------------------------------------------------

function hash_getWindowFrame(Me, key)
function hash_getWindowFrame_f(Me, key,hash_getWindowFrame)

!Function----------------------------------------------------------------
integer, dimension(4) :: hash_getWindowFrame
integer :: hash_getWindowFrame_f

!External----------------------------------------------------------------
type (T_HashTable), pointer :: Me
CHARACTER(*), INTENT(IN) :: key

integer, dimension(4) :: hash_getWindowFrame
!------------------------------------------------------------------------

if2 : if (associated(Me%HashList)) then
hash_getWindowFrame = hash_getWindowFrame2(Me%HashList, key = key)
hash_getWindowFrame_f = hash_getWindowFrame2_f(Me%HashList, key = key, hash_getWindowFrame2 = hash_getWindowFrame)
else if2
hash_getWindowFrame =-1 * NOT_FOUND_ERR_
hash_getWindowFrame = -1 * NOT_FOUND_ERR_
hash_getWindowFrame_f = NOT_FOUND_ERR_
endif if2

!------------------------------------------------------------------------

END function hash_getWindowFrame
END function hash_getWindowFrame_f

!--------------------------------------------------------------------------

recursive function hash_getWindowFrame2(HashList, key)
recursive function hash_getWindowFrame2_f(HashList, key,hash_getWindowFrame2)

!Function----------------------------------------------------------------
integer, dimension(4) :: hash_getWindowFrame2
integer :: hash_getWindowFrame2_f

!External----------------------------------------------------------------
type (T_HashList), pointer :: HashList
CHARACTER(*), INTENT(IN) :: key

integer, dimension(4) :: hash_getWindowFrame2
!------------------------------------------------------------------------

if1 : if (adjustl(trim(HashList%key)) .EQ. adjustl(trim(key))) then
hash_getWindowFrame2 = HashList%WindowFrame
hash_getWindowFrame2 = HashList%WindowFrame
hash_getWindowFrame2_f = 0
else if1
if2 : if (associated(HashList%Next)) then
hash_getWindowFrame2 = hash_getWindowFrame2(HashList%Next, key = key)
hash_getWindowFrame2_f = hash_getWindowFrame2_f(HashList%Next, key = key, hash_getWindowFrame2 = hash_getWindowFrame2)
else if2
hash_getWindowFrame2 =-1 * NOT_FOUND_ERR_
hash_getWindowFrame2 =-1 * NOT_FOUND_ERR_
hash_getWindowFrame2_f = NOT_FOUND_ERR_
endif if2
endif if1

!------------------------------------------------------------------------

END function hash_getWindowFrame2
END function hash_getWindowFrame2_f

!--------------------------------------------------------------------------

Expand Down
Loading

0 comments on commit 1ef1ba5

Please sign in to comment.