Skip to content

Commit c959580

Browse files
committed
update README-SFIRE
1 parent c275260 commit c959580

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

README-SFIRE.md

+22-14
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ A mirror with a graphical log is at https://repo.or.cz/git-browser/by-commit.htm
1111
- [Regression Testing Introduction](#regression-testing-introduction)
1212
- [Code Quality](#code-quality)
1313
- [Version 1.0: Feature Highlights](#version-10-feature-highlights)
14-
- [WRF-ARW Modeling System](#wrf-arw-modeling-system)
14+
- [Branches](#branches)
15+
- [How to run](#how-to-run)
16+
- [Notes](#notes)
17+
- [Notes for developers](#notes-dev)
1518

1619

1720
# Current version <a name="current-version"></a>
@@ -27,7 +30,7 @@ The version of SFIRE is 0.1.
2730
We are excited to share a significant development in our project's versioning system. As we release the official 0.1 version of our code, we want to introduce you to an enhanced versioning approach that incorporates the relationship between SFIRE code and WRF code. Moving forward, our versioning system will consist of two components: the Weather Research and Forecasting (WRF) code version and the Wildfire Spread Simulation (SFIRE) code version.
2831

2932
## Understanding the Versioning Scheme
30-
The semantic versioning scheme we have adopted is designed to provide clarity and context about the interconnectedness of our code with the WRF and SFIRE codes. Each version will be represented in the following format: `Wx.y-Si.j`, where:
33+
The semantic versioning scheme (https://semver.org) we have adopted is designed to provide clarity and context about the interconnectedness of our code with the WRF and SFIRE codes. Each version will be represented in the following format: `Wx.y-Si.j`, where:
3134

3235
- `Wx.y` denotes the version of the WRF code on which our codebase relies. For example, `W4.4` represents version 4.4 of the WRF code. This component indicates the underlying framework that drives our code's functionality.
3336

@@ -164,7 +167,7 @@ Your contributions, such as code reviews, suggestions, and bug reports, are inva
164167
## Miscellaneous
165168
- Write fuels data into fuels.m file (development feature)
166169

167-
# Branches
170+
# Branches <a name="branches"></a>
168171
* master, develop - the merged code.
169172
* WRF-track/master, WRF-track/develop, etc. - tracking the official WRF repository including release tags
170173
* filtered/* - rebased commits from the original wrf-fire repository, directory wrfv2_fire mapped to root:
@@ -178,17 +181,9 @@ _ filtered/balbi
178181
* wrf-fire-track/* - the original wrf-fire
179182
- wrf-fire-track/master
180183
- wrf-fire-track/dvm_branch
181-
182-
# How to upgrade WRF version
183-
* git checkout WRF/master
184-
* git pull git@github.com:wrf-model/WRF.git master
185-
* git checkout develop
186-
* git merge WRF/master
187-
* test in case something got broken, when happy:
188-
* git checkout master
189-
* git merge develop
190184

191-
# How to run
185+
186+
# How to run <a name="how-to-run"></a>
192187
* In namelist input, ifire=1 is WRF-SFIRE, ifire=2 the fire code in WRF we put there in 2012 (see branch filtered/submitted-to-3.3) with changes at NCAR. Most namelist flags are the same but each version has some of its own.
193188
* Test problems available in test/em_fire:
194189
- rain ifire=2
@@ -197,7 +192,20 @@ _ two_fires ifire=2
197192
* The problems with ifire=2 should give the same result in branch master (the merged code) and in branch WRF/develop (the WRF distribution)
198193
* It seems to run serial and MPI and so far passed some limited testing on cheyenne.
199194

200-
# Notes
195+
# Notes <a name="notes"></a>
201196
Standalone is included but have not started on it yet.
202197
Branches balbi and dvm_branch were carried over but they are not merged into master or tested yet because they were not merged into master in wrf-fire. Also I do not know how to test dvm_branch.
203198
I can't do real problems yet, that requires pushing data through current WPS, which Adam and Angel are working on.
199+
200+
# Notes for developers <a name="notes-dev"></a>
201+
## How to upgrade WRF version
202+
* git checkout WRF/master
203+
* git pull git@github.com:wrf-model/WRF.git master
204+
* git checkout develop
205+
* git merge WRF/master
206+
* resolve conflicts
207+
* copy README from wrf-model to README-WRF
208+
* Make sure that README.md softlink still points to README-SFIRE.md
209+
* run regression tests https://github.com/openwfm/regression
210+
* git checkout master
211+
* git merge develop

0 commit comments

Comments
 (0)