Separate removal of Antarctic river and ice runoff

[xylar]

This is needed so we can remove ice (solid) runoff but not river (liquid) runoff.

This merge aslo removes totalRemoved*RunoffFlux variables. These fields are computed incorrectly (they are missing areaCell) and are not currently used for anything within MPAS-Ocean or any diagnostics.

This is part of the design: https://acme-climate.atlassian.net/wiki/spaces/PSC/pages/4210098268/Design+Document+Data+iceberg+and+ice-shelf+melt+flux+patterns+for+E3SM+spin-up+runs
This is a high priority for the Polar team.

[xylar]

@darincomeau and @cbegeman, I'm testing this now and will post the results. Once I've successfully tested this, I'd appreciate your review.

[xylar]

I'm afraid I don't recall why I closed #103 a few days ago. Perhaps that was a mistake. Anyway, this replaces it.

Also, E3SM-Project#6413 has gone into E3SM master so I think this change now makes more sense.

[xylar]

Testing

I ran a another test to make sure river runoff was being removed and ice runoff was not. Results are in:

/lcrc/group/e3sm/ac.xasay-davis/scratch/chrys/SMS_D_P480_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850-DISMF.chrysalis_intel.20240705_124952_3bwptc/run

As expected, I'm seeing:

$ ncdump -v accumulatedRemovedRiverRunoffFlux,accumulatedRemovedIceRunoffFlux SMS_D_P480_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850-DISMF.chrysalis_intel.20240705_124952_3bwptc.mpaso.hist.am.conservationCheck.0001-01-01.nc | grep accum
...
 accumulatedRemovedRiverRunoffFlux = 0, 0 ;
 accumulatedRemovedIceRunoffFlux = 0, 33509297.0268131 ;

Basically the same as my SORRM test in #103

[cbegeman]

Approving based on visual inspection and @xylar's testing. Let me know if you'd like me to do any additional testing.

[darincomeau]

Passes

• SMS.ne30pg2_r05_IcoswISC30E3r5.CRYO1850.chrysalis_intel
• SMS.ne30pg2_r05_IcoswISC30E3r5.CRYO1850-DISMF.chrysalis_intel
• SMS.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.chrysalis_intel
• ERS.ne30pg2_r05_IcoswISC30E3r5.CRYO1850.chrysalis_intel

with expected values for config_remove_ais_ice_runoff for CRYO* compsets (true) and WCYCL1850 (false); config_remove_ais_river_runoff = false for all.

I also ran a branch test off the v3.LR.spinup to see if the change in ocn namelist would have an adverse impact, and it did not, ran fine.

@xylar I agree with the change in removing AIS river runoff in CRYO configurations (i.e. to not do it anymore), in the real PR can you put that behavior change in the header?

[darincomeau]

Approved based on visual inspection, developer and above testing.

[xylar]

Thank you both! I'll move this over to E3SM.

[xylar]

Moving to E3SM-Project#6510