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

Ww3 hycom #926

Draft
wants to merge 169 commits into
base: develop
Choose a base branch
from
Draft

Ww3 hycom #926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
09164b5
ww3_wise: add my comp and link
aronroland May 19, 2022
59638f6
ww3_wise: add my comp and link
aronroland May 21, 2022
9fd1a47
ww3_wise: comp and link datarmo
aronroland May 22, 2022
bb00127
ww3_wise: group velocities and new limiter ...
aronroland May 22, 2022
e5d2d9d
ww3_wise: improve speed of computation
aronroland May 26, 2022
826ab06
ww3_wise: further optimization level
aronroland May 26, 2022
d843168
ww3_wise: some more cleaning
aronroland May 26, 2022
29139ac
ww3_wise: more on performance
aronroland May 26, 2022
ff51b11
Merge branch 'ww3_wise' of https://github.com/erdc/WW3 into ww3_wise
aronroland May 26, 2022
a586cc9
ww3_wise: more on performance
aronroland May 27, 2022
89e2a1c
ww3_wise: ... memory ...
aronroland May 27, 2022
78ee80f
ww3_wise: fix more memcheck issues
aronroland May 27, 2022
4931557
ww3_wise: and more on memcheck
aronroland May 27, 2022
54b301a
ww3_wise: more on memcheck and others
aronroland May 28, 2022
193496b
ww3_wise: more on debugging ...
aronroland May 28, 2022
1b1c04c
ww3_wise: more on limiters ...
aronroland May 29, 2022
7924004
Merge branch 'develop' into ww3_wise
aronroland Jun 11, 2022
ed82af9
ww3_wise: merge from WISE
aronroland Jun 13, 2022
6b22bca
ww3_wise: fix typo and syntax error
aronroland Jun 16, 2022
a9c17c4
ww3_wise: testing load imbalance
aronroland Sep 16, 2022
e388055
ww3_wise: update wave reflection and extend for implicit
aronroland Sep 17, 2022
b6ed65c
ww3_wise: commit missing use part for reflection
aronroland Sep 28, 2022
5dcf76d
Merge branch 'develop' into ww3_wise
aronroland Sep 29, 2022
bb1ffd0
ww3_wise: conflicts
aronroland Sep 29, 2022
a6d7dfe
finished merge with develop
aronroland Sep 29, 2022
fba00ba
ww3_wise: more on the merge ...
aronroland Sep 29, 2022
8f9ba92
ww3_wise: next part of consolodiation
aronroland Sep 30, 2022
b60e6cc
ww3_wise: merge wave_setup
aronroland Sep 30, 2022
e79c3aa
ww3_wise: more on setup
aronroland Sep 30, 2022
70277b9
ww3_wise: 2nd part
aronroland Sep 30, 2022
fb2ba68
ww3_wise: debug stage 1 ...
aronroland Oct 1, 2022
e27966a
ww3_wise: update wave setup part
aronroland Oct 14, 2022
a850572
ww3_wise: add hycom modification for SHOM
aronroland Oct 14, 2022
a47ec3e
ww3_wise: Some bug fix for the HYCOM part
aronroland Oct 14, 2022
9dcbb74
ww3_wise: add proper link line in link.itedev
aronroland Oct 17, 2022
bb20505
ww3_wise: interfacing c ...
aronroland Oct 17, 2022
933fbc7
ww3_wise: type conversion in the solver
aronroland Oct 23, 2022
1c0db66
ww3_wise: add DD to OASIS ... 1st part ...now debugging
aronroland Oct 23, 2022
32a4b2b
ww3_wise: fix oasis coupling syntax error
aronroland Oct 24, 2022
98b7a8c
ww3_wise: more fix for oasis dd treatment
aronroland Oct 24, 2022
0edb71d
ww3_wise: more on the oasis part with respect to dd
aronroland Oct 26, 2022
a28560e
Merge branch 'develop' into ww3_wise
aronroland Oct 26, 2022
bcdf642
ww3_wise: more oasis stuff
aronroland Oct 26, 2022
425e450
Merge branch 'ww3_wise' of https://github.com/erdc/WW3 into ww3_wise
aronroland Oct 26, 2022
a62a0b5
ww3_wise: fix typo for oasis dd
aronroland Oct 27, 2022
e2efe78
ww3_wise: working on the debug flags ...
aronroland Oct 27, 2022
d05ad6b
ww3_wise: add some debug for oasis
aronroland Oct 27, 2022
f3b76af
ww3_wise: add more oasis input
aronroland Oct 27, 2022
5d1cea5
ww3_wise: add missing oasis part for unstructured now trying ORANGE p…
aronroland Oct 28, 2022
aa3380e
ww3_wise: add also for POINT partition ...
aronroland Oct 28, 2022
f903372
ww3_wise: add switch files ...
aronroland Oct 29, 2022
7314010
Merge branch 'develop' into ww3_wise_merge_develop
aronroland Nov 6, 2022
14cf5ee
ww3_wise_merge_develop: fixing merge errors ...
aronroland Nov 6, 2022
08d307a
ww3_wise_merge_develop: more merge errors ...
aronroland Nov 6, 2022
c8f7e8b
ww3_wise_merge_develop: more merge errors ...
aronroland Nov 6, 2022
8c9cc80
ww3_wise_merge_develop: more fixed for merge
aronroland Nov 6, 2022
3e5c1aa
ww3_wise_merge_develop: more on the merging ...
aronroland Nov 6, 2022
1c033a6
ww3_wise_merge_develop: more merging fun ...
aronroland Nov 6, 2022
2ac2531
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Nov 6, 2022
ff5dbb9
ww3_wise_merge_develop: more merging ...
aronroland Nov 6, 2022
0ea1334
ww3_wise_merge_develop: now it is compiling ...
aronroland Nov 6, 2022
82647a4
ww3_wise_merge_develop: more merge of setup work
aronroland Nov 23, 2022
e930d09
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Nov 23, 2022
508ee91
ww3_wise_merge_develop: consolidation of reflection part for ugtype
aronroland Nov 26, 2022
cf1464b
ww3_wise_merge_develop: more on setup and reflection ...
aronroland Nov 26, 2022
86b3f25
ww3_wise_merge_develop: cleaning
aronroland Nov 28, 2022
b2ac283
ww3_wise_merge_develop: testing output ..
aronroland Nov 28, 2022
2170617
ww3_wise_merge_develop: cleaning the refleciton part
aronroland Nov 28, 2022
284e175
ww3_wise_merge_develop: cleaning implicit reflection ...
aronroland Nov 29, 2022
ac163db
ww3_wise_merge_develop: more cleaning on reflection
aronroland Nov 30, 2022
d2bf8eb
ww3_wise_merge_develop: working on higher order scheme
aronroland Dec 2, 2022
390de6e
ww3_wise_merge_develop: fix bug in 2nd order explicit scheme and add …
aronroland Dec 2, 2022
fe8753e
ww3_wise_merge_develop: merge also my triad code
aronroland Dec 2, 2022
bbdc540
ww3_wise_merge_develop: merge last oasis work
aronroland Dec 6, 2022
b29df46
ww3_wise_merge_develop: more on oasis
aronroland Dec 8, 2022
df4d23f
ww3_wise_merge_develop: more on oasis
aronroland Dec 8, 2022
b4825a3
ww3_wise_merge_develop: now check for the wise version with OASIS, th…
aronroland Dec 8, 2022
8a17ae9
Revert "ww3_wise_merge_develop: now check for the wise version with O…
aronroland Dec 8, 2022
5dabcdb
ww3_wise_merge_develop: more on the oasis coupler ...
aronroland Dec 11, 2022
e3f9094
ww3_wise_merge_develop: fix compilation without pdlib
aronroland Dec 15, 2022
9b34518
ww3_wise_merge_develop: more on oasis and cleaning
aronroland Dec 16, 2022
8cd9af3
ww3_wise_merge_develop: next steps on oasis coupler ...
aronroland Dec 21, 2022
ca24457
ww3_wise_merge_develop: remove debug statements
aronroland Jan 3, 2023
203e3ff
ww3_wise_merge_develop: add ndr
aronroland Jan 10, 2023
d408adc
Merge branch 'develop' into ww3_wise_merge_develop
aronroland Jan 11, 2023
30ae20a
Merge branch 'develop' into ww3_wise_merge_develop
aronroland Jan 11, 2023
28476b6
ww3_wise_merge_develop: do missing locality in block explicit scheme
aronroland Jan 11, 2023
5694026
ww3_wise_merge_develop: rewrite block explicit scheme ...
aronroland Jan 12, 2023
756c105
ww3_wise_merge_develop: fix some small bugs ..
aronroland Jan 13, 2023
0f6c0ae
ww3_wise_merge_develop: add more testoutput
aronroland Jan 15, 2023
5e65ffc
ww3_wise_merge_develop: add missing reflection part
aronroland Jan 15, 2023
ddcd86b
ww3_wise_merge_develop: sync with mathieu's latest work for setup + t…
aronroland Jan 18, 2023
98d8ef3
ww3_wise_merge_develop: clean leftovers of setup computations ...
aronroland Jan 18, 2023
897cc81
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Jan 18, 2023
1b15ddc
ww3_wise_merge_develop: cleaning of the oasis part and more work on t…
aronroland Jan 23, 2023
9315406
ww3_wise_merge_develop: add stdout about the unst schemes used
aronroland Jan 23, 2023
f686842
ww3_wise_merge_develop: getting rid of more barriers for oasis debugging
aronroland Jan 23, 2023
701dbb6
ww3_wise_merge_develop: more on oasis
aronroland Jan 23, 2023
748d7b0
ww3_wise_merge_develop: cleaning, consolidation, default variables, o…
aronroland Jan 27, 2023
c27a637
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Jan 27, 2023
acd34c7
ww3_wise_merge_develop: do intermediate fix for exchange of the block…
aronroland Jan 27, 2023
e4fd5c1
ww3_wise_merge_develop: fix for block explicit
aronroland Jan 27, 2023
2678302
ww3_wise_merge_develop: missing part of last merge ...
aronroland Jan 29, 2023
2083e06
ww3_wise_merge_develop: cleaning ..
aronroland Jan 29, 2023
4e080fb
ww3_wise_merge_develop: turn of new limiter
aronroland Jan 29, 2023
500f104
ww3_wise_merge_develop: quick fix for implicit scheme without sources…
aronroland Feb 1, 2023
ceefdee
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Feb 1, 2023
6abc55a
ww3_wise_merge_develop: code consolidation
aronroland Feb 2, 2023
54fee19
ww3_wise_merge_develop: fix for oasis
aronroland Feb 3, 2023
7c2f6ee
ww3_wise_merge_develop: add swicthes for SHOM
aronroland Feb 3, 2023
0a0c905
ww3_wise_merge_develop: fix logics in switches
aronroland Feb 3, 2023
eb04676
ww3_wise_merge_develop: cleaning
aronroland Feb 3, 2023
cf7c31e
ww3_wise_merge_develop: SOLVED THE CURRENT BUG!
aronroland Feb 5, 2023
f8005a0
fix conflict
Feb 8, 2023
3cb2ff3
two bug fixes for nonpdlib regtests
Feb 8, 2023
192b8ea
move CPUTIME to MPI swtich ifdef
Feb 8, 2023
fd450c3
fix for non-pdlib cases
Feb 8, 2023
a901e7b
update ncep matrix module versions
Feb 8, 2023
7a80232
additonal fixes for regtests
Feb 9, 2023
a32b4c5
add regtests for global_unstr
Feb 9, 2023
8f1ebea
revert model/bin
Feb 9, 2023
880f159
revert model/src/CMakeLists.txt
Feb 9, 2023
c68cfb3
revert regtests/ww3_tp2.6
Feb 9, 2023
03c3197
ww3_wise_merge_develop: comment in wave setup computation .ww3_wise_m…
aronroland Feb 10, 2023
aafb0d4
ww3_wise_merge_develop: some little test before final freeze
aronroland Feb 11, 2023
06bf389
ww3_wise_merge_develop: revert
aronroland Feb 12, 2023
3c51988
merge upstream dev
Feb 16, 2023
ca76d1c
ww3_wise_merge_develop: 1st round of cleaning debug statements
aronroland Feb 17, 2023
3d68cd6
ww3_wise_merge_develop: cleaned all cluter, debug and other leftovers…
aronroland Feb 17, 2023
f682540
ww3_wise_merge_develop: move to point partition for OASIS
aronroland Feb 18, 2023
d7a3938
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Feb 18, 2023
d3d4981
ww3_wise_merge_develop: fix ifdef/endif issue
aronroland Feb 20, 2023
3a60217
ww3_wise_merge_develop: fix bug in triads
aronroland Feb 22, 2023
b984b26
ww3_wise_merge_develop: add back doxygen
aronroland Feb 22, 2023
5547572
ww3_wise_merge_develop: more on the comments
aronroland Feb 22, 2023
ec13e94
ww3_wise_merge_develop: order of declaration
aronroland Feb 22, 2023
df6cc07
ww3_wise_merge_develop: more cleaning
aronroland Feb 22, 2023
30574c3
ww3_wise_merge_develop: more cleaning ...
aronroland Feb 22, 2023
d33791d
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Feb 22, 2023
4bda7c6
ww3_wise_merge_develop: work on headers
aronroland Feb 24, 2023
bee8db5
ww3_wise_merge_develop: doing some more checks ...
aronroland Feb 24, 2023
21f32d0
ww3_wise_merge_develop: extend for car-deck approach
aronroland Feb 25, 2023
58585dc
ww3_wise_merge_develop: more cleanup and consolidation
aronroland Feb 27, 2023
539907f
ww3_wise_merge_develop: delete cluter and dbg msg
aronroland Feb 27, 2023
c40694d
ww3_wise_merge_develop: more cleaning of stdout
aronroland Feb 27, 2023
596a34d
ww3_wise_merge_develop: more cleaning
aronroland Feb 27, 2023
0f4ed02
ww3_wise_merge_develop: add more namelist comments, not finished yet
aronroland Feb 27, 2023
a32ca06
ww3_wise_merge_develop: edit namelist based on jessica input
aronroland Feb 27, 2023
e29a9c0
ww3_wise_merge_develop: fix issues following tyler
aronroland Feb 27, 2023
d8ada73
ww3_wise_merge_develop: some more work on the namelist comments
aronroland Feb 27, 2023
533ac5f
ww3_wise_merge_develop: working on the namelist
aronroland Feb 28, 2023
8643a93
Merge branch 'NOAA-EMC:develop' into ww3_wise_merge_develop
aliabdolali Feb 28, 2023
04b4451
ww3_wise_merge_develop: clean and add missing pragma
aronroland Feb 28, 2023
1b6c95e
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Feb 28, 2023
f40ef82
ww3_wise_merge_develop: cleaning and namelist
aronroland Feb 28, 2023
ef22a77
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Feb 28, 2023
d9a5737
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Feb 28, 2023
dd60dcb
adding boers case regtest ww3_tp2.19
thesser1 Mar 1, 2023
3cd9ca2
ww3_wise_merge_develop: add explanation of unst namelist in the inp f…
aronroland Mar 1, 2023
962900a
cleaning up regtest 2.19
thesser1 Mar 1, 2023
0ccb4e9
merge develop
Mar 1, 2023
2fa2b76
Update switch_PDLIB
aliabdolali Mar 1, 2023
3757cd7
Merge branch 'ww3_wise_merge_develop' of https://github.com/erdc/WW3 …
aronroland Mar 2, 2023
0bff17e
ww3_hycom: start working on hycom part
aronroland Mar 2, 2023
47d1d94
ww3_hycom: add bug fix from develop ...
aronroland Jun 27, 2023
7d2d36f
Merge branch 'develop' into ww3_hycom
aronroland Dec 2, 2023
c38f88e
ww3_hycom: clean init in w3grid
aronroland Jan 16, 2024
8d55203
ww3_hycom: merging changes with SHOM
aronroland Apr 26, 2024
dd5ff98
ww3_hycom: merge ww3_shel from SHOM
aronroland Apr 26, 2024
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
finished merge with develop
  • Loading branch information
