From 97f1638a6b851ff31af3fc10d99651c6d717b85a Mon Sep 17 00:00:00 2001 From: Jan Mandel Date: Sat, 7 Apr 2012 15:28:21 -0600 Subject: [PATCH] copied over fire module files from WRF release 3.4 --- wrfv2_fire/Registry/registry.fire | 2 +- wrfv2_fire/phys/module_fr_sfire_core.F | 4 ++-- wrfv2_fire/phys/module_fr_sfire_util.F | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wrfv2_fire/Registry/registry.fire b/wrfv2_fire/Registry/registry.fire index 89504875..481d1835 100644 --- a/wrfv2_fire/Registry/registry.fire +++ b/wrfv2_fire/Registry/registry.fire @@ -8,7 +8,7 @@ # # name> namelist choice> state vars> # -package fire_sfire ifire==2 - state:nfuel_cat,zsf,tign_g,rthfrten,rqvfrten,grnhfx,grnqfx,canhfx,canqfx,lfn,fuel_frac,fire_area,uf,vf,fgrnhfx,fgrnqfx,fcanhfx,fcanhfx,fcanqfx,ros,fxlong,fxlat,fuel_time,bbb,betafl,phiwc,r_0,fgip,ischap,lfn_hist,lfn_time +package fire_sfire ifire==2 - state:nfuel_cat,zsf,tign_g,rthfrten,rqvfrten,grnhfx,grnqfx,canhfx,canqfx,lfn,fuel_frac,fire_area,uf,vf,fgrnhfx,fgrnqfx,fcanhfx,fcanhfx,fcanqfx,ros,fxlong,fxlat,fuel_time,bbb,betafl,phiwc,r_0,fgip,ischap,lfn_hist,lfn_time,avg_fuel_frac,uah,vah # level function history support dimspec ign 2 constant=1 z i_lfn_history diff --git a/wrfv2_fire/phys/module_fr_sfire_core.F b/wrfv2_fire/phys/module_fr_sfire_core.F index 874a7a9c..36b340f3 100644 --- a/wrfv2_fire/phys/module_fr_sfire_core.F +++ b/wrfv2_fire/phys/module_fr_sfire_core.F @@ -1732,7 +1732,7 @@ subroutine tend_ls( id, & nvy=diffCy/scale ! wind speed in direction of spread - ! speed = vx(i,j)*nvx + vy(i,j)*nvy + speed = fp%vx(i,j)*nvx + fp%vy(i,j)*nvy ! get rate of spread from wind speed and slope @@ -1765,7 +1765,7 @@ subroutine tend_ls( id, & advy=0 endif - ! tanphi = dzdxf*nvx + dzdyf*nvy + tanphi = fp%dzdxf(i,j)*nvx + fp%dzdyf(i,j)*nvy ! advection from slope direction if(abs(tanphi)>eps) then advx=advx+fp%dzdxf(i,j)*ros_slope/tanphi diff --git a/wrfv2_fire/phys/module_fr_sfire_util.F b/wrfv2_fire/phys/module_fr_sfire_util.F index b1dd0c7f..e600403d 100644 --- a/wrfv2_fire/phys/module_fr_sfire_util.F +++ b/wrfv2_fire/phys/module_fr_sfire_util.F @@ -1209,7 +1209,7 @@ subroutine read_array_2d_integer(filename,ia,its,ite,jts,jte,ims,ime,jms,jme) if(r.ne.a(i,j))then write(6,*)'Reading file ',trim(filename) write(6,*)'value at position ',i,j,' cannot be converted to integer' - write(6,*)'read ',a(i,j),' converted as',k,' converted as ',r + write(6,*)'read ',a(i,j),' converted as',ia(i,j),' converted as ',r msg=trim(filename)//' is not integer file' call crash(msg) endif