Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Carry over standalone #3

Closed
janmandel opened this issue May 21, 2020 · 9 comments
Closed

Carry over standalone #3

janmandel opened this issue May 21, 2020 · 9 comments
Assignees
@janmandel

Comments

@janmandel
Copy link
Member

Split standalone off from https://github.com/openwfm/wrf-fire and make it work with https://github.com/openwfm/WRF-SFIRE
janmandel pushed a commit that referenced this issue May 25, 2020
@jordanschnell
Prevent 0 index in GOCART settling array (wrf-model#1113)
f43ae67 
TYPE: bug fix

KEYWORDS: GOCART, settling

SOURCE: Stacy Walters (internal)

DESCRIPTION OF CHANGES: 
Put calculation of aerosol settling (variable = transfer_to_below_level) in layers > 1 
into IF/ELSE block that calculates gravitational settling for layer = 1.

LIST OF MODIFIED FILES: 
M chem/module_gocart_settling.F

TEST CONDUCTED:
Jenkins shows all tests PASS

**Compiled with debug option -check bounds**
_BEFORE FIX_: 2 indexes are OOB for l==1, 3rd dim of delz (> MAX) and 3rd dim of airden (0)

rsl.out.0000
 l/=1, calculting transfer_to_below_level =   3.153560196907218E-014
 l/=1, calculting transfer_to_below_level =   1.014890436929303E-012
 l/=1, calculting transfer_to_below_level =   2.118741307102124E-011
 l==1, still calculating transfer_to_below_level =
  = (temp_tc*vd_wk1)*((delz(i,j,l2)*airden(i,j,l))/(delz(i,j,l2+1)*airden(i,j,l-1)))
 l==1, index of airden(i,j,l-1) =            1           1           0
  and index of delz(i,j,l2+1) =            1           1          31
 but size of 3rd dim of delz  =           30
rsl.error.0000
forrtl: severe (408): fort: (2): Subscript #3 of the array DELZ has value 31 which is greater than the upper bound of 30

_AFTER FIX_: 
l/=1, calculating transfer_to_below_level =   3.153560196907218E-014
 l/=1, calculating transfer_to_below_level =   1.014890436929303E-012
 l/=1, calculating transfer_to_below_level =   2.118741307102124E-011
 l==1, not calculating transfer_to_below_level
@janmandel janmandel changed the title Standalone Carry over standalone May 26, 2020
@janmandel janmandel mentioned this issue May 27, 2020
Closed
@janmandel
Copy link
Member Author

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

@janmandel janmandel mentioned this issue Sep 5, 2020
Closed
janmandel added a commit that referenced this issue Jan 30, 2022
@janmandel
some changes towards compiling standalone #3
cbd2e55
janmandel added a commit that referenced this issue Jan 31, 2022
@janmandel
adding variables, does not compile yet #3
26fe946
janmandel added a commit that referenced this issue Apr 1, 2022
@janmandel
running: em_fire/hill> ln -s wrfout_d01_0001-01-01_00:00:00 fire_inpu…
851b6ed 
…t.nc; ../fire.exe #3
@janmandel
Copy link
Member Author

Need a main program to test balbi model.

@janmandel janmandel mentioned this issue Aug 5, 2022
Closed
janmandel added a commit that referenced this issue Aug 7, 2022
@janmandel
Merge branch 'develop-3' into develop-45 #3 #45
691d84e
janmandel added a commit that referenced this issue Aug 8, 2022
@janmandel
creating fuels.m for Balbi by init_fuel_cats #45 #3
d3995ba
janmandel added a commit that referenced this issue Aug 8, 2022
@janmandel
finalize making fire_ros.exe and README in standalone #3 #45
ae30fe9
janmandel added a commit that referenced this issue Aug 11, 2022
@janmandel
creating fuels.m for Balbi by init_fuel_cats #45 #3
05b4dd9
janmandel added a commit that referenced this issue Aug 11, 2022
@janmandel
creating fuels.m for Balbi by init_fuel_cats #45 #3
cf24d4d
janmandel added a commit that referenced this issue Aug 11, 2022
@janmandel
finalize making fire_ros.exe and README in standalone #3 #45
ee8ff39
janmandel added a commit that referenced this issue Aug 11, 2022
@janmandel
creating fuels.m for Balbi by init_fuel_cats #45 #3
bb23d51
janmandel added a commit that referenced this issue Aug 11, 2022
@janmandel
finalize making fire_ros.exe and README in standalone #3 #45
c2b394c
janmandel added a commit that referenced this issue Aug 13, 2022
@janmandel
standalone fire_ros.exe ok for Rothermel and Balbi #3 #45
e6a66f7
janmandel added a commit that referenced this issue Aug 13, 2022
@janmandel
standalone fire_ros.exe goes through for both Rothermel and Balbi #3 #45
a8b17e4
janmandel added a commit that referenced this issue Aug 13, 2022
@janmandel
finalizing standalone/fire_ros_main.F #3 #45
7277b4c
janmandel added a commit that referenced this issue Aug 14, 2022
@janmandel
handling of params in standalone fire_ros_main #3 #45
9388fff
janmandel added a commit that referenced this issue Aug 14, 2022
@janmandel
hill same result as master, updating standalone/README.txt #45 #3
71c62ae
janmandel added a commit that referenced this issue Aug 14, 2022
@janmandel
hill same numbers as master 81d4ab6 #45 #3
0edd81d
@janmandel
Copy link
Member Author

janmandel commented Aug 20, 2022 •
edited
Loading

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

janmandel added a commit that referenced this issue Aug 27, 2022
@janmandel
mv namelist out of executable section #3 source: Robert Pasken
6ca3990
janmandel added a commit that referenced this issue Aug 31, 2022
@janmandel
set fire_fmc_read = 0 in fire_ros_main.F to prevent overwing of fmc_f…
8653c97 
… in init_fuels_cat #45 #3
@janmandel
Copy link
Member Author

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

janmandel added a commit that referenced this issue Sep 24, 2022
@janmandel
add/mod namelists for standalone fire_ros.exe #45 #3
e0753bf
@llsalazar llsalazar mentioned this issue Jun 1, 2023
Open
@Fergui
Copy link
Member

Fergui commented Jun 25, 2023 •
edited
Loading

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

@Fergui Fergui added the active On going work label Jun 25, 2023
@Fergui Fergui assigned Fergui and janmandel and unassigned Fergui Jun 25, 2023
@janmandel
Copy link
Member Author

janmandel commented Jul 29, 2023 •
edited
Loading

@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.

janmandel added a commit that referenced this issue Jul 30, 2023
@janmandel
fixing fire target in standalone/Makefile, all builds OK #3
dc10b00 
on branch develop-3jm
janmandel added a commit that referenced this issue Jul 30, 2023
@janmandel
standalone/fire.exe runs #3
420aef7 
On branch develop-3jm
janmandel added a commit that referenced this issue Jul 30, 2023
@janmandel
fast forward release to develop3-jm #3
86f0c5b 
git merge develop-3jm
Updating 792e703..420aef7
Fast-forward
 standalone/Makefile        | 9 ++-------
 standalone/module_domain.F | 1 +
 test/em_fire/hill/fire.exe | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)
only standalone changes, regression not needed
@Aurel31
Copy link
Collaborator

Aurel31 commented Jul 31, 2023

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.

janmandel added a commit that referenced this issue Aug 3, 2023
@janmandel
advancing release at e6f0c5b0949270aedbe2d56c363ccfe7194b4641 to deve…
f48faa5 
…lop-3jm #3

closing #3
@janmandel
Copy link
Member Author

Standalone driven by wrfout OK, closing the issue #3

@kylehilburn @Aurel31 @Fergui

@janmandel janmandel removed the active On going work label Aug 3, 2023
janmandel added a commit that referenced this issue Aug 3, 2023
@janmandel
Renamed branch develop-3 -> develop-3-abandoned DO NOT MERGE #3
191b0ad 
On branch develop-3-abandoned
No changes
@janmandel
Copy link
Member Author

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

janmandel added a commit that referenced this issue Aug 3, 2023
@janmandel
renamed branch develop-3jm back to develop-3 #3
c4211da
janmandel added a commit that referenced this issue Aug 3, 2023
@janmandel
Merge branch 'release' into develop-3 #3
ea9cad5
@janmandel janmandel mentioned this issue Aug 3, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@janmandel janmandel

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@janmandel @Fergui @Aurel31