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

PETSc integration without using pragma directives and MESON build system setup #39

Merged
merged 71 commits into from
Apr 23, 2021
Merged

PETSc integration without using pragma directives and MESON build system setup #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
aef23e2
Adding meson build system setup to compile shyfem with main tools and…
CeliaLaurent Dec 21, 2020
334ce76
test (#36)
CeliaLaurent Mar 11, 2021
d24573a
bug fixes in box model
georgu Mar 24, 2021
c564785
diagnostic output in newbcl
georgu Mar 24, 2021
1f24054
enhancements to rstinf
georgu Mar 26, 2021
59b66e1
some more on restart
georgu Mar 27, 2021
9a86b68
more on restart
georgu Mar 27, 2021
0697254
hydro gis with header
georgu Mar 30, 2021
f06846c
more work on debug output
georgu Mar 30, 2021
ead822d
Removing mod_petsc.f and implementation in simsys_petsc.f of the dire…
CeliaLaurent Apr 2, 2021
7b9d6ca
Merge remote-tracking branch 'myfork/meson' into petsc_meson
CeliaLaurent Apr 2, 2021
ed46fb5
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 2, 2021
959d141
Removing unused MOD_PETSc from Makefile and fixing target requirement…
CeliaLaurent Apr 2, 2021
7bcb07c
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 2, 2021
6379765
Fixing type issue in fem3d/mod_shympi_node.f causing compilation erro…
CeliaLaurent Apr 2, 2021
09275cc
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 2, 2021
9245d40
1) updating meson.build doing substitution of mod_petsc.f with simsys…
CeliaLaurent Apr 2, 2021
a3dedb4
Fixing more issues in solver intercompatibility
CeliaLaurent Apr 2, 2021
fc74d0d
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 2, 2021
4ccfc27
Merge branch 'develop' into petsc_dev
CeliaLaurent Apr 2, 2021
ec86825
restart changes
georgu Apr 6, 2021
68b7f17
some mpi bug fixes
georgu Apr 9, 2021
dae43a4
more for boxes
georgu Apr 10, 2021
ba0b19c
diagnostics on T/S
georgu Apr 14, 2021
06abd39
bug fix (atime)
georgu Apr 14, 2021
96254aa
still on diagnostics
georgu Apr 14, 2021
e22e60f
ice module debugging
georgu Apr 16, 2021
e889df4
ice debugging
shyfem-cm Apr 17, 2021
7f6bbf8
write 2d shyfiles in mpi mode
georgu Apr 17, 2021
2fd02c3
some bux fixes
georgu Apr 17, 2021
9067a96
Merge branch 'develop' of https://github.com/SHYFEM-model/shyfem into…
georgu Apr 17, 2021
dc4c581
fix typo error in simsys_pard and remove debug messages from mod_shym…
CeliaLaurent Apr 19, 2021
e715184
Merge branch 'develop' into petsc
CeliaLaurent Apr 19, 2021
7aef602
Merge branch 'petsc' into petsc_dev
CeliaLaurent Apr 19, 2021
c9c9d6b
Remove undefined mod_turbulence from Makefile
CeliaLaurent Apr 19, 2021
f4849b9
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 19, 2021
9a9f6d0
Removing dependence to pragma directives in new3di.f by adding use_PE…
CeliaLaurent Apr 20, 2021
5e47506
Reintroducing branch prediction optimization
CeliaLaurent Apr 20, 2021
82d1047
Fix meson tests handling of .petscrc files
CeliaLaurent Apr 20, 2021
760bef5
replace mod_turbulence by mod_keps in meson.build
CeliaLaurent Apr 20, 2021
5dc807b
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 20, 2021
c506b58
Minor changes to adapt files to the petsc branch
CeliaLaurent Apr 20, 2021
25fc5b7
check on shy file writing
georgu Apr 20, 2021
ebbfa00
syncing for shy files introduced
georgu Apr 20, 2021
13c7602
Merge branch 'develop' of https://github.com/SHYFEM-model/shyfem into…
georgu Apr 20, 2021
866f67d
minor
georgu Apr 20, 2021
e947a1c
replacing use_AmgX pragma directive with a logical fortran variable
CeliaLaurent Apr 20, 2021
d58c521
Removing last calls to pragma directives in newnohydro.f and mod_pets…
CeliaLaurent Apr 20, 2021
42ea864
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 20, 2021
234615f
Removing use_PETSc/AngX/SPK pragma directives from meson.build and ad…
CeliaLaurent Apr 20, 2021
48dcc76
Adding dummy amgx wrapper file to use with PETSc when AmgX is not pre…
CeliaLaurent Apr 20, 2021
7536464
Merge branch 'petsc_dev' into petsc_meson
CeliaLaurent Apr 20, 2021
3f4aabb
Merge branch 'develop' into petsc
CeliaLaurent Apr 20, 2021
18dd048
Merge branch 'petsc' into petsc_meson
CeliaLaurent Apr 20, 2021
bce6434
calling compiler-specific file descriptor function for intel and gnu
CeliaLaurent Apr 21, 2021
9fbdf7b
adding revision log
CeliaLaurent Apr 21, 2021
bae9759
Merge branch 'petsc' into petsc_meson
CeliaLaurent Apr 21, 2021
c4e87d3
Resetting NORMAL compilation profile
CeliaLaurent Apr 21, 2021
07e98af
Removing -fimplicit-none flag incompatible con old fortran files
CeliaLaurent Apr 22, 2021
7cb2cdc
Adding missing test files IMPLICIT_PETSc_AMGX.000*.str
CeliaLaurent Apr 22, 2021
a78d33c
some errors fixed due to bounds check
georgu Apr 22, 2021
5c33fc9
populate_string added to utils
georgu Apr 22, 2021
efff040
check bounds resolved
georgu Apr 22, 2021
60a03c5
fixed problem with bounds check and shyparts_metis
georgu Apr 22, 2021
bab6a1c
Rules.make with new compiler options
georgu Apr 22, 2021
c947077
Merge branch 'develop' of github.com:SHYFEM-model/shyfem into develop
CeliaLaurent Apr 23, 2021
07270fa
Merge branch 'develop' into petsc
CeliaLaurent Apr 23, 2021
f72ee5f
Fixing Rules.make for PETSc
CeliaLaurent Apr 23, 2021
46bf818
Few fixes to clean version respect to actual develop branch and fix e…
CeliaLaurent Apr 23, 2021
f2508b2
Few small fixes and adding log messages
CeliaLaurent Apr 23, 2021
a11bee8
Removing unnecessary tests_meson .str files
CeliaLaurent Apr 23, 2021
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
Prev Previous commit
Next Next commit
diagnostic output in newbcl
  • Loading branch information
