Carry over standalone about wrf-sfire HOT 9 CLOSED

The last commit with /standalone merged here is 3cc61c7 filtered from 22d1e6a

from wrf-sfire.

Need a main program to test balbi model.

from wrf-sfire.

Further development merged into #45, leaving branch develop-3 as stable for now until develop-45 can be merged into master.

from wrf-sfire.

Branches master, develop-45, and develop-3 advanced to the same commit d9b313e Fri Aug 26 23:44:51 2022

from wrf-sfire.

Advancing develop-3 to commit number 363ce81, which is on develop-60 #60
TODO: test against master if the same results using Rothermel

from wrf-sfire.

@Fergui @Aurel31
When trying to merge release branch into develop-3, conflict in phys/module_fr_sfire_phys.F centered around namelist_fire:

<<<<<<< HEAD
namelist /fuel_categories_anderson_13/ fuel_name,windrf,fgi,fueldepthm,savr, &
    fuelmce,fueldens,st,se,weight,fci_d,fct,ichap,itree,fwh,fz0,ffw, &
    fmc_gl_ndwi_0,fmc_gl_ndwi_rate,fmc_gl_ndwi_stdev, fmc_gl_stdev, &
    adjr0,adjrw,adjrs,fmc_gw01,fmc_gw02,fmc_gw03,fmc_gw04,fmc_gw05,is_dead, k_tc
=======   
namelist /fuel_categories/ fuel_name,windrf,fgi,fueldepthm,savr, &
    fuelmce,fueldens,st,se,weight,fci_d,fct,ichap,itree,idynamic,fwh,fz0,ffw, &
    fmc_gl_ndwi_0,fmc_gl_ndwi_rate,fmc_gl_ndwi_stdev, fmc_gl_stdev, &
    adjr0,adjrw,adjrs,fmc_gw01,fmc_gw02,fmc_gw03,fmc_gw04,fmc_gw05,fmc_gw06, &
    savr_gc01,savr_gc02,savr_gc03,savr_gc04,savr_gc05,savr_gc06, &
    fuelload_gc01,fuelload_gc02,fuelload_gc03,fuelload_gc04,fuelload_gc05,fuelload_gc06
>>>>>>> release

The reason seems to be that commits after my last commit 3c960d7 to the tip of develop-3 (currently at 363ce81) are changes in the fuel subsystem and conflict with different changes the fuel subsystem in the release branch (currently at 792e703).

I am continuing standalone as branch develop-3jm from my last commit 3c960d7 and abandoning branch develop-3.

Please review the orphaned commits in branch develop-3 after 3c960d7 and merge or cherry pick somewhere if you want to keep them.

from wrf-sfire.

Hi @janmandel
The fuel subsystem is currently under modification to include several fuel classifications.
To solve the conflict, I suggest you keep the fuel_categories namelist name and content as the fuel_categories_anderson_13 name will probably change soon.
The only added variable in the namelist is k_tc which is only used in the new rate of spread model currently under development and not implemented. You can leave it and not merge it.

from wrf-sfire.

Standalone driven by wrfout OK, closing the issue #3

@kylehilburn @Aurel31 @Fergui

from wrf-sfire.

Hi @janmandel The fuel subsystem is currently under modification to include several fuel classifications. To solve the conflict, I suggest you keep the fuel_categories namelist name and content as the fuel_categories_anderson_13 name will probably change soon. The only added variable in the namelist is k_tc which is only used in the new rate of spread model currently under development and not implemented. You can leave it and not merge it.

@Aurel31
OK leaving the extra commits as branch develop-3-abandoned

from wrf-sfire.