From 493a8a234d45caa09cc5f902df72c4a26350ab22 Mon Sep 17 00:00:00 2001 From: Volodymyr Kondratenko Date: Sun, 8 Aug 2010 10:31:44 -0600 Subject: [PATCH] Added tests, still fix mistakes --- standalone/fuel_interp_test_main.F | 21 +++++++++++++++++++++ wrfv2_fire/phys/module_fr_sfire_core.F | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/standalone/fuel_interp_test_main.F b/standalone/fuel_interp_test_main.F index 938bec2a..309c8347 100644 --- a/standalone/fuel_interp_test_main.F +++ b/standalone/fuel_interp_test_main.F @@ -9,6 +9,8 @@ real,dimension(3,3)::real_tff,real_lff real, dimension(5,5)::d real::tign_err real::test1_err,test2_err,test3_err,test4_err,test5_err +real::lfn00,lfn01,lfn10,lfn11,tign00,tign01,tign10,tign11,fuel_time_cell +real:: Result1 !data lfn/2., 1., 0., & ! 1., 0.,-1., & ! 0.,-1.,-2./ @@ -230,5 +232,24 @@ write(*,*)' ' write(*,*)"If all test*_err are equal to 0.0, than the code works & correctly for this set of tests" + write(*,*)"Tests for fuel_left calculation" + +lfn00=-1. +lfn01=-1. +lfn10=1. +lfn11=1. +tign00=1. +tign01=1. +tign10=2. +tign11=2. +time_now=2 +fuel_time_cell= 8.235294 ; + +result1= fuel_left_cell_3( & + lfn00,lfn01,lfn10,lfn11, & + tign00,tign01,tign10,tign11,& + time_now, fuel_time_cell) + +write(*,*)"Result1=",result1 end program test diff --git a/wrfv2_fire/phys/module_fr_sfire_core.F b/wrfv2_fire/phys/module_fr_sfire_core.F index 7d146ee2..8401a699 100644 --- a/wrfv2_fire/phys/module_fr_sfire_core.F +++ b/wrfv2_fire/phys/module_fr_sfire_core.F @@ -1295,7 +1295,6 @@ real, intent(in)::fuel_time_cell ! time to burns off to 1/e ! ! When X is small then the fuel burnt in one timestep in the cell is ! approximately proportional to the area of the burning region. -! #ifndef FUEL_LEFT call crash('fuel_left_cell_3: not implemented, please use fire_fuel_left_method=1') -- 2.11.4.GIT