@aronroland
aronroland committed Sep 29, 2022
commit a6d7dfe2b8aa582fcd0a4cfb889b21947e07f687
4 changes: 2 additions & 2 deletions model/src/w3profsmd_pdlib.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5701,7 +5701,7 @@ SUBROUTINE PDLIB_JACOBI_GAUSS_SEIDEL_BLOCK(IMOD, FACX, FACY, DTG, VGX, VGY)
REAL :: eVal1, eVal2!, extmp(nspec,nseal)
REAL :: eVA, CG2, NEWDAC, NEWAC, OLDAC, MAXDAC
REAL :: CG1(0:NK+1), WN1(0:NK+1)
LOGICAL :: LCONVERGED(NSEAL), lexist
LOGICAL :: LCONVERGED(NSEAL), lexist, LLWS(NSPEC)
#ifdef WEIGHTS
INTEGER :: ipiter(nseal), ipitergl(np_global), ipiterout(np_global)
#endif
Expand Down Expand Up @@ -6259,7 +6259,7 @@ SUBROUTINE PDLIB_JACOBI_GAUSS_SEIDEL_BLOCK(IMOD, FACX, FACY, DTG, VGX, VGY)
!
! Terminate via differences
!
IF (B_JGS_TERMINATE_DIFFERENCE .and. IMOD(NBITER,10) == 0) THEN
IF (B_JGS_TERMINATE_DIFFERENCE .and. INT(MOD(NBITER,10)) == 0) THEN

