Fix error in resuspension mods introduced during merge of mom.

E3SM-Project · Dec 11, 2015 · b6a1b3a · b6a1b3a
1 parent 85e0dd9
commit b6a1b3a
Showing 1 changed file with 35 additions and 8 deletions.
diff --git a/components/cam/bld/build-namelist b/components/cam/bld/build-namelist
@@ -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