Skip to content

Commit

Permalink
Remove unused lookup tables
Browse files Browse the repository at this point in the history
  • Loading branch information
lautenberger committed Jan 25, 2025
1 parent 20c11b1 commit 81b5e5c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 38 deletions.
2 changes: 1 addition & 1 deletion build/source/elmfire.f90
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ PROGRAM ELMFIRE

IF (MULTIPLE_HOSTS) CALL BCAST_WEATHER_FUEL_TOPOGRAPHY

IF (ABS(GRID_DECLINATION) .GT. 0.1 ) THEN
IF (ABS(GRID_DECLINATION) .GT. 0.1 .AND. IRANK_HOST .EQ. 0) THEN
IF (ROTATE_ASP) CALL ROTATE_ASP_AND_WD(1)
IF (ROTATE_WD ) CALL ROTATE_ASP_AND_WD(2)
ENDIF
Expand Down
41 changes: 6 additions & 35 deletions build/source/elmfire_init.f90
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ SUBROUTINE READ_FUEL_MODEL_TABLE

CHARACTER(400) :: FNINPUT
INTEGER :: I, INUM, IOS, ILH
REAL :: LIVEFRAC, DEADFRAC, LH, WSMFEFF, LOW, PHIMAG
REAL :: LIVEFRAC, DEADFRAC, LH
INTEGER, PARAMETER :: NUM_FUEL_MODELS = 303
TYPE(FUEL_MODEL_TABLE_TYPE) :: FM

Expand Down Expand Up @@ -880,40 +880,11 @@ SUBROUTINE READ_FUEL_MODEL_TABLE
ENDDO
ENDDO

! Build lookup tables:
IF (.NOT. ALLOCATED(LOW_FROM_WSMFEFF)) THEN
ALLOCATE(LOW_FROM_WSMFEFF(0:100000))
ALLOCATE(BOH_FROM_LOW (0:20000))
ALLOCATE(WSMFEFF_FROM_FBFM_AND_PHIMAG(0:NUM_FUEL_MODELS,0:10000))

LOW_FROM_WSMFEFF(0) = 1E0
DO I = 1, 100000
WSMFEFF=REAL(I) * 0.1
LOW_FROM_WSMFEFF(I)=MIN( 0.936*EXP(0.2566*WSMFEFF*60./5280.) + 0.461*EXP(-0.1548*WSMFEFF*60.0/5280.) - 0.397, MAX_LOW)
ENDDO

BOH_FROM_LOW(0:1000) = 1.
DO I = 1001, 20000
LOW = REAL(I) * 0.001
BOH_FROM_LOW(I)= 1.0 / ((LOW + SQRT(LOW*LOW - 1.0)) / (LOW - SQRT(LOW*LOW -1.0)))
ENDDO

DO INUM = 0, NUM_FUEL_MODELS
IF (FUEL_MODEL_TABLE_2D(INUM,30)%B_COEFF_INVERSE .GT. 1E-3) THEN
DO I = 0, 10000
PHIMAG = REAL(I) * 0.01
WSMFEFF_FROM_FBFM_AND_PHIMAG(INUM,I) = FUEL_MODEL_TABLE_2D(INUM,30)%WSMFEFF_COEFF * PHIMAG ** FUEL_MODEL_TABLE_2D(INUM,30)%B_COEFF_INVERSE
ENDDO
ENDIF
ENDDO

DO I = 1, NUM_FUEL_MODELS
WSMFEFF_COEFF (I) = FUEL_MODEL_TABLE_2D(I,30)%WSMFEFF_COEFF
B_COEFF_INVERSE(I) = FUEL_MODEL_TABLE_2D(I,30)%B_COEFF_INVERSE
TR (I) = FUEL_MODEL_TABLE_2D(I,30)%TR
ENDDO

ENDIF
DO I = 1, NUM_FUEL_MODELS
WSMFEFF_COEFF (I) = FUEL_MODEL_TABLE_2D(I,30)%WSMFEFF_COEFF
B_COEFF_INVERSE(I) = FUEL_MODEL_TABLE_2D(I,30)%B_COEFF_INVERSE
TR (I) = FUEL_MODEL_TABLE_2D(I,30)%TR
ENDDO

! *****************************************************************************
END SUBROUTINE READ_FUEL_MODEL_TABLE
Expand Down
2 changes: 0 additions & 2 deletions build/source/elmfire_vars.f90
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,7 @@ MODULE ELMFIRE_VARS
REAL, DIMENSION(-1:360) :: ABSSINASP=0., ABSCOSASP=0., SINASPM180=0., COSASPM180=0.
REAL, DIMENSION(0:3600) :: COSWDMPI, SINWDMPI
REAL, DIMENSION(0:100,0:120) :: SHELTERED_WAF_TABLE
REAL, ALLOCATABLE, DIMENSION(:) :: BOH_FROM_LOW, LOW_FROM_WSMFEFF
REAL, DIMENSION(0:303) :: WSMFEFF_COEFF, B_COEFF_INVERSE, TR
REAL, ALLOCATABLE, DIMENSION (:,:) :: WSMFEFF_FROM_FBFM_AND_PHIMAG
INTEGER, ALLOCATABLE, DIMENSION(:) :: ICOL_ANALYSIS_F2C, IROW_ANALYSIS_F2C
! lookup tables for UMD spotting model
INTEGER, ALLOCATABLE, DIMENSION(:,:,:,:) :: EMBER_TARGET_IX, EMBER_TARGET_IY
Expand Down

0 comments on commit 81b5e5c

Please sign in to comment.