!WRITE(740+IAPROC,*) myrank, 'solver before', nbiter, is_converged, prop_conv, B_JGS_PMIN
CALL MPI_ALLREDUCE(is_converged, itmp, 1, MPI_INT, MPI_SUM, MPI_COMM_WCMP, ierr)
Expand Down
27 changes: 0 additions & 27 deletions model/src/ww3_shel.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,20 +504,6 @@ PROGRAM W3SHEL
! 1. IO set-up
! 1.a For shell
!
<<<<<<< HEAD
#ifdef W3_DEBUGINIT
WRITE(740+IAPROC,*) 'ww3_shel, step 1'
FLUSH(740+IAPROC)
#endif

#ifdef W3_MEMCHECK
WRITE(100000+IAPROC,*) 'memcheck_____:', 'WW3_SHEL SECTION 1'
call getMallocInfo(mallinfos)
call printMallInfo(100000+IAPROC,mallInfos)
#endif

=======
>>>>>>> develop
NDSI = 10
NDSS = 90
NDSO = 6
Expand Down Expand Up @@ -1345,19 +1331,6 @@ PROGRAM W3SHEL
CALL EXTCDE ( 6666 )
ENDIF
#endif
<<<<<<< HEAD
#ifdef W3_DEBUGINIT
write(740+IAPROC,*), ' After read 2002, case 6'
#endif

#ifdef W3_MEMCHECK
WRITE(100000+IAPROC,*) 'memcheck_____:', 'WW3_SHEL SECTION BEFORE IOGR'
call getMallocInfo(mallinfos)
call printMallInfo(100000+IAPROC,mallInfos)
#endif

=======
>>>>>>> develop
CALL W3IOGR ( 'GRID', NDSF(7) )

#ifdef W3_MEMCHECK
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy