Skip to content

Commit

Permalink
Merge branch 'susburrows/atm/marine-organic-emissions' into next (PR #…
Browse files Browse the repository at this point in the history 
…415)

This is to fix merge conflict of ./cam/bld/build-namelist

[BFB]
  • Loading branch information
@yjinho
yjinho committed Dec 11, 2015
2 parents db327ac + 1e08ddf commit 1d55358
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/cam/bld/build-namelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ if ($aer_model eq 'mam' ) {
[qw(so4_c2 soa_c2 ncl_c2 mom_c2)],
[qw(dst_c3 ncl_c3 so4_c3)],
[qw(pom_c4 bc_c4 mom_c4)],
);
);

@mode_num_src = qw(A A A A);
@mode_spec_src = (
Expand Down

2 comments on commit 1d55358

@susburrows
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yjinho , I don't think this is what you intended to do. Are you getting tripped up by rerere? Let's discuss this afternoon...

@yjinho
Copy link
Contributor Author

@yjinho yjinho commented on 1d55358 Dec 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like I have to merge susburrows/atm/resus_organics_mergefix (PR #550).

Please sign in to comment.