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

Fb oasis t+0 #13

Merged
merged 18 commits into from
Oct 5, 2020
Merged

Fb oasis t+0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
98c5702
Added boundary checks to the SMC grid input files for ww3_grid,
UKMO-lsampson Jun 8, 2020
71b9ba9
Fb 360 calendar (#8)
ukmo-juan-castillo Jul 16, 2020
6c42d17
RTD support for ww3_boun[dc] (#10)
ukmo-ccbunney Jul 28, 2020
5c361aa
Fb coupling time (#9)
ukmo-juan-castillo Jul 30, 2020
b29bc17
Merge with staging (hopefully)
ukmo-juan-castillo Aug 20, 2020
69e16a5
Merge branch 'staging' into fb_oasis_t+0
ukmo-juan-castillo Aug 20, 2020
eeac752
Merge branch 'develop' into fb_oasis_t+0
ukmo-juan-castillo Aug 20, 2020
a73eda6
Final set of changes to couple with OASIS at t+0 by default, before
ukmo-juan-castillo Aug 27, 2020
6c9092e
Small change to remove warnings when some output variables are not set,
ukmo-juan-castillo Sep 7, 2020
b01d239
Extra clarifying comments in the code and template file
ukmo-juan-castillo Sep 8, 2020
33a7d56
Remove unnecessary code lines - OARST is calculated in w3init
ukmo-juan-castillo Sep 9, 2020
e90c009
Adding description of the new coupled regtest
ukmo-juan-castillo Sep 24, 2020
6d1a5d4
Modifications suggested by the reviewers: coupling at T+0 is not done by
ukmo-juan-castillo Sep 29, 2020
09cd7e4
Final clean-up, ready for regtest testing
ukmo-juan-castillo Sep 29, 2020
7de6d00
Correction to properly update OARST
ukmo-juan-castillo Sep 29, 2020
8a0c552
Fix date in one comment
ukmo-juan-castillo Sep 30, 2020
8605549
Revert changes in matrix_ukmo_cray as requested by reviewer; fix
ukmo-juan-castillo Oct 5, 2020
6b9e35c
Merge branch 'staging_oct20' into fb_oasis_t+0
ukmo-juan-castillo Oct 5, 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
3 changes: 2 additions & 1 deletion model/bin/ww3_from_ftp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ cp -r data_regtests/ww3_tp2.12/input/* regtests/ww3_tp2.12/input/
cp -r data_regtests/ww3_tp2.12/input_be/* regtests/ww3_tp2.12/input_be/
cp -r data_regtests/ww3_tp2.12/input_le/* regtests/ww3_tp2.12/input_le/
cp -r data_regtests/ww3_tp2.14/input/r-ww3.nc.OAS*CM regtests/ww3_tp2.14/input/
cp -r data_regtests/ww3_tp2.14/input/r-ww3.nc.OASACM regtests/ww3_tp2.14/input/OASACM2
cp -r data_regtests/ww3_tp2.14/input/r-ww3.nc.OASACM regtests/ww3_tp2.14/input/r-ww3.nc.OASACM2
if [ ! -d regtests/ww3_tp2.14/input/oasis3-mct/doc ]
then
Expand All @@ -46,6 +45,8 @@ cp -r data_regtests/ww3_tp2.14/input/oasis3-mct/doc/* regtests/ww3_tp2.14/input/
cp -r data_regtests/ww3_tp2.14/input/toy/*.nc.OAS*CM regtests/ww3_tp2.14/input/toy/
cp -r data_regtests/ww3_tp2.14/input/toy/r-toy.nc.OASACM regtests/ww3_tp2.14/input/toy/r-toy.nc.OASACM2
cp -r data_regtests/ww3_tp2.14/input/toy/toy_coupled_field.nc.OASACM regtests/ww3_tp2.14/input/toy/toy_coupled_field.nc.OASACM2
cp -r data_regtests/ww3_tp2.14/input/toy/toy_coupled_field.nc.OASACM regtests/ww3_tp2.14/input/toy/toy_coupled_field.nc.OASACM4
cp -r data_regtests/ww3_tp2.14/input/toy/toy_coupled_field.nc.OASACM regtests/ww3_tp2.14/input/toy/toy_coupled_field.nc.OASACM5
cp -r data_regtests/ww3_tp2.14/input/toy/*.nc regtests/ww3_tp2.14/input/toy/
cp -r data_regtests/ww3_tp2.17/input/* regtests/ww3_tp2.17/input/

Expand Down
8 changes: 5 additions & 3 deletions model/ftn/w3fldsmd.ftn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@
!/ | WAVEWATCH III NOAA/NCEP |
!/ | H. L. Tolman |
!/ | FORTRAN 90 |
!/ | Last update : 24-Apr-2015 |
!/ | Last update : 25-Sep-2020 |
!/ +-----------------------------------+
!/
!/ 15-Jan-1999 : Final FORTRAN 77 ( version 1.18 )
Expand All @@ -929,6 +929,7 @@
!/ 26-Dec-2012 : Modified obsolete declarations. ( version 4.11 )
!/ 24-Apr-2015 : Adding OASIS coupling calls ( version 5.07 )
!/ (M. Accensi & F. Ardhuin, IFREMER)
!/ 25-Sep-2020 : Receive coupled fields at T+0 ( version 7.xx )
!/
! 1. Purpose :
!
Expand Down Expand Up @@ -1020,7 +1021,7 @@
!/
!/S USE W3SERVMD, ONLY: STRACE
USE W3TIMEMD
!/OASIS USE W3OACPMD, ONLY: ID_OASIS_TIME
!/OASIS USE W3OACPMD, ONLY: ID_OASIS_TIME, CPLT0
!/OASACM USE W3AGCMMD, ONLY: RCV_FIELDS_FROM_ATMOS
!/OASOCM USE W3OGCMMD, ONLY: RCV_FIELDS_FROM_OCEAN
!/OASICM USE W3IGCMMD, ONLY: RCV_FIELDS_FROM_ICE
Expand Down Expand Up @@ -1164,7 +1165,8 @@
!/OASIS IF (FLCOUPL) THEN
!/OASIS ! Do not receive coupling fields at the end of the first integration time in case of
!/OASIS ! forcing with a non interpolated field (like lev, ice, ...)
!/OASIS IF ((ID_OASIS_TIME.EQ.0 .AND. FLFRST) .OR. (ID_OASIS_TIME.GT.0)) THEN
!/OASIS IF ( (ID_OASIS_TIME.EQ.0 .AND. ( FLFRST .OR. CPLT0 )) .OR. &
!/OASIS (ID_OASIS_TIME.GT.0)) THEN
!
!/OASACM ! Getting U10 (FXN) and V10 (FYN) from atmospheric model
!/OASACM CALL RCV_FIELDS_FROM_ATMOS(COUPL_COMM, &
Expand Down
437 changes: 425 additions & 12 deletions model/ftn/w3initmd.ftn
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 20 additions & 14 deletions model/ftn/w3iogomd.ftn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,13 @@
!/ | WAVEWATCH III NOAA/NCEP |
!/ | F. Ardhuin |
!/ | FORTRAN 90 |
!/ | Last update : 30-Apr-2014 |
!/ | Last update : 25-Sep-2020 |
!/ +-----------------------------------+
!/
!/ 15-Apr-2013 : Origination. ( version 4.10 )
!/ 31-Jan-2014 : Bug fix warning output (Tolman). ( version 4.18 )
!/ 30-Apr-2014 : Add th2m and sth2m calculation ( version 5.01 )
!/ 25-Sep-2020 : Calculate FLG1D for any processor ( version 7.xx )
!/
! 1. Purpose :
!
Expand Down Expand Up @@ -655,21 +656,20 @@
CASE('U2')
FLG2D(10,2)=.TRUE.
!/COU CASE('DRY')
CASE('UNSET')
CASE DEFAULT
IF ( IAPROC .EQ. NAPOUT ) WRITE (NDSEN,1004) TRIM(TESTSTR)
END SELECT
!
IF(ANY(FLG2D(IFI,:))) FLG1D(IFI)=.TRUE. !Update FLG1D
!
IOUT=IOUT+1
!
END DO
!
END IF
!
IF ( IAPROC .EQ. NAPOUT ) THEN
FLT = .TRUE.
DO IFI=1, NOGRP
FLT = .TRUE.
DO IFI=1, NOGRP
IF ( IAPROC .EQ. NAPOUT ) THEN
DO IFJ=1, NGRPP
IF ( FLG2D(IFI,IFJ) ) THEN
IF ( FLT ) THEN
Expand All @@ -680,7 +680,10 @@
END IF
END IF
END DO
END DO
END IF
IF(ANY(FLG2D(IFI,:))) FLG1D(IFI)=.TRUE. !Update FLG1D
END DO
IF ( IAPROC .EQ. NAPOUT ) THEN
IF ( FLT ) WRITE (NDSO,1945) 'no fields defined'
END IF
!
Expand Down Expand Up @@ -745,13 +748,14 @@
!/ | WAVEWATCH III NOAA/NCEP |
!/ | F. Ardhuin |
!/ | FORTRAN 90 |
!/ | Last update : 30-Apr-2014 |
!/ | Last update : 25-Sep-2020 |
!/ +-----------------------------------+
!/
!/ 15-Apr-2013 : Origination. ( version 4.10 )
!/ 31-Jan-2014 : Bug fix warning output (Tolman). ( version 4.18 )
!/ 30-Apr-2014 : Add th2m and sth2m calculation ( version 5.01 )
!/ 17-Feb-2016 : New version for namelist use ( version 5.11 )
!/ 25-Sep-2020 : Calculate FLG1D for any processor ( version 7.xx )
!/
! 1. Purpose :
!
Expand Down Expand Up @@ -1084,9 +1088,9 @@
!
END DO
!
IF ( IAPROC .EQ. NAPOUT ) THEN
FLT = .TRUE.
DO IFI=1, NOGRP
FLT = .TRUE.
DO IFI=1, NOGRP
IF ( IAPROC .EQ. NAPOUT ) THEN
DO IFJ=1, NGRPP
IF ( FLG2D(IFI,IFJ) ) THEN
IF ( FLT ) THEN
Expand All @@ -1097,10 +1101,12 @@
END IF
END IF
END DO
IF(ANY(FLG2D(IFI,:))) FLG1D(IFI)=.TRUE. !Update FLG1D
END DO
ENDIF
IF(ANY(FLG2D(IFI,:))) FLG1D(IFI)=.TRUE. !Update FLG1D
END DO
IF ( IAPROC .EQ. NAPOUT ) THEN
IF ( FLT ) WRITE (NDSO,1945) 'no fields defined'
END IF
ENDIF
!
RETURN
!
Expand Down
Loading