Closed yfenganl closed 1 year ago
@mingxuanwupnnl yes, I could replace the file mo_gas_phase_chemdr.F90 with the one from NGD_v3atm branch to resolve the conflict. Will get to that tomorrow. Thanks for the feedback.
@mingxuanwupnnl yes, I could replace the file mo_gas_phase_chemdr.F90 with the one from NGD_v3atm branch to resolve the conflict. Will get to that tomorrow. Thanks for the feedback.
@mingxuanwupnnl : I just checked the differences in mo_gas_phase_chemdr.F90 between the two branches. The only difference (ed: should be the 'only conflict'. there are other differences that do not seem to cause conflicts) is that one has an extra 'space' :) could you please confirm? so I could resolve the conflict
@mingxuanwupnnl @hwangacme : I have resolved the small conflict in mo_gas_phase_chemdr.F90 by deleting the extra space on Line 1330. it seems no conflicts with the base branch NGD_v3atm now.
Just a final check, @yfenganl , @hwangacme , @mingxuanwupnnl . Can this PR be merged as is now? Based on the changes, the new default configuration will lead to NBFB results, correct? I am adding non-BFB label to this PR for quick future reference.
@wlin7 I think if there is no surprise for test results (probably not), it is good to be merged.
@yfenganl could you confirm and update your test results (SMS, ERS, etc) on confluence? Thank you.
Merged to NGD_v3atm. CIME tests are underway.
Implement the new dust emission scheme
github branch: yfenganl/atm/chemUCI-chemMZT-MOSAIC-dustemisK14_AMIP
rebased to the branch: mingxuanwupnnl/atm/chemUCI-chemMZT-MOSAIC_AMIP
Files modified:
do not update soil erodibility factor: components/eam/src/chemistry/modal_aero/dust_model.F90
modify the dust emissions: components/elm/src/biogeochem/DUSTMod.F90
retune emission factor: components/eam/bld/namelist_files/namelist_defaults_eam.xml
[non-BFB]