Comments (9)
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
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.
Related Issues (20)
- How to run WRF-SFIRE-Chem HOT 10
- Correct the merge with v4.4 HOT 2
- Segmentation fault - invalid memory reference
- Subroutine interpolate_wind2fire_height: fire wind height too large HOT 2
- SFIRE minor refactoring HOT 1
- SFIRE minor cleaning HOT 1
- ML-based ROS model HOT 1
- Add WIRC rate of spread model HOT 1
- Multi-layer heat fluxes scheme HOT 1
- Multiple fuels classifications HOT 1
- New RF and NN modules
- variable subgrid_ratio_x in WPS HOT 4
- WRF-SFIRE-Chem-LES HOT 2
- namelist.fire setting HOT 2
- Closed
- Compute fire arrival time on the whole domain HOT 1
- WRF_SFIRE Error HOT 6
- Reserved
- geog_data_res for ZSF and NFUEL
- Program received signal SIGSEGV: Segmentation fault - invalid memory reference. HOT 2
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from wrf-sfire.