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.

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

ifs-source sync #8

Merged
merged 131 commits into from
Jan 25, 2024
Merged
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
952d348
IFS-SOURCE-ECWAM-SYNC: add missing members of TYPE(FORCING_FIELDS)
awnawab Dec 6, 2023
486070b
STATIC LINKING FIX: set LINKER_LANGUAGE for ecwam programs
awnawab Nov 14, 2023
90e594c
NVHPC: Downgrading compiler optimisation for two more files
mlange05 May 26, 2023
bd56b89
IFS-SOURCE-ECWAM-SYNC: resolved merge conflicts with master as of 202…
awnawab Dec 5, 2023
67416b8
add comments
jrbidlot Apr 18, 2023
0c870fe
test when land is detected in line search to exit loop and iterate th…
jrbidlot Apr 18, 2023
6aabed4
test when land is detected in line search to exit loop and iterate th…
jrbidlot Apr 18, 2023
7de7e43
revert previous change
jrbidlot Apr 19, 2023
317fc0b
set IREINF back to 1 for XDELLA <= 0.1
jrbidlot Apr 25, 2023
770e2ec
quick test on sensitivity of SQRT2 being sqrt(2) rather than 2
jrbidlot Apr 26, 2023
4f17315
SQRT2 -> PENHCOR
jrbidlot Apr 27, 2023
c7ecac8
corrections
jrbidlot Apr 28, 2023
0ca9503
cosmetic
jrbidlot Apr 29, 2023
af501da
cosmetic
jrbidlot Apr 29, 2023
674e3e9
correction
jrbidlot Apr 29, 2023
7dfe2b8
cosmetic
jrbidlot Apr 30, 2023
97cf590
bug fix in buildstress
jrbidlot Apr 30, 2023
67c250b
fix
jrbidlot May 1, 2023
71698f2
correct readwgrib to be general
jrbidlot May 1, 2023
c6d591f
silly test
jrbidlot May 2, 2023
7fa0660
revert previous silly test
jrbidlot May 4, 2023
8f8fc92
moving away from input BLK2GLO
jrbidlot May 17, 2023
2f6d1da
DEPTH_INPUT replaced by BATHY
jrbidlot May 17, 2023
c6afdf2
DEPTH_INPUT replaced by BATHY
jrbidlot May 17, 2023
c29ba0a
remove BLK2GLO from input
jrbidlot May 17, 2023
6b4358d
remove BLK2GLO from input
jrbidlot May 17, 2023
c739bb1
save
jrbidlot May 18, 2023
c324497
test
jrbidlot May 19, 2023
809ba02
test
jrbidlot May 19, 2023
813afd7
test
jrbidlot May 19, 2023
cac9eeb
reduced memory for calling propconnect
jrbidlot May 19, 2023
970ff16
adapt propconnect for 2d decomposition
jrbidlot May 19, 2023
3dd6536
adapt propconnect for 2d decomposition
jrbidlot May 19, 2023
3835674
adapt propconnect for 2d decomposition
jrbidlot May 19, 2023
6056258
OpenMP call propconnect
jrbidlot May 30, 2023
130201e
moving mcout to initmdl
jrbidlot May 31, 2023
f4fb67f
moving mcout to initmdl
jrbidlot May 31, 2023
efc9ecb
moving mcout to initmdl
jrbidlot May 31, 2023
cc697a9
reformatting output
jrbidlot Jun 1, 2023
1bb0b4a
reformatting output
jrbidlot Jun 1, 2023
5474259
reformatting output
jrbidlot Jun 1, 2023
d0f5c7b
move call to nlweigt to inisnonlin
jrbidlot Jun 1, 2023
58d85a8
test
jrbidlot Jun 2, 2023
73fc16c
move 2nd order correction table calculations out of preproc
jrbidlot Jun 2, 2023
3b54499
move 2nd order correction table calculations out of preproc
jrbidlot Jun 2, 2023
701b36e
move 2nd order correction table calculations out of preproc
jrbidlot Jun 2, 2023
154e9c5
activate cummulative dissipation for testing
jrbidlot Jun 2, 2023
4128d94
remove dependency on INDEP in SDISS_ARD
jrbidlot Jun 2, 2023
2204564
remove dependency on INDEP in SDISS_ARD
jrbidlot Jun 2, 2023
02f6bbf
debile
jrbidlot Jun 2, 2023
6a836ef
reset cummulative term to 0
jrbidlot Jun 3, 2023
647b9d5
test
jrbidlot Jun 8, 2023
9254361
test
jrbidlot Jun 8, 2023
13e3f7d
test
jrbidlot Jun 8, 2023
2229841
removal of depth table
jrbidlot Jun 8, 2023
2128cbe
use ctcor
jrbidlot Jun 9, 2023
08938c4
clean makefiles
jrbidlot Jun 9, 2023
3cb70bf
correction
jrbidlot Jun 9, 2023
c93af77
save
jrbidlot Jun 12, 2023
a63ba36
cleanning readpreb
jrbidlot Jun 13, 2023
1c32ded
test passing grib2 from IFS to WAM
jrbidlot Jun 6, 2023
eb38d1b
test passing grib2 from IFS to WAM
jrbidlot Jun 6, 2023
5a1a875
debug
jrbidlot Jun 6, 2023
1b87539
debug
jrbidlot Jun 7, 2023
4dcca59
debug
jrbidlot Jun 7, 2023
89fb97d
NGRIB_VERSION in IFS
jrbidlot Jun 7, 2023
2be9d83
clean up
jrbidlot Jun 7, 2023
9c8a305
test using NULERR from fiat module EC_LUN
jrbidlot Jun 13, 2023
d9197f2
test using NULERR from fiat module EC_LUN
jrbidlot Jun 14, 2023
47b0c04
get the changes realted to grib2, restart file for nstpw > 1 and use …
jrbidlot Jun 14, 2023
744ab1a
removing frequency and direction arrays from input
jrbidlot Jun 15, 2023
cdf8269
correction
jrbidlot Jun 15, 2023
3f887fc
fic preset
jrbidlot Jun 15, 2023
5a3aa19
corrections
jrbidlot Jun 15, 2023
6127d91
corrections
jrbidlot Jun 16, 2023
5f3394a
Another fix up of merge 880aef02141132f326709dd7b61e5ea01459c8cf
towil1 Jun 16, 2023
e2949ea
save
jrbidlot Jun 16, 2023
b4c2c55
fix
jrbidlot Jun 16, 2023
0f4cbd4
fix
jrbidlot Jun 16, 2023
43c3df6
test
jrbidlot Jun 17, 2023
d3ea8db
test
jrbidlot Jun 18, 2023
2164943
test
jrbidlot Jun 19, 2023
b4902c1
IFS-SOURCE-ECWAM-SYNC: switch to ECFLOW_LIGHT_UPDATE_METER in wavemdl…
awnawab Dec 6, 2023
b77af2d
test
jrbidlot Jun 19, 2023
e46cd97
test
jrbidlot Jun 19, 2023
9a32f13
fix for mchunk
jrbidlot Jun 20, 2023
34c3d2c
fix intwaminput
jrbidlot Jun 21, 2023
2e16ce6
IFS-2944: Fix illegal edit descriptor for GNU compiler
cresswellp Jun 26, 2023
77cc995
create readmdlconf.F90
jrbidlot Jun 26, 2023
3d05f40
debile
jrbidlot Jun 26, 2023
51e18ae
silly
jrbidlot Jun 26, 2023
6aa00db
correct mpbcastgrid.F90
jrbidlot Jun 27, 2023
1601dd5
IFS-2945: Fix race condition breaking no-NEMO builds
cresswellp Jun 26, 2023
dd8a9ae
use IMDLGRBID_G to identify the input bathymetry
jrbidlot Jun 27, 2023
40c60dc
test changing the percentage of shallow points used to compute the me…
jrbidlot Jun 28, 2023
b0ffd34
try to boost obstruction for high res to compensate for lack on resol…
jrbidlot Jun 29, 2023
9fad3e3
debile
jrbidlot Jun 30, 2023
cfa860d
for resolution below 0.125 degree LSM based on 50% rather than 60%
jrbidlot Jun 30, 2023
cc116d2
add boost to corner obstructions
jrbidlot Jun 30, 2023
a53afae
boost blocking from 50m and deeper
jrbidlot Jul 1, 2023
28b97d6
DEPTHA double at input
jrbidlot Jul 3, 2023
8458505
fix mpminmaxavg for global norm to use the actuall number of non miss…
jrbidlot Jul 3, 2023
fcf3158
remove boosting subgrid
jrbidlot Jul 6, 2023
269cc04
SSDSSC5 0.5
jrbidlot Jul 6, 2023
d28b059
revert SSDSC5 to 0
jrbidlot Jul 10, 2023
037bdd3
correct create_wam_bathymetry_ETOPO1 to not count the same subgrid li…
jrbidlot Jul 13, 2023
ecd0644
smooth a bit the bathymetry and reduced threshold for submerged obstr…
jrbidlot Jul 13, 2023
d913e42
correction
jrbidlot Jul 14, 2023
1c70aa8
try XKEXTHRS 200 instead
jrbidlot Jul 15, 2023
e418d24
revert change to XKEXTHRS and increase IREINF to 4
jrbidlot Jul 16, 2023
36e4832
make sure that all retuning only applies for XDELLA <= 0.125
jrbidlot Jul 20, 2023
e2e8c9d
split initalint to limit memeory usage when running on same grid
jrbidlot Jul 22, 2023
5050622
i I
jrbidlot Jul 22, 2023
9d74c57
limit when global array that is returned to ifs is initialised
jrbidlot Jul 22, 2023
531b2ce
make rfl4wam more verbose if not finding its input
jrbidlot Sep 24, 2023
878df33
mpuserin more verbose
jrbidlot Sep 25, 2023
c15e2ac
Fix hang on LUMI-G by reordering comms and using non-blocking
ioanhadade Dec 3, 2023
bfec65a
IFS-SOURCE-ECWAM-SYNC: don't use ecflow_light in standalone builds
awnawab Dec 6, 2023
19a14f5
IFS-SOURCE-ECWAM-SYNC: update preproc,preset,model runner scripts for…
awnawab Dec 6, 2023
af58bf1
IFS-SOURCE-ECWAM-SYNC: merge CY48R1 into CY49R1_develop fixup
awnawab Dec 7, 2023
f90c011
fix for mpdecomp for Tco3999
jrbidlot Dec 5, 2023
4115cd5
ECWAM: Restore statement function in TAUT_Z0
awnawab Dec 21, 2023
55df4e2
IFS-2839 Exclude wamassi with FORECAST_ONLY
wdeconinck Mar 30, 2023
70c58b9
FIELD_API: fix fetchcontent mechanism so it isn't triggered if field_…
awnawab Dec 21, 2023
6f16c55
ECWAM: Fix to norm calculation in mpminmaxavg.F90
awnawab Dec 27, 2023
86045de
IFS-SOURCE-ECWAM-SYNC: update validation hashes for standalone runner
awnawab Dec 28, 2023
58fc919
IFS-SOURCE-ECWAM-SYNC: update validation hashes for aqua and era5 tests
awnawab Dec 28, 2023
4cf503c
ECWAM: set fp-model=strict for propconnect.F90 for Intel builds
awnawab Dec 28, 2023
3f77924
ECWAM: fix aqua and era5 single-precision validation hashes
awnawab Dec 28, 2023
b326f5a
IFS-SOURCE-ECWAM-SYNC: building with ecflow_light now a configurable …
awnawab Jan 9, 2024
552a536
Github Actions: try fix macOS MPI hosts
wdeconinck Jan 25, 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
save
jrbidlot authored and awnawab committed Dec 21, 2023
commit c93af77e3cc15360e9994f176577ce92f7ad3fd0
12 changes: 1 addition & 11 deletions src/ecwam/initmdl.F90
Original file line number Diff line number Diff line change
@@ -184,7 +184,7 @@ SUBROUTINE INITMDL (NADV, &
USE YOWMPP , ONLY : IRANK ,NPROC ,KTAG
USE YOWPARAM , ONLY : NANG ,NFRE ,NFRE_RED ,NFRE_ODD , &
& NGX ,NGY , &
& NIBLO ,NIBLD ,NIBLC ,LLUNSTR
& NIBLO ,LLUNSTR
USE YOWPCONS , ONLY : G ,CIRC ,PI ,ZPI , &
& RAD ,ROWATER ,ZPI4GM2 ,FM2FP
USE YOWPHYS , ONLY : ALPHAPMAX, ALPHAPMINFAC, FLMINFAC
@@ -862,16 +862,6 @@ SUBROUTINE INITMDL (NADV, &
! ----------------------------------------------------------------------


!* 8.2 PRECOMPUTE BOTTOM REFRACTION TERMS.
! -----------------------------------
IF (IREFRA /= 0) THEN
NIBLD=NIBLO
NIBLC=NIBLO
ELSE
NIBLD=0
NIBLC=0
ENDIF

! INITIALISE CDTCUR
CDTCUR=CDATECURA
IF (.NOT.LWCOU .AND. .NOT.LRESTARTED) THEN
6 changes: 1 addition & 5 deletions src/ecwam/mgrid.F90
Original file line number Diff line number Diff line change
@@ -47,8 +47,7 @@ SUBROUTINE MGRID (BATHY)

USE PARKIND_WAVE, ONLY : JWIM, JWRB, JWRU

USE YOWPARAM , ONLY : NGX ,NGY ,NIBLO , &
& NOVER ,NIBL1
USE YOWPARAM , ONLY : NGX ,NGY ,NIBLO
USE YOWMAP , ONLY : NY ,NLONRGG

! ----------------------------------------------------------------------
@@ -101,7 +100,4 @@ SUBROUTINE MGRID (BATHY)
ENDDO
CALL MBLOCK (BATHY, KA, NY, IPP)

NOVER=1
NIBL1=1

END SUBROUTINE MGRID
15 changes: 3 additions & 12 deletions src/ecwam/mpbcastgrid.F90
Original file line number Diff line number Diff line change
@@ -53,14 +53,13 @@ SUBROUTINE MPBCASTGRID(IU06, ISEND, ITAG)
& DELTH ,DELTR ,TH ,COSTH ,SINTH
USE YOWGRID , ONLY : DELPHI ,DELLAM ,SINPH ,COSPH , &
& IJS ,IJL
USE YOWMAP , ONLY : NX ,NY , &
USE YOWMAP , ONLY : NX ,NY , &
& IPER ,IRGG ,AMOWEP ,AMOSOP ,AMOEAP , &
& AMONOP ,XDELLA ,XDELLO ,ZDELLO ,NLONRGG , &
& IQGAUSS
USE YOWMPP , ONLY : IRANK ,NPROC ,NPRECR ,NPRECI
USE YOWPARAM , ONLY : NANG ,NFRE ,NFRE_RED , &
& NGX ,NGY , &
& NOVER ,NIBL1 ,CLDOMAIN
& NGX ,NGY ,CLDOMAIN
USE YOWSHAL , ONLY : BATHY

USE YOMHOOK ,ONLY : LHOOK, DR_HOOK, JPHOOK
@@ -73,7 +72,7 @@ SUBROUTINE MPBCASTGRID(IU06, ISEND, ITAG)

INTEGER(KIND=JWIM), INTENT(IN) :: IU06, ISEND
INTEGER(KIND=JWIM), INTENT(INOUT) :: ITAG
INTEGER(KIND=JWIM), PARAMETER :: MFIRST=8
INTEGER(KIND=JWIM), PARAMETER :: MFIRST=6
INTEGER(KIND=JWIM) :: I, J, IJ, K, K1, K2, M, M1, M2, IC, L, KDEPTH, NGOU
INTEGER(KIND=JWIM) :: IKCOUNT, KCOUNT
INTEGER(KIND=JWIM) :: MIC, MZC
@@ -109,10 +108,6 @@ SUBROUTINE MPBCASTGRID(IU06, ISEND, ITAG)
IKCOUNT=IKCOUNT+1
ICOMBUF(IKCOUNT)=NGY
IKCOUNT=IKCOUNT+1
ICOMBUF(IKCOUNT)=NOVER
IKCOUNT=IKCOUNT+1
ICOMBUF(IKCOUNT)=NIBL1
IKCOUNT=IKCOUNT+1
ICOMBUF(IKCOUNT)=ICHAR(CLDOMAIN)
IF (IKCOUNT /= MFIRST) THEN
WRITE (IU06,*) '**************************'
@@ -141,10 +136,6 @@ SUBROUTINE MPBCASTGRID(IU06, ISEND, ITAG)
IKCOUNT=IKCOUNT+1
NGY=ICOMBUF(IKCOUNT)
IKCOUNT=IKCOUNT+1
NOVER=ICOMBUF(IKCOUNT)
IKCOUNT=IKCOUNT+1
NIBL1=ICOMBUF(IKCOUNT)
IKCOUNT=IKCOUNT+1
CLDOMAIN=CHAR(ICOMBUF(IKCOUNT))
IF (IKCOUNT /= MFIRST) THEN
WRITE (IU06,*) '**************************'
28 changes: 4 additions & 24 deletions src/ecwam/outcom.F90
Original file line number Diff line number Diff line change
@@ -71,8 +71,7 @@ SUBROUTINE OUTCOM (IU07, IU17, IFORM, BATHY)
USE YOWGRIBHD, ONLY : IMDLGRBID_G,IMDLGRBID_M
USE YOWPARAM , ONLY : NANG ,NFRE ,NFRE_RED , &
& NGX ,NGY , &
& NIBLO ,NOVER ,NIBL1 ,NIBLD , &
& NIBLC ,CLDOMAIN ,IMDLGRDID,LLUNSTR
& NIBLO ,CLDOMAIN ,IMDLGRDID,LLUNSTR
USE YOWCPBO , ONLY : NBOUNC
USE YOWFRED , ONLY : FR ,DFIM ,GOM ,C , &
& DELTH ,DELTR ,TH ,COSTH ,SINTH
@@ -99,9 +98,7 @@ SUBROUTINE OUTCOM (IU07, IU17, IFORM, BATHY)
REAL(KIND=JWRB), INTENT(IN) :: BATHY(NGX, NGY)

INTEGER(KIND=JWIM) :: IDUM, K, M, L
INTEGER(KIND=JWIM) :: NBINP, NOUTT
INTEGER(KIND=JWIM) :: NKIND !Precision used when writing
INTEGER(KIND=JWIM) :: NGOUT_dum, KFRH_dum, MFRSTLW_dum, MLSTHG_dum, NDEPTH_dum

! ----------------------------------------------------------------------

@@ -130,12 +127,10 @@ SUBROUTINE OUTCOM (IU07, IU17, IFORM, BATHY)
IDUM=0

IF (IFORM /= 2) THEN
WRITE(IU07) NANG, NFRE, NFRE_RED, NGX, NGY, NOVER, &
& NIBL1, IDUM, NIBLD, NIBLC, CLDOMAIN
WRITE(IU07) NANG, NFRE, NFRE_RED, NGX, NGY, CLDOMAIN
ENDIF
IF (IFORM /= 1) THEN
WRITE(IU17,997) NANG, NFRE, NFRE_RED, NGX, NGY, NOVER, &
& NIBL1, IDUM, NIBLD, NIBLC, CLDOMAIN
WRITE(IU17,997) NANG, NFRE, NFRE_RED, NGX, NGY, CLDOMAIN
ENDIF


@@ -203,23 +198,8 @@ SUBROUTINE OUTCOM (IU07, IU17, IFORM, BATHY)

!* 11. WRITE NAMELIST PARWAM.
! ----------------------
! NBINP NOUTT have no meaning here since the size of the arrays
! will be determined at input.
NBINP=-1
NOUTT=-1

NGOUT_dum = 0
KFRH_dum = 0
MFRSTLW_dum = 0
MLSTHG_dum = 0
NDEPTH_dum = 74

CALL OUTNAM &
& (NANG, NFRE, &
& NGX, NGY, NIBLO, NOVER, NGOUT_dum, NOUTT, &
& KFRH_dum, MFRSTLW_dum, MLSTHG_dum, &
& NBOUNC, NBOUNF, NBINP, NIBL1, NIBLD, NIBLC, &
& ITAUMAX, JUMAX, IUSTAR, IALPHA, NDEPTH_dum, IDUM, IPER)
CALL OUTNAM (NANG, NFRE, NGX, NGY, NIBLO)

IF (LLUNSTR) THEN
#ifdef WAM_HAVE_UNWAM
74 changes: 5 additions & 69 deletions src/ecwam/outnam.F90
Original file line number Diff line number Diff line change
@@ -7,12 +7,7 @@
! nor does it submit to any jurisdiction.
!

SUBROUTINE OUTNAM ( &
& KNANG, KNFRE, &
& KNGX, KNGY, KNIBLO, KNOVER, KNGOUT, KNOUTT, &
& KFRH, MFRSTLW, MLSTHG, &
& KNMAXC, KNMAXF, KNBINP, KNIBL1, KNIBLD, KNIBLC, &
& KITAUMAX, KJUMAX, KIUSTAR, KIALPHA, KNDEPTH, KIREFRA, iper)
SUBROUTINE OUTNAM (KNANG, KNFRE, KNGX, KNGY, KNIBLO)

! ----------------------------------------------------------------------

@@ -22,56 +17,15 @@ SUBROUTINE OUTNAM ( &
USE PARKIND_WAVE, ONLY : JWIM, JWRB, JWRU

IMPLICIT NONE
#include "abort1.intfb.h"

INTEGER(KIND=JWIM), INTENT(IN) :: &
& KNANG, KNFRE, &
& KNGX, KNGY, KNIBLO, KNOVER, KNGOUT, KNOUTT, &
& KFRH, MFRSTLW, MLSTHG, &
& KNMAXC, KNMAXF, KNBINP, KNIBL1, KNIBLD, KNIBLC, &
& KITAUMAX, KJUMAX, KIUSTAR, KIALPHA, KNDEPTH, KIREFRA, iper
INTEGER(KIND=JWIM), INTENT(IN) :: KNANG, KNFRE, KNGX, KNGY, KNIBLO

INTEGER(KIND=JWIM) :: &
& iang, ifre, &
& igx, igy, iiblo, iover, ioutp, ioutt, &
& ifrh, ifrstlw, ilsthg, &
& imaxc, imaxf, ibinp, iibl1, iibld, iiblc, &
& itaumax, iumax, iustar, ialpha, idepth, irefra
INTEGER(KIND=JWIM) :: iang, ifre, igx, igy, iiblo

INTEGER(KIND=JWIM) :: IU06

LOGICAL :: llper ! the land sea mask is periodic (T)
!!! it is used by Altimeter software !!!
NAMELIST /PARWAM/ iang, ifre, igx, igy, iiblo

!!!1 this should be clean BUT !!! it is used by Altimeter software !!!
NAMELIST /PARWAM/ &
& iang, ifre, &
& igx, igy, iiblo, iover, ioutp, ioutt, &
& ifrh, ifrstlw, ilsthg, &
& imaxc, imaxf, ibinp, iibl1, iibld, iiblc, &
& itaumax, iumax, iustar, ialpha, idepth, irefra, llper

IU06=6

!*** 1.CHECK ON PERIODICITY OF GRID.
! -------------------------------

IF (IPER.EQ.1) THEN
llper=.TRUE.
ELSEIF (IPER.EQ.0) THEN
llper=.FALSE.
ELSE
WRITE(IU06,*)' ************************************************'
WRITE(IU06,*)' '
WRITE(IU06,*)' SUBROUTINE OUTNAM: '
WRITE(IU06,*)' '
WRITE(IU06,*)' IPER SHOULD BE 1 = PERIODIC GRID or '
WRITE(IU06,*)' 0 = NONPERIODIC GRID '
WRITE(IU06,*)' BUT IS >',IPER,'< '
WRITE(IU06,*)' '
WRITE(IU06,*)' PROGRAM ABORTS NOW PROGRAM ABORTS NOW '
WRITE(IU06,*)' ************************************************'
CALL ABORT1
ENDIF

!*** 2. DETERMINE PARAMETERS NAMELIST.
! ---------------------------------
@@ -81,24 +35,6 @@ SUBROUTINE OUTNAM ( &
igx = KNGX
igy = KNGY
iiblo = KNIBLO
iover = KNOVER
ioutp = KNGOUT
ioutt = KNOUTT
ifrh = KFRH
ifrstlw = MFRSTLW
ilsthg = MLSTHG
imaxc = KNMAXC
imaxf = KNMAXF
ibinp = KNBINP
iibl1 = KNIBL1
iibld = KNIBLD
iiblc = KNIBLC
itaumax = KITAUMAX
iumax = KJUMAX
iustar = KIUSTAR
ialpha = KIALPHA
idepth = KNDEPTH
irefra = KIREFRA

!*** 3. WRITE TO FILE.
! -----------------
6 changes: 2 additions & 4 deletions src/ecwam/readpre.F90
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ SUBROUTINE READPRE (IU07)
USE YOWMPP , ONLY : IRANK ,NPROC ,KTAG
USE YOWPARAM , ONLY : NANG ,NFRE ,NFRE_RED , &
& NGX ,NGY ,LLR8TOR4 ,LLUNSTR , &
& NIBLO ,NOVER ,NIBL1 ,CLDOMAIN ,IMDLGRDID
& NIBLO ,CLDOMAIN ,IMDLGRDID
USE YOWSHAL , ONLY : BATHY ,LLOCEANMASK
USE YOWTEST , ONLY : IU06
USE YOWABORT, ONLY : WAM_ABORT
@@ -310,9 +310,7 @@ SUBROUTINE READREC(KREC)
& ', KIND(DELPHI)=',KIND(DELPHI),', LLR8TOR4=',LLR8TOR4
1002 FORMAT(2X,A,I0,A,I0,A,L1)
CASE(2)
READ(IU07,IOSTAT=ISTAT) &
& NANG, NFRE, NFRE_RED, NGX, NGY, NOVER, &
& NIBL1, IDUM, KIBLD, KIBLC, CLDOMAIN
READ(IU07,IOSTAT=ISTAT) NANG, NFRE, NFRE_RED, NGX, NGY, CLDOMAIN
IF (ISTAT /= 0) GOTO 1000
CASE(3)
IF (LLR8TOR4) THEN
12 changes: 0 additions & 12 deletions src/ecwam/yowparam.F90
Original file line number Diff line number Diff line change
@@ -25,10 +25,6 @@ MODULE YOWPARAM
INTEGER(KIND=JWIM) :: NGX
INTEGER(KIND=JWIM) :: NGY
INTEGER(KIND=JWIM) :: NIBLO
INTEGER(KIND=JWIM) :: NOVER
INTEGER(KIND=JWIM) :: NIBL1
INTEGER(KIND=JWIM) :: NIBLD
INTEGER(KIND=JWIM) :: NIBLC

REAL(KIND=JWRB) :: SWAMPWIND
REAL(KIND=JWRB) :: SWAMPWIND2
@@ -60,14 +56,6 @@ MODULE YOWPARAM
! *NGX* INTEGER NUMBER OF LONGITUDES IN GRID.
! *NGY* INTEGER NUMBER OF LATITUDES IN GRID.
! *NIBLO* INTEGER NUMBER OF SEA POINTS IN BLOCK.
! *NOVER* INTEGER MAXIMUM NUMBER POINTS IN FIRST LATITUDE
! OF BLOCKS.
! *NIBL1* INTEGER = NIBLO IF MULTI BLOCK VERSION.
! = 1 IF ONE BLOCK VERSION.
! *NIBLD* INTEGER = NIBLO IF DEPTH OR CURRENT REFRACTION.
! = 1 ELSE.
! *NIBLC* INTEGER = NIBLO IF CURRENT REFRACTION.
! = 1 ELSE.
! *SWAMPWIND* REAL CONSTANT WIND SPEED USED TO RUN SWAMP CASE.
! FIRST VALUE
! *SWAMPWIND2*REAL CONSTANT WIND SPEED USED TO RUN SWAMP CASE.
5 changes: 1 addition & 4 deletions src/programs/preproc.F90
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@ PROGRAM preproc

USE PARKIND_WAVE, ONLY : JWIM, JWRB, JWRU

USE YOWPARAM , ONLY : NIBLO ,NIBLD ,NIBLC , &
USE YOWPARAM , ONLY : NIBLO , &
& NANG ,NFRE ,NFRE_RED ,LLUNSTR
USE YOWCPBO , ONLY : IBOUNC ,NBOUNC
USE YOWFPBO , ONLY : IBOUNF ,NBOUNF
@@ -390,9 +390,6 @@ PROGRAM preproc
#endif
END IF ! LLUNSTR

NIBLD=0
NIBLC=0

!* 5.3 COMPUTE OUTPUT POINT INDICES (MODULE YOWCOUT).
! ----------------------------------------------