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

Updates for wave coupling in NUOPC #196

Merged
merged 5 commits into from
May 11, 2020
+324 −29
Merged

Updates for wave coupling in NUOPC #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9580dc
Updates for wave coupling in NUOPC
JessicaMeixner-NOAA May 8, 2020
daf6566
Merge remote-tracking branch 'EMC/develop' into PR/waveoceancpl
JessicaMeixner-NOAA May 10, 2020
8e81a99
for wcoss-phase2 open -> qopen
JessicaMeixner-NOAA May 10, 2020
437abed
Merge remote-tracking branch 'EMC/develop' into PR/waveoceancpl
JessicaMeixner-NOAA May 11, 2020
879964f
Merge branch 'PR/waveoceancpl' of https://github.com/JessicaMeixner-N…
JessicaMeixner-NOAA May 11, 2020
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
2 changes: 1 addition & 1 deletion model/bin/comp.wcoss_phase2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
# open mpi implementation
if [ "$omp_mod" = 'yes' ]
then
opt="$opt -openmp"
opt="$opt -qopenmp"
fi

# oasis coupler include dir
Expand Down
2 changes: 1 addition & 1 deletion model/bin/link.wcoss_phase2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
# open mpi implementation
if [ "$omp_mod" = 'yes' ]
then
opt="$opt -openmp"
opt="$opt -qopenmp"
fi

# oasis coupler archive
Expand Down
1 change: 1 addition & 0 deletions model/esmf/switch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ NL1
BT1
DB1
MLIM
FLD2
TR0
BS0
XX0
Expand Down
8 changes: 5 additions & 3 deletions model/ftn/w3iogomd.ftn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3689,7 +3689,7 @@
!/S INTEGER, SAVE :: IENT = 0
REAL :: FACTOR, FKD,KD
REAL :: ABX(NSEAL), ABY(NSEAL), USSCO
REAL :: MINDIFF=1.e8
REAL :: MINDIFF
INTEGER :: Spc2Bnd(NK)
!/
!/ ------------------------------------------------------------------- /
Expand Down Expand Up @@ -3782,13 +3782,15 @@
ENDIF
ELSEIF (USS_SWITCH==2) THEN
! Match each spectral component to the nearest partition
DO IB=1,USSPF(2)
MINDIFF=1.e8
Spc2BND(IK) = 1
MINDIFF=abs(USSP_WN(1)-WN(IK,ISEA))
DO IB=2,USSPF(2)
IF (MinDiff .gt. abs(USSP_WN(IB)-WN(IK,ISEA))) then
Spc2BND(IK) = IB
MinDiff = abs(USSP_WN(IB)-WN(IK,ISEA))
ENDIF
ENDDO
MINDIFF=1.e8
!Put spectral energey into whichever band central wavenumber fits in
USSP(JSEA,Spc2Bnd(IK)) = USSP(JSEA,Spc2Bnd(IK)) + ABX(JSEA)*USSCO
USSP(JSEA,NK+Spc2BND(IK)) = USSP(JSEA,NK+Spc2Bnd(IK)) + ABY(JSEA)*USSCO
Expand Down
Loading