Fix bugs in PDER, OCPISOA and TotalOC in complexSOA

[yuanjianz]

Name and Institution (Required)

Name: Yuanjian Zhang Institution: WashU

Describe the update

SimpleSOA: OCPISOA = OCPI*OCFOPOA + SOAS ComplexSOA_nonSVPOA: OCPISOA = OCPI*OCFOPOA + TSOA + ASOA + ISOAAQ ComplexSOA_SVPOA: OCPISOA = OPOA + TSOA + ASOA + ISOAAQ

• Simplify verbose calculations.
• Use OCPISOA+OCPO in dry effective radius calculation instead of summing up each species.
• Use OCPISOA+OCPO for TotalOA, enabling TotalOA diagnostic for SimpleSOA.
• Match TotalOC calculation consistent with aerosol_mod.F90.

Expected changes

• Parameterized dry effective radius for SNA and OM will correctly handle SVPOA scenario (OCPI replaced by OPOA).
• ~This update should be no-diff-to-benchmark since SVPOA is not activated in benchmark simulation.~
• OCPISOA in benchmark(both simpleSOA and complexSOA are activated) will no longer double count ISOAAQ as was in PM2.5 before.
• TotalOC will no longer omit TSOA, ASOA, OCPI and OCPO in complexSOA_nonSVPOA (benchmark falls into this).

Reference(s)

Tagging @Haihui-Zhu for confirmation about the PDER update.

Related Github Issue

#2314 #2321