diff --git a/regression/adv-dyn/adv.yaml b/regression/adv-dyn/adv.yaml index 119d1e4c..fc73d36a 100644 --- a/regression/adv-dyn/adv.yaml +++ b/regression/adv-dyn/adv.yaml @@ -6,6 +6,10 @@ ADV_CORE_REPORT_TRACER_MASS: true RUN_DT: 1800 mapl: + setServices: + sharedObj: libFVdycoreCubed_GridComp + userRoutine: advcore_setservices_ + misc: activate_all_exports: true checkpoint: diff --git a/regression/adv-dyn/cap.yaml b/regression/adv-dyn/cap.yaml index d4c6e68c..31e3f091 100644 --- a/regression/adv-dyn/cap.yaml +++ b/regression/adv-dyn/cap.yaml @@ -15,13 +15,18 @@ cap: root_name: Root mapl: + + setServices: + sharedObj: libMAPL.cap + children: Root: - dso: libconfigurable_gridcomp config_file: root.yaml + dso: libconfigurable_gridcomp + History: - dso: libMAPL.history config_file: history.yaml + dso: libMAPL.history checkpointing: enabled: true diff --git a/regression/adv-dyn/data-ana.yaml b/regression/adv-dyn/data-ana.yaml index a4b759db..f67144d3 100644 --- a/regression/adv-dyn/data-ana.yaml +++ b/regression/adv-dyn/data-ana.yaml @@ -1,4 +1,7 @@ mapl: + setServices: + sharedObj: libconfigurable_gridcomp + states: internal: DQVANA: diff --git a/regression/adv-dyn/data-moist.yaml b/regression/adv-dyn/data-moist.yaml index 07d88d31..347a0468 100644 --- a/regression/adv-dyn/data-moist.yaml +++ b/regression/adv-dyn/data-moist.yaml @@ -1,4 +1,7 @@ mapl: + setServices: + sharedObj: libconfigurable_gridcomp + states: internal: Q: diff --git a/regression/adv-dyn/data-phis-varflt.yaml b/regression/adv-dyn/data-phis-varflt.yaml index 8e5b03da..0c07df6d 100644 --- a/regression/adv-dyn/data-phis-varflt.yaml +++ b/regression/adv-dyn/data-phis-varflt.yaml @@ -1,4 +1,8 @@ mapl: + + setServices: + sharedObj: libconfigurable_gridcomp + states: internal: PHIS: diff --git a/regression/adv-dyn/data-tracers.yaml b/regression/adv-dyn/data-tracers.yaml index ef3a9ac4..f31019ac 100644 --- a/regression/adv-dyn/data-tracers.yaml +++ b/regression/adv-dyn/data-tracers.yaml @@ -1,4 +1,8 @@ mapl: + + setServices: + sharedObj: libconfigurable_gridcomp + states: internal: Q001: diff --git a/regression/adv-dyn/dyn.yaml b/regression/adv-dyn/dyn.yaml index e3bcd2e3..bad5ead5 100644 --- a/regression/adv-dyn/dyn.yaml +++ b/regression/adv-dyn/dyn.yaml @@ -24,6 +24,10 @@ geometry: field_center: PE mapl: + setServices: + sharedObj: libFVdycoreCubed_GridComp + userRoutine: fvdycorecubed_setservices_ + misc: checkpoint: export: true diff --git a/regression/adv-dyn/history.yaml b/regression/adv-dyn/history.yaml index 68aaa137..6331c752 100644 --- a/regression/adv-dyn/history.yaml +++ b/regression/adv-dyn/history.yaml @@ -17,3 +17,8 @@ collections: "[UKE,VKE]": {source: DYN.UV_KE} "[UPHI,VPHI]": {source: DYN.UV_PHI} "[UQV,VQV]": {source: DYN.UV_QV} + +mapl: + + setServices: + sharedObj: libMAPL.history diff --git a/regression/adv-dyn/root.yaml b/regression/adv-dyn/root.yaml index 14debb7c..30c7aaeb 100644 --- a/regression/adv-dyn/root.yaml +++ b/regression/adv-dyn/root.yaml @@ -1,5 +1,9 @@ --- mapl: + + setServices: + sharedObj: libconfigurable_gridcomp + states: {} geometry: @@ -8,34 +12,31 @@ mapl: children: DYN: - dso: libFVdycoreCubed_GridComp config_file: dyn.yaml + dso: libFVdycoreCubed_GridComp setservices: fvdycorecubed_setservices_ ADV: - dso: libFVdycoreCubed_GridComp config_file: adv.yaml + dso: libFVdycoreCubed_GridComp setservices: advcore_setservices_ DataMoist: - dso: libconfigurable_gridcomp config_file: data-moist.yaml - setservices: setservices_ + dso: libconfigurable_gridcomp DataTracers: - dso: libconfigurable_gridcomp config_file: data-tracers.yaml - setservices: setservices_ + dso: libconfigurable_gridcomp DataPhisVarflt: - dso: libconfigurable_gridcomp config_file: data-phis-varflt.yaml - setservices: setservices_ + dso: libconfigurable_gridcomp DataAna: - dso: libconfigurable_gridcomp config_file: data-ana.yaml - setservices: setservices_ + dso: libconfigurable_gridcomp + connections: - src_name: TRADV dst_name: TRADV diff --git a/regression/dyn-sa/cap.yaml b/regression/dyn-sa/cap.yaml index fb85cde9..a478e500 100644 --- a/regression/dyn-sa/cap.yaml +++ b/regression/dyn-sa/cap.yaml @@ -15,6 +15,10 @@ cap: root_name: Root mapl: + + setServices: + sharedObj: libMAPL.cap + children: Root: dso: libconfigurable_gridcomp diff --git a/regression/dyn-sa/data-moist.yaml b/regression/dyn-sa/data-moist.yaml index ceb15150..cb7a868a 100644 --- a/regression/dyn-sa/data-moist.yaml +++ b/regression/dyn-sa/data-moist.yaml @@ -1,4 +1,8 @@ mapl: + + setServices: + sharedObj: libconfigurable_gridcomp + states: internal: Q: diff --git a/regression/dyn-sa/dyn-sa.yaml b/regression/dyn-sa/dyn-sa.yaml index c27acf1b..2b76e960 100644 --- a/regression/dyn-sa/dyn-sa.yaml +++ b/regression/dyn-sa/dyn-sa.yaml @@ -25,6 +25,11 @@ geometry: field_center: PE mapl: + + setServices: + sharedObj: libFVdycoreCubed_GridComp + userRoutine: fvdycorecubed_setservices_ + misc: activate_all_imports: true activate_all_exports: true diff --git a/regression/dyn-sa/history.yaml b/regression/dyn-sa/history.yaml index 4e1ac194..1249d3d2 100644 --- a/regression/dyn-sa/history.yaml +++ b/regression/dyn-sa/history.yaml @@ -15,3 +15,8 @@ collections: "[UKE,VKE]": {source: DYNsa.UV_KE} "[UPHI,VPHI]": {source: DYNsa.UV_PHI} "[UQV,VQV]": {source: DYNsa.UV_QV} + +mapl: + + setServices: + sharedObj: libMAPL.history diff --git a/regression/dyn-sa/root.yaml b/regression/dyn-sa/root.yaml index b2aa09de..8218bc6a 100644 --- a/regression/dyn-sa/root.yaml +++ b/regression/dyn-sa/root.yaml @@ -1,5 +1,9 @@ --- mapl: + + setServices: + sharedObj: libconfigurable_gridcomp + states: {} geometry: @@ -11,7 +15,7 @@ mapl: dso: libFVdycoreCubed_GridComp config_file: dyn-sa.yaml setservices: fvdycorecubed_setservices_ - setservice: fvdycorecubed_setservices_ + DataMoist: dso: libconfigurable_gridcomp config_file: data-moist.yaml