Attempt to refactor use of FLAP.

[tclune]

• Migrated CapOptions into ./gridcomps/cap
• Reduced use of #ifdef

Description

• Relocated 2 files from ./base to ./gridcomps/Cap
• Improved separation of CapOptions and FlapCLI layers.

Related Issue

Motivation and Context

Cleanup.

How Has This Been Tested?

Just MAPL tests. Further testing with GCM is warranted.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
• Trivial change (affects only documentation or cleanup)

Checklist:

• I have tested this change with a run of GEOSgcm (if non-trivial)
• I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
• I have updated the CHANGELOG.md accordingly following the style of Keep a Changelog

[Gvilla1000-nasa]

I don't see any changes here impacting the other refactoring PR, but I blocked it until the other one gets resolved.

[mathomp4]

Approved for CMake

[mathomp4]

Oh wow. GNU does not like this. I wonder if it's a bug in the compiler?

[mathomp4]

I'll attach a make.log here for your perusal:
make.log

[Gvilla1000-nasa]

Seems like the use of the name MAPL_FlapCli to rename the MAPL_CapOptions interface for the new_CapOptions procedure and still using it in this module as the name of the interface holding the new_CapOptions_from_flap procedure is causing conflicts. Commenting this line though makes it fail in the external components like Fvdycore.

[Gvilla1000-nasa]

With the result from new_CapOptions_from_flap being now of type MAPL_CapOptions instead of MAPL_FlapCLI, wouldn't lines 21-22 of Tests/ExtDataDriver.F90 need to be modified from:

  cli = MAPL_FlapCLI(description='extdata driver',authors='gmao')
  cap_options=MAPL_CapOptions(cli)

to

 cap_options = MAPL_FlapCLI(description='extdata driver',authors='gmao')

and remove the type(MAPL_FlapCLI) :: cli?

[tclune]

The intent was to avoid needing to edit the application programs which reside in other repos. (I.e., to preserve backwards compatibility. The second line is supposed to just to a copy now which makes it "silly" in the grand scheme of things, but lets those programs be unchanged. I'll try to poke around soon to see if this is a gfortran bug and/or if there is a workaround.