Skip to content
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

Added PDAF dependencies #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added PDAF dependencies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
332f192
Added PDAF dependencies
LSchueler Jun 6, 2019
c967741
Removed the hardcoded MPI Fortran compiler from cmake
LSchueler Jun 6, 2019
367ad8e
Fixed a deallocation bug, which can appear if no assimilation was done
LSchueler Jun 7, 2019
7143baa
Removed dummpy MPI headers, which are messing PDAF up
LSchueler Jun 28, 2019
3c94c48
Caught another potential deallocation of a deallocated array
LSchueler Jun 28, 2019
814541e
Fixed double precision settings for PDAF user code
LSchueler Jun 28, 2019
769d209
Fixed MPI processes
LSchueler Jun 28, 2019
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
294 changes: 0 additions & 294 deletions pdaf_base/nullmpi/nullmpi.F90
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions pdaf_base/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
file(GLOB PDAF_BASE_SOURCES *.F90)

find_package(LAPACK REQUIRED)
find_package(BLAS REQUIRED)

add_library(PDAF_base STATIC ${PDAF_BASE_SOURCES})
target_include_directories(PDAF_base PRIVATE dummympi)
target_link_libraries(PDAF_base PRIVATE ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
target_compile_options(PDAF_base PRIVATE "-fdefault-real-8")
6 changes: 3 additions & 3 deletions pdaf_base/src/PDAF-D_deallocate.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ SUBROUTINE PDAF_deallocate()
DEALLOCATE(eofU)

! Allocate full ensemble on filter-PEs
DEALLOCATE(eofV)
if (allocated(eofv)) DEALLOCATE(eofV)

! Allocate array for past ensembles for smoothing on filter-PEs
IF (dim_lag > 0) THEN
Expand All @@ -76,14 +76,14 @@ SUBROUTINE PDAF_deallocate()
IF (dim_bias_p > 0) THEN
DEALLOCATE(bias)
ENDIF

ELSE on_filterpe
! Model-PEs that are not Filter-PEs only need an array for the local ensemble
! if they participate in the coupling communication

! Allocate partial ensemble on model-only PEs that do coupling communication
IF (COMM_couple /= MPI_COMM_NULL) THEN
DEALLOCATE(eofV)
IF (ALLOCATED(eofV)) DEALLOCATE(eofV)
END IF

END IF on_filterpe
Expand Down
20 changes: 0 additions & 20 deletions pdaf_base/src/dummympi/mpif.h
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions pdaf_user/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
file(GLOB PDAF_USER_SOURCES *.F90)

find_package(MPI REQUIRED)
find_package(LAPACK REQUIRED)
find_package(BLAS REQUIRED)

add_library(pdaf ${PDAF_USER_SOURCES})
target_include_directories(pdaf PRIVATE dummympi)
target_link_libraries(pdaf PRIVATE ${MPI_LIBRARIES} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
target_link_libraries(pdaf PRIVATE PDAF_base)
target_compile_options(pdaf PRIVATE "-fdefault-real-8")

if(APPLE AND BUILD_SHARED_LIBS)
target_link_libraries(pdaf PUBLIC "-framework Accelerate")
Expand Down
20 changes: 0 additions & 20 deletions pdaf_user/dummympi/mpif.h
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pdaf_user/init_pdaf.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ SUBROUTINE init_pdaf(ens_no)

!call init_pdaf_parse()
dim_ens = ens_no
n_modeltasks = ens_no

! *** Initial Screen output ***
! *** This is optional ***
Expand Down
Loading