Merge in SIS2 changes using new coupler_types #79
Conversation
Replaced extensive code blocks going through the detailed elements of the coupler_types with equivalent calls to the new subroutines that have been introduced to more succinctly perform tasks on the coupler types. All answers are bitwise identical, but this requires the new interfaces that have been introduced on the coupler_type_reform_rwh branch of the FMS code.
Completely revised how SIS2 handles the additional tracer-related fluxes and ocean surface fields, so that they now use coupler_type variables throughout the algorithm and quasi-object-oriented routines to operate on these types. All answers are bitwise identical, and SIS2 no longer has any code that depends on the details of the implementation of the coupler_types. Some elements of publicly visible type have been changed or eliminated. These changes require an updated version of the coupler_type_reform_rwh branch of the FMS code.
Added optional arguments gas_flux and gas_fields_ocn arguments of type coupler_1d_bc_type to several SIS2 initialization routines, including ice_model_init. If these are present, they are used to spawn the types used to describe additional gas or tracer fluxes and fields at the same time as other SIS2 arrays are allocated. There is a new version of the coupler that makes use of these new arguments, but because they are optional, older versions of the coupler will work also. All answers are bitwise identical.
Added calls to save any gas fluxes in the fast-ice-average and total_surface_flux types to a restart file with concurrent ice coupling, if the newer version of the coupler, with the optional gas_flux arguments to ice_model_init, is used. All answers are bitwise identical, but there is now a good chance that coupled configurations with gas fluxes and concurrent ice coupling will reproduce across restarts (this is not well tested by the current suite of MOM6-examples test cases). These changes require an updated version of the coupler_type_reform_rwh branch of the FMS code, which should be made available more generally as a patch to FMS in or about September 2017.
Merge in Coupler type reform rwh
|
This is using the latest FMS on coupler_type_reform_rwh:
|
Now that the coupler types provided by MOM6-examples/src/FMS have been updated, the versions of SIS2 that use these coupler types should be merged onto the main branch.