@georgu
georgu committed Mar 24, 2021
commit c5647851f3ed5f27539bc9a7c5fba50bab3ba401
9 changes: 9 additions & 0 deletions COMMIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
============================================================

Wed Mar 24 11:48:54 CET 2021

diagnostic output in newbcl

fem3d/newbcl.f | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

============================================================

Wed Mar 24 11:16:39 CET 2021

bug fixes in box model
Expand Down
2 changes: 2 additions & 0 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
version 7_5_70 19-05-2020 VERS_7_5_70 commit_2021-03-24

version 7_5_70 19-05-2020 VERS_7_5_70 commit_2021-03-24

version 7_5_70 19-05-2020 VERS_7_5_70 commit_2020-12-18

version 7_5_70 19-05-2020 VERS_7_5_70 commit_2020-12-16
Expand Down
26 changes: 26 additions & 0 deletions fem3d/newbcl.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
c 05.03.2020 ggu finished new nudging routines
c 27.03.2020 ggu cleaned new nudging routines
c 17.09.2020 ggu renamed sigma to sigma_stp
c 24.03.2021 ggu more diagnostic output in ts_dia()
c
c notes :
c
Expand Down Expand Up @@ -1131,16 +1132,23 @@ subroutine getts(l,k,t,s)
subroutine ts_dia(string)

use mod_ts
use levels
use basin

implicit none

character*(*) string

logical berr
integer ke,k,l,lmax
real tmin,tmax,smin,smax
real t,s
character*20 aline
logical, save :: bwrite = .false.
logical, save :: bstop = .false.

integer ipext

tmin = minval(tempv)
tmax = maxval(tempv)
smin = minval(saltv)
Expand All @@ -1157,10 +1165,28 @@ subroutine ts_dia(string)
write(6,*) 'ts_dia: ',trim(string),' ',aline
write(6,*) 'saltv (min/max): ',smin,smax
write(6,*) 'tempv (min/max): ',tmin,tmax
write(6,*) 'for list of nodes see file fort.166'

write(166,*) 'ts_dia: ',trim(string),' ',aline
write(166,*) 'saltv (min/max): ',smin,smax
write(166,*) 'tempv (min/max): ',tmin,tmax
write(166,*) 'list of nodes with error:'
write(166,*) ' layer kintern kextern' //
+ ' s t'
do k=1,nkn
lmax = ilhkv(k)
ke = ipext(k)
do l=1,lmax
s = saltv(l,k)
t = tempv(l,k)
berr = .false.
if( t < tmin .or. t > tmax ) berr = .true.
if( s < smin .or. s > smax ) berr = .true.
if( berr ) then
write(166,*) l,k,ke,t,s
end if
end do
end do
end if

if( bstop ) stop 'error stop ts_dia'
Expand Down