Skip to content

Commit

Permalink
Updates for wave coupling in NUOPC (#196)
Browse files Browse the repository at this point in the history
* Updates for wave coupling in NUOPC
* add exports of PSTOKES for WW3->MOM6 coupling
* add ice value for surface roughness and FLD2 to switch
* add FieldFill and FieldGather to the timings of wmesmf
* Updates to compile wmesmf after PR#189
* Updating Stokes partitions calculation to make sure there are
  default values

* for wcoss-phase2 open -> qopen
  • Loading branch information
JessicaMeixner-NOAA authored May 11, 2020
1 parent 2f57030 commit c53063c
Show file tree
Hide file tree
Showing 5 changed files with 324 additions and 29 deletions.
2 changes: 1 addition & 1 deletion model/bin/comp.wcoss_phase2
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
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
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
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

0 comments on commit c53063c

Please sign in to comment.