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.

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

Fix error in resuspension mods introduced during merge of mom. #550

Merged
merged 1 commit into from
Dec 11, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions components/cam/bld/build-namelist
Original file line number Diff line number Diff line change
Expand Up @@ -1175,15 +1175,42 @@ if ($aer_model eq 'mam' ) {
[qw(pom_c4 bc_c4)],
);

@mode_num_src = qw(A A A A);
@mode_spec_src = (
[qw(A A A A A A A)],
[qw(A A A A)],
[qw(A A A)],
[qw(A A A)],
);
}
@mode_num_src = qw(A A A A);
@mode_spec_src = (
[qw(A A A A A A)],
[qw(A A A)],
[qw(A A A)],
[qw(A A)],
);
}
else{
@mode_spec = (
[qw(so4_a1 pom_a1 soa_a1 bc_a1 dst_a1 ncl_a1)],
[qw(so4_a2 soa_a2 ncl_a2)],
[qw(dst_a3 ncl_a3 so4_a3 bc_a3 pom_a3 soa_a3)],
[qw(pom_a4 bc_a4)],
);
@mode_spec_type = (
[qw(sulfate p-organic s-organic black-c dust seasalt)],
[qw(sulfate s-organic seasalt)],
[qw(dust seasalt sulfate black-c p-organic s-organic)],
[qw(p-organic black-c)],
);
@mode_spec_cw = (
[qw(so4_c1 pom_c1 soa_c1 bc_c1 dst_c1 ncl_c1)],
[qw(so4_c2 soa_c2 ncl_c2)],
[qw(dst_c3 ncl_c3 so4_c3 bc_c3 pom_c3 soa_c3)],
[qw(pom_c4 bc_c4)],
);

@mode_num_src = qw(A A A A);
@mode_spec_src = (
[qw(A A A A A A)],
[qw(A A A)],
[qw(A A A A A A)],
[qw(A A)],
);
}
} elsif($aero_modes eq '4mode_mom') {
# For 4 modes

Expand Down