Skip to content

Commit 32b667d

Browse files
authored
Updated ICNUMERICS namelist flag (#37)
1 parent bd97113 commit 32b667d

4 files changed

Lines changed: 158 additions & 130 deletions

File tree

model/src/w3gdatmd.F90

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ MODULE W3GDATMD
236236
! for individual grid points.
237237
! IICEDISP Log. Public Flag for use of the ice covered dispertion relation.
238238
! IICESMOOTH Log. Public Flag to smooth the ice covered dispertion relation in broken ice.
239+
! IC_NUMERICS Log. Public Turn on/off IC numerics fix
239240
!
240241
!
241242
! GNAME C*30 Public Grid name.
@@ -685,6 +686,7 @@ MODULE W3GDATMD
685686

686687
LOGICAL :: GINIT, FLDRY, FLCX, FLCY, FLCTH, FLCK, FLSOU, IICEDISP,&
687688
IICESMOOTH
689+
LOGICAL :: IC_NUMERICS
688690
LOGICAL :: FLAGLL
689691
LOGICAL :: CMPRTRCK
690692
LOGICAL, POINTER :: FLAGST(:)
@@ -1203,6 +1205,7 @@ MODULE W3GDATMD
12031205

12041206
LOGICAL, POINTER :: GINIT, FLDRY, FLCX, FLCY, FLCTH, FLCK, FLSOU, IICEDISP,&
12051207
IICESMOOTH
1208+
LOGICAL, POINTER :: IC_NUMERICS
12061209
LOGICAL, POINTER :: FLAGLL
12071210
LOGICAL, POINTER :: CMPRTRCK
12081211
LOGICAL, POINTER :: FLAGST(:)
@@ -2363,6 +2366,7 @@ SUBROUTINE W3SETG ( IMOD, NDSE, NDST )
23632366
FLSOU => GRIDS(IMOD)%FLSOU
23642367
IICEDISP => GRIDS(IMOD)%IICEDISP
23652368
IICESMOOTH => GRIDS(IMOD)%IICESMOOTH
2369+
IC_NUMERICS => GRIDS(IMOD)%IC_NUMERICS
23662370
!
23672371
GNAME => GRIDS(IMOD)%GNAME
23682372
FILEXT => GRIDS(IMOD)%FILEXT

model/src/w3gridmd.F90

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,7 @@ MODULE W3GRIDMD
803803
!
804804
REAL(8) :: GSHIFT ! see notes in WMGHGH
805805
LOGICAL :: FLC, ICEDISP, TRCKCMPR
806+
LOGICAL :: ICNUMERICS
806807
INTEGER :: PTM ! Partitioning method
807808
REAL :: PTFC ! Part. cut off freq (for method 5)
808809
REAL :: AIRCMIN, AIRGB
@@ -1098,7 +1099,7 @@ MODULE W3GRIDMD
10981099
STDX, STDY, STDT, ICEHMIN, ICEHINIT, ICEDISP, &
10991100
ICESLN, ICEWIND, ICESNL, ICESDS, ICEHFAC, &
11001101
ICEHDISP, ICEDDISP, ICEFDISP, CALTYPE, &
1101-
TRCKCMPR, PTM, PTFC, BTBET
1102+
TRCKCMPR, PTM, PTFC, BTBET, ICNUMERICS
11021103
NAMELIST /OUTS/ P2SF, I1P2SF, I2P2SF, &
11031104
US3D, I1US3D, I2US3D, &
11041105
USSP, IUSSP, STK_TAIL, STK_WN, &
@@ -2705,6 +2706,7 @@ SUBROUTINE W3GRID()
27052706
STDY = -1.
27062707
STDT = -1.
27072708
ICEDISP = .FALSE.
2709+
ICNUMERICS=.FALSE.
27082710
CALTYPE = 'standard'
27092711
! Variables for 3D array output
27102712
E3D=0
@@ -2983,6 +2985,7 @@ SUBROUTINE W3GRID()
29832985
IICEHDISP = ICEHDISP
29842986
IICEDDISP = ICEDDISP
29852987
IICEFDISP = ICEFDISP
2988+
IC_NUMERICS= ICNUMERICS
29862989
PMOVE = MAX ( 0. , PMOVE )
29872990
PFMOVE = PMOVE
29882991
!
@@ -3368,7 +3371,7 @@ SUBROUTINE W3GRID()
33683371
ICEHINIT, ICEDISP, ICEHDISP, &
33693372
ICESLN, ICEWIND, ICESNL, ICESDS, &
33703373
ICEDDISP,ICEFDISP, CALTYPE, TRCKCMPR, &
3371-
BTBETA
3374+
BTBETA, ICNUMERICS
33723375
ELSE
33733376
WRITE (NDSO,2966) CICE0, CICEN, LICE, PMOVE, XSEED, FLAGTR, &
33743377
XP, XR, XFILT, IHMAX, HSPMIN, WSMULT, &
@@ -3378,7 +3381,7 @@ SUBROUTINE W3GRID()
33783381
ICEHINIT, ICEDISP, ICEHDISP, &
33793382
ICESLN, ICEWIND, ICESNL, ICESDS, &
33803383
ICEDDISP, ICEFDISP, CALTYPE, TRCKCMPR,&
3381-
BTBETA
3384+
BTBETA, ICNUMERICS
33823385
END IF
33833386
!
33843387
#ifdef W3_FLD1
@@ -6755,7 +6758,7 @@ SUBROUTINE W3GRID()
67556758
', ICESNL = ',F6.2,', ICESDS = ',F5.2,','/ &
67566759
' ICEDDISP = ',F5.2,', ICEFDISP = ',F5.2, &
67576760
', CALTYPE = ',A8,' , TRCKCMPR = ', L3,','/ &
6758-
' BTBET = ', F6.2, ' /')
6761+
' BTBET = ', F6.2, ', ICNUMERICS =',L3,' /')
67596762
!
67606763
2976 FORMAT ( ' &OUTS P2SF =',I2,', I1P2SF =',I2,', I2P2SF =',I3,','/&
67616764
' US3D =',I2,', I1US3D =',I3,', I2US3D =',I3,','/&

model/src/w3iogrmd.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT )
782782
FLCK, FLSOU, FLBPI, FLBPO, CLATS, CLATIS, CTHG0S, &
783783
STEXU, STEYU, STEDU, IICEHMIN, IICEHINIT, IICEDISP, &
784784
ICESCALES(1:4), CALTYPE, CMPRTRCK, IICEHFAC, IICEHDISP,&
785-
IICEDDISP, IICEFDISP, BTBETA, &
785+
IICEDDISP, IICEFDISP, BTBETA, IC_NUMERICS, &
786786
AAIRCMIN, AAIRGB
787787

788788
WRITE(NDSM)GRIDSHIFT
@@ -914,7 +914,7 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT )
914914
FLCTH, FLCK, FLSOU, FLBPI, FLBPO, CLATS, CLATIS, &
915915
CTHG0S, STEXU, STEYU, STEDU, IICEHMIN, IICEHINIT, &
916916
IICEDISP, ICESCALES(1:4), CALTYPE, CMPRTRCK, IICEHFAC, &
917-
IICEDDISP, IICEHDISP, IICEFDISP, BTBETA, &
917+
IICEDDISP, IICEHDISP, IICEFDISP, BTBETA, IC_NUMERICS, &
918918
AAIRCMIN, AAIRGB
919919

920920
READ(NDSM,END=801,ERR=802,IOSTAT=IERR)GRIDSHIFT

0 commit comments

Comments
 (0)