Difference between revisions of "Porting WRF-SFIRE fuel moisture model to WRF4"
Jump to navigation
Jump to search
| Line 1: | Line 1: | ||
[[Category:WRF-Fire merge]] | [[Category:WRF-Fire merge]] | ||
| − | == | + | ==Initial progress== |
* I started {{wrf-fire-merge-branch|fuel-moisture-model}} from {{wrf-branch|develop}} as recommended in [https://github.com/wrf-model/WRF/wiki/Workflow-for-WRF-Code-Modification WRF instructions]. | * I started {{wrf-fire-merge-branch|fuel-moisture-model}} from {{wrf-branch|develop}} as recommended in [https://github.com/wrf-model/WRF/wiki/Workflow-for-WRF-Code-Modification WRF instructions]. | ||
* Cherry pick {{wrf-fire-commit|f8193dad36|2011-09-25 adding moisture variables}} and {{wrf-fire-commit|5a6c4b8c06|2011-09-26 21:55:09 using variable fuel moisture in fmc_g}}. Making minimal changes against original. I had to check and understand any changes not just resolve the conflicts. Hard to automate. So that took a bit of time. | * Cherry pick {{wrf-fire-commit|f8193dad36|2011-09-25 adding moisture variables}} and {{wrf-fire-commit|5a6c4b8c06|2011-09-26 21:55:09 using variable fuel moisture in fmc_g}}. Making minimal changes against original. I had to check and understand any changes not just resolve the conflicts. Hard to automate. So that took a bit of time. | ||
| Line 22: | Line 22: | ||
./wrf.exe >& wrf.log & | ./wrf.exe >& wrf.log & | ||
</pre> | </pre> | ||
| + | ==Continued progress== | ||
| + | The WRF4 code with the fuel moisture model from wrf-fire is being created in {{wrf-fire-merge-branch|fuel-moisture-model}}. It is not ready for testing yet. | ||
| + | |||
==The original plan (one out of several actually)== | ==The original plan (one out of several actually)== | ||
Too much complexity. There were quite a few conflicts already in cherry pick to {{wrf-fire-commit|3cdb542af7ce|submitted to 3.3}} where not much changed. After a day or so, I decided I may as well do it right. | Too much complexity. There were quite a few conflicts already in cherry pick to {{wrf-fire-commit|3cdb542af7ce|submitted to 3.3}} where not much changed. After a day or so, I decided I may as well do it right. | ||
Revision as of 14:06, 23 January 2019
Initial progress
- I started branch fuel-moisture-model from branch develop as recommended in WRF instructions.
- Cherry pick f8193dad36 2011-09-25 adding moisture variables and 5a6c4b8c06 2011-09-26 21:55:09 using variable fuel moisture in fmc_g. Making minimal changes against original. I had to check and understand any changes not just resolve the conflicts. Hard to automate. So that took a bit of time.
- I created tag fuel-moisture-model-added-fmc_g and branch added-fmc_g at 132444f0db6754417 . The result should
- give the same numbers as code build by checking out tag wrf-develop-baseline when fire_fmc_read=1 in namelist.input or not set
- take fmc_g from wrfinput when fire_fmc_read=0
- This is how it is in this stage of the code for testing, but has changed in further commits after 2011-09-26 so it will be different after the port is completed.
Testing of fmc_g added
- Get the test code:
git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git cd WRF-Fire-merge git checkout added-fmc_g git log
to make sure you are at 132444f0db67544179c7998f5653c488dd41e836 .
- Build on kingspeak following How_to_build_WRF4#University_of_Utah_CHPC
cd test/em_fire ./ideal.exe ./wrf.exe >& wrf.log &
Continued progress
The WRF4 code with the fuel moisture model from wrf-fire is being created in branch fuel-moisture-model. It is not ready for testing yet.
The original plan (one out of several actually)
Too much complexity. There were quite a few conflicts already in cherry pick to 3cdb542af7ce submitted to 3.3 where not much changed. After a day or so, I decided I may as well do it right.
- check out 26d8a8f91cad4 release_v3.3 branch release_v3.3
- copy over fire model files from 3cdb542af7ce submitted to 3.3
- commit as 4e7a17952e22a v3.3 with fire as submitted
- create branch v3.3_with_fire_as_submitted
- revert the commit to get e69ed0d635b4 the change from submitted to release 3.3
- check out 3cdb542af7ce submitted to 3.3
- create branch moisture-model-port
- apply the fuel moisture model commits
- test with v3.3 input files
- apply? the change from submitted to release 3.3
- test with v3.3 input files
- upgrade by merge with 093ea6274f0d0 v4.0.3
- upgrade by merge with branch develop
- test with v4.0 input files