Skip to content

Commit

Permalink
Added new tests for data_derived storm products and updated data_stor…
Browse files Browse the repository at this point in the history 
…m_module.f90 to use a relative path with get_environment variable
  • Loading branch information
@cjeffr
cjeffr committed Dec 3, 2024
1 parent e1a05da commit 46d7343
Show file tree
Hide file tree
Showing 77 changed files with 38,074 additions and 775 deletions.
4 changes: 2 additions & 2 deletions examples/storm-surge/isaac_ascii_data/isaac.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
## Must include absolute path to the wind and pressure files ##

201208290000 =: landfall_date # Date of landfall for the storm
"/path/to/wind_file/isaac.WIN" =: wind_field # path to wind forcing file
'/path/to/pressure_file/isaac.PRE' =: pressure_field # path to pressure forcing file
"clawpack/geoclaw/examples/storm-surge/isaac_ascii_data/isaac.WIN" =: wind_field # path to wind forcing file
'clawpack/geoclaw/examples/storm-surge/isaac_ascii_data/isaac.PRE' =: pressure_field # path to pressure forcing file
0 =: regional_forcing # 0 for only basin forcing, 1 for regional
4 changes: 4 additions & 0 deletions src/2d/shallow/surge/data_storm_module.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,10 @@ subroutine set_ascii_storm(storm_data_path, storm, storm_spec_type, log_unit)
integer :: yr, mo, da, hr, minute, seconds_from_landfall
integer :: iunit=10
integer :: has_regional_data
character(len=20) :: homedir

if (.not. module_setup) then
call get_environment_variable("HOME", homedir)
! Open storm control file to get landfall date and
! wind and pressure file names
call opendatafile(iunit, storm_data_path)
Expand All @@ -214,6 +216,8 @@ subroutine set_ascii_storm(storm_data_path, storm, storm_spec_type, log_unit)
! Read the wind and pressure file absolute paths
read(iunit, *) wind_file
read(iunit, *) pressure_file
wind_file = trim(adjustl(homedir)) // '/' // wind_file
pressure_file = trim(adjustl(homedir)) // '/' // pressure_file
! Check for flag that there are regional forcing grids
! To be developed further later 11/15/2024 CRJ
read(iunit, '(i2)') has_regional_data
Expand Down
158 changes: 158 additions & 0 deletions tests/data_derived_storm_surge/IsaacTest_output/error_output.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
Errors from Test IsaacTest
Started 2024/12/03-17:03.09
================================================================================
/home/catherinej/clawpack/geoclaw/src/2d/shallow/stepgrid.f:206:72:

206 | do 50 i=mbc+1,mitot-mbc
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 50 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/stepgrid.f:207:72:

207 | do 50 m=1,nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 50 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/stepgrid.f:217:72:

217 | do 51 i=mbc+1,mitot-mbc
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 51 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/stepgrid.f:218:72:

218 | do 51 m=1,nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 51 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/stepgrid.f:270:72:

270 | do 830 j = mbc+1, mjtot-1
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 830 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/stepgrid.f:273:72:

273 | do 830 m = 2, meqn
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 830 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/flux2fw.f:170:72:

170 | do 50 i=1,mx+1
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 50 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/flux2fw.f:193:72:

193 | do 120 m=1,meqn
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 120 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/flux2fw.f:214:72:

214 | do 150 m=1,meqn
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 150 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/flux2fw.f:232:72:

232 | do 160 m=1,meqn
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 160 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/flux2fw.f:249:72:

249 | do 180 m=1,meqn
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 180 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:99:72:

99 | do 10 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 10 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:114:72:

114 | do 25 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 25 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:115:72:

115 | 25 qr(ivar,lind) = qc1d(ivar,index)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 25 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:173:72:

173 | do 210 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 210 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:195:72:

195 | do 225 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 225 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:196:72:

196 | 225 ql(ivar,lind+1) = qc1d(ivar,index)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 225 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:244:72:

244 | do 310 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 310 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:266:72:

266 | do 325 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 325 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:267:72:

267 | 325 ql(ivar,lind+1) = qc1d(ivar,index)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 325 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:317:72:

317 | do 410 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 410 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:332:72:

332 | do 425 ivar = 1, nvar
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 425 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/qad.f:333:72:

333 | 425 qr(ivar,lind) = qc1d(ivar,index)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 425 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/upbnd.f:38:72:

38 | do 10 i=1,mitot
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 10 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/tick.f:164:72:

164 | 13 possk(i) = possk(i-1) / kratio(i-1)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 13 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/tick.f:265:72:

265 | 80 icheck(i) = 0
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 80 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/tick.f:267:72:

267 | 81 tlevel(i) = tlevel(lbase)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 81 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/tick.f:486:72:

486 | 120 possk(i) = possk(i-1) / kratio(i-1)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 120 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/setgrd.f:55:72:

55 | 20 rvoll(level) = 0.d0
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 20 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/advanc.f:213:72:

213 | 10 alloc(locold + i - 1) = alloc(locnew + i - 1)
| 1
Warning: Fortran 2018 deleted feature: DO termination statement which is not END DO or CONTINUE with label 10 at (1)
/home/catherinej/clawpack/geoclaw/src/2d/shallow/auxcoarsen.f:25:72:

25 | do 20 i = 1, mi2tot
| 1
Warning: Fortran 2018 deleted feature: Shared DO termination label 20 at (1)
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0000
View file
Binary file not shown.
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0001
View file
Binary file not shown.
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0002
View file
Binary file not shown.
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0003
View file
Binary file not shown.
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0004
View file
Binary file not shown.
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0005
View file
Binary file not shown.
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0006
View file
Binary file not shown.
Binary file added tests/data_derived_storm_surge/IsaacTest_output/fort.a0007
View file
Binary file not shown.
Loading

0 comments on commit 46d7343

Please sign in to comment.