From 6ffba1260b3c99284f64ea4bbde6201a5f6897a9 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Wed, 7 Dec 2022 09:51:31 -0500 Subject: [PATCH 1/8] Fixes #1846 --- .../test_cases/case17/AGCM1.rc | 24 +++++ .../test_cases/case17/AGCM2.rc | 29 +++++ .../test_cases/case17/CAP.rc | 3 + .../test_cases/case17/CAP1.rc | 26 +++++ .../test_cases/case17/CAP2.rc | 16 +++ .../test_cases/case17/ExtData.rc | 13 +++ .../test_cases/case17/HISTORY1.rc | 20 ++++ .../test_cases/case17/HISTORY2.rc | 5 + .../test_cases/case17/README | 1 + .../test_cases/case17/egress | 0 .../test_cases/case17/extdata.yaml | 3 + .../test_cases/case17/extdata_2d.yaml | 4 + .../test_cases/case17/extdata_3d.yaml | 4 + .../test_cases/case17/run.log | 101 ++++++++++++++++++ .../test_cases/case17/vars_2d.2004.nc4 | Bin 0 -> 219976 bytes .../test_cases/case17/vars_2d.rcx | 6 ++ .../test_cases/case17/vars_3d.2004.nc4 | Bin 0 -> 612219 bytes .../test_cases/case17/vars_3d.rcx | 6 ++ .../test_cases/case17/warnings_and_errors.log | 40 +++++++ .../test_cases/extdata_2g_cases.txt | 1 + .../test_cases/test_case_descriptions.md | 2 +- gridcomps/ExtData2G/CMakeLists.txt | 2 + gridcomps/ExtData2G/ExtDataConfig.F90 | 19 ++++ gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 | 12 +++ .../ExtData2G/ExtDataYamlNodeWrapper.F90 | 11 ++ 25 files changed, 347 insertions(+), 1 deletion(-) create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/AGCM1.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/AGCM2.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/CAP1.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/CAP2.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/ExtData.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY1.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY2.rc create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/README create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/egress create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/extdata.yaml create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/extdata_2d.yaml create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/extdata_3d.yaml create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/run.log create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.2004.nc4 create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.rcx create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.2004.nc4 create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx create mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log create mode 100644 gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 create mode 100644 gridcomps/ExtData2G/ExtDataYamlNodeWrapper.F90 diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/AGCM1.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/AGCM1.rc new file mode 100644 index 000000000000..83ad27a2c551 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/AGCM1.rc @@ -0,0 +1,24 @@ +NX: 1 +NY: 1 + +Root.GRID_TYPE: LatLon +Root.GRIDNAME: DC90x45-PC +Root.LM: 3 +Root.IM_WORLD: 90 +Root.JM_WORLD: 45 +Root.POLE: 'PC' +Root.DATELINE: 'DC' + +RUN_MODE: GenerateExports + +EXPORT_STATE:: +VAR2D , time , days , xy , c +VAR3D , time , days , xyz , c +:: + +FILL_DEF:: +VAR2D time +VAR3D time +:: + +REF_TIME: 20040701 000000 diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/AGCM2.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/AGCM2.rc new file mode 100644 index 000000000000..2e79954523bd --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/AGCM2.rc @@ -0,0 +1,29 @@ +NX: 1 +NY: 1 + +Root.GRID_TYPE: LatLon +Root.GRIDNAME: DC90x45-PC +Root.LM: 3 +Root.IM_WORLD: 90 +Root.JM_WORLD: 45 +Root.POLE: 'PC' +Root.DATELINE: 'DC' + +RUN_MODE: CompareImports + +IMPORT_STATE:: +VAR2D , time , days , xy , c +VAR3D , time , days , xyz , c +:: + +EXPORT_STATE:: +VAR2D , time , days , xy , c +VAR3D , time , days , xyz , c +:: + +FILL_DEF:: +VAR2D time +VAR3D time +:: + +REF_TIME: 20040701 000000 diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc new file mode 100644 index 000000000000..a822bdb36532 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc @@ -0,0 +1,3 @@ +CASES:: +CAP2.rc +:: diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/CAP1.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP1.rc new file mode 100644 index 000000000000..30f54308f847 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP1.rc @@ -0,0 +1,26 @@ +USE_EXTDATA2G: .true. +ROOT_NAME: Root +ROOT_CF: AGCM1.rc +HIST_CF: HISTORY1.rc + +BEG_DATE: 20040101 210000 + +JOB_SGMT: 00001200 000000 +HEARTBEAT_DT: 3600 + +#RUN_EXTDATA: .false. +RUN_TIMES:: +20040115 210000 +20040215 210000 +20040315 210000 +20040415 210000 +20040515 210000 +20040615 210000 +20040715 210000 +20040815 210000 +20040915 210000 +20041015 210000 +20041115 210000 +20041215 210000 +:: + diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/CAP2.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP2.rc new file mode 100644 index 000000000000..9632228817d1 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP2.rc @@ -0,0 +1,16 @@ +USE_EXTDATA2G: .true. +ROOT_NAME: Root +ROOT_CF: AGCM2.rc +HIST_CF: HISTORY2.rc + +BEG_DATE: 20040101 210000 + +JOB_SGMT: 00001200 000000 +HEARTBEAT_DT: 3600 + +#RUN_EXTDATA: .false. +RUN_TIMES:: +20041125 210000 +20041126 210000 +:: + diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/ExtData.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/ExtData.rc new file mode 100644 index 000000000000..a45d1dd13f7f --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/ExtData.rc @@ -0,0 +1,13 @@ +#CASE_SENSITIVE_VARIABLE_NAMES: .false. +Ext_AllowExtrap: .false. +Prefetch: .true. +#DEBUG_LEVEL: 20 + +PrimaryExports%% +VAR2D NA N N 0 none none VAR2D case1.%y4.nc4 +VAR3D NA N N 0 none none VAR3D case1.%y4.nc4 +%% + + +DerivedExports%% +%% diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY1.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY1.rc new file mode 100644 index 000000000000..e5714d1ee0b5 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY1.rc @@ -0,0 +1,20 @@ +GRID_LABELS: +:: + +COLLECTIONS: vars_2d + vars_3d +:: + + vars_2d.template: '%y4.nc4', + vars_2d.format: 'CFIO', + vars_2d.frequency: 010000, + vars_2d.duration: 000000 + vars_2d.fields: 'VAR2D', 'Root', + :: + + vars_3d.template: '%y4.nc4', + vars_3d.format: 'CFIO', + vars_3d.frequency: 010000, + vars_3d.duration: 000000 + vars_3d.fields: 'VAR3D', 'Root', + :: diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY2.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY2.rc new file mode 100644 index 000000000000..2895432e995a --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/HISTORY2.rc @@ -0,0 +1,5 @@ +GRID_LABELS: +:: + +COLLECTIONS: +:: diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/README b/Tests/ExtData_Testing_Framework/test_cases/case17/README new file mode 100644 index 000000000000..9a6d7597262d --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/README @@ -0,0 +1 @@ +Case, 12-month/12 time 2004 file with 2 updates, non-climatology diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/egress b/Tests/ExtData_Testing_Framework/test_cases/case17/egress new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/extdata.yaml b/Tests/ExtData_Testing_Framework/test_cases/case17/extdata.yaml new file mode 100644 index 000000000000..98965edded12 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/extdata.yaml @@ -0,0 +1,3 @@ +subconfigs: + - extdata_2d.yaml + - extdata_3d.yaml diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/extdata_2d.yaml b/Tests/ExtData_Testing_Framework/test_cases/case17/extdata_2d.yaml new file mode 100644 index 000000000000..bccffae25a6d --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/extdata_2d.yaml @@ -0,0 +1,4 @@ +Collections: + twod_fstream: {template: vars_2d.%y4.nc4, valid_range: "2004-01-01/2005-01-01" } +Exports: + VAR2D: {variable: VAR2D, collection: twod_fstream} diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/extdata_3d.yaml b/Tests/ExtData_Testing_Framework/test_cases/case17/extdata_3d.yaml new file mode 100644 index 000000000000..92c53d22f51e --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/extdata_3d.yaml @@ -0,0 +1,4 @@ +Collections: + threed_fstream: {template: vars_3d.%y4.nc4, valid_range: "2004-01-01/2005-01-01" } +Exports: + VAR3D: {variable: VAR3D, collection: threed_fstream} diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/run.log b/Tests/ExtData_Testing_Framework/test_cases/case17/run.log new file mode 100644 index 000000000000..702218d749d6 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/run.log @@ -0,0 +1,101 @@ + MAPL: No configure file specified for logging layer. Using defaults. + Starting pFIO input server on Clients + Starting pFIO output server on Clients + Running new case + SHMEM: NumCores per Node = 1 + SHMEM: NumNodes in use = 1 + SHMEM: Total PEs = 1 + SHMEM: NumNodes in use = 1 + Character Resource Parameter: ROOT_CF:AGCM2.rc + Character Resource Parameter: ROOT_NAME:Root + Character Resource Parameter: HIST_CF:HISTORY2.rc + Logical Resource Parameter: USE_EXTDATA2G:T + oserver is not split + + EXPSRC: + EXPID: + Descr: + DisableSubVmChecks: F + + Reading HISTORY RC Files: + ------------------------- + bmaa load 0 extdata.yaml + bmaa going to parse extdata_2d.yaml + bmaa load 0 extdata_2d.yaml + bmaa loading collection: twod_fstream + bmaa collec key is twod_fstream + bmaa done parsing extdata_2d.yaml + bmaa parsed 0 extdata_2d.yaml + bmaa going to parse extdata_3d.yaml + bmaa load 0 extdata_3d.yaml + bmaa loading collection: threed_fstream + bmaa collec key is threed_fstream + bmaa done parsing extdata_3d.yaml + bmaa parsed 0 extdata_3d.yaml + +Program received signal SIGABRT: Process abort signal. + +Backtrace for this error: +#0 0x2ae847d0e14f in ??? +#1 0x2ae847d0e0d7 in ??? +#2 0x2ae847d0f4a9 in ??? +#3 0x2ae847d4d333 in ??? +#4 0x2ae847d527a5 in ??? +#5 0x2ae8406314cf in __fy_mapping_MOD_omap_i_s_clear + at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/gFTL/include/v2/set/procedures.inc:149 +#6 0x2ae840628684 in __fy_mapping_MOD_omap_i_clear + at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/gFTL/include/v2/map/procedures.inc:301 +#7 0x2ae840617cba in __fy_mapping_MOD_omap_clear + at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/gFTL/include/v2/ordered_map/procedures.inc:282 +#8 0x2ae8405fa4b7 in __fy_mappingnode_MOD_clear + at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/yaFyaml/src/Nodes/MappingNode.F90:227 +#9 0x2ae8405fa4e5 in __fy_mappingnode_MOD_clear_final + at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/yaFyaml/src/Nodes/MappingNode.F90:221 +#10 0x2ae8405f90b2 in __fy_mappingnode_MOD___final_fy_mappingnode_Mappingnode + at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/yaFyaml/src/Nodes/MappingNode.F90:330 +#11 0x2ae84048fc47 in __mapl_extdataconfig_MOD_new_extdataconfig_from_yaml + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/gridcomps/ExtData2G/ExtDataConfig.F90:105 +#12 0x2ae840506f4f in __mapl_extdataoldtypescreator_MOD_new_extdataoldtypescreator + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/gridcomps/ExtData2G/ExtDataOldTypesCreator.F90:51 +#13 0x2ae8404d0012 in initialize_ + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/gridcomps/ExtData2G/ExtDataGridCompNG.F90:345 +#14 0x2ae83de4b9c5 in ??? +#15 0x2ae83de4bd39 in ??? +#16 0x2ae83e10bdd5 in ??? +#17 0x2ae83e100493 in ??? +#18 0x2ae83de4a5c1 in ??? +#19 0x2ae83e31cbee in ??? +#20 0x2ae83e5db4a5 in ??? +#21 0x2ae840ce38e5 in mapl_genericwrapper + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/generic/MAPL_Generic.F90:1808 +#22 0x2ae83de4b9c5 in ??? +#23 0x2ae83de4bd39 in ??? +#24 0x2ae83e10bdd5 in ??? +#25 0x2ae83e100493 in ??? +#26 0x2ae83de4a5c1 in ??? +#27 0x2ae83e31cbee in ??? +#28 0x2ae83e5db4a5 in ??? +#29 0x411faa in initialize_gc + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriverGridComp.F90:410 +#30 0x2ae83de4b9c5 in ??? +#31 0x2ae83de4bd39 in ??? +#32 0x2ae83e10bdd5 in ??? +#33 0x2ae83e100493 in ??? +#34 0x2ae83de4a5c1 in ??? +#35 0x2ae83e31cbee in ??? +#36 0x2ae83e5db4a5 in ??? +#37 0x40d946 in __extdata_drivergridcompmod_MOD_initialize + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriverGridComp.F90:520 +#38 0x432010 in __extdatadrivermod_MOD_run + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriverMod.F90:127 +#39 0x42d2bc in extdata_driver + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriver.F90:25 +#40 0x42d344 in main + at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriver.F90:6 +-------------------------------------------------------------------------- +Primary job terminated normally, but 1 process returned +a non-zero exit code. Per user-direction, the job has been aborted. +-------------------------------------------------------------------------- +-------------------------------------------------------------------------- +mpirun noticed that process rank 0 with PID 0 on node borgi190 exited on signal 6 (Aborted). +-------------------------------------------------------------------------- diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.2004.nc4 b/Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.2004.nc4 new file mode 100644 index 0000000000000000000000000000000000000000..178869eb33c606e502ced85361b772e573f75503 GIT binary patch literal 219976 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 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<`_RC54q6+0)BytwFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}Sj_ z11HA%^-%{5Fu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb nFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L>*?+pAu#JPU; literal 0 HcmV?d00001 diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx b/Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx new file mode 100644 index 000000000000..1d3e3d161286 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx @@ -0,0 +1,6 @@ + vars_3d.template: '%y4.nc4', + vars_3d.format: 'CFIO', + vars_3d.frequency: 010000, + vars_3d.duration: 000000 + vars_3d.fields: 'VAR3D', 'Root', + :: diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log b/Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log new file mode 100644 index 000000000000..f3a7e06cd433 --- /dev/null +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log @@ -0,0 +1,40 @@ +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: EXTDATA: In ExtData resource file, could not find: VAR2D +pe=00000: EXTDATA: In ExtData resource file, could not find: VAR3D +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. +pe=00000: MAPL: No configure file specified for logging layer. Using defaults. diff --git a/Tests/ExtData_Testing_Framework/test_cases/extdata_2g_cases.txt b/Tests/ExtData_Testing_Framework/test_cases/extdata_2g_cases.txt index 02026c1d3f40..ecab8fd79333 100644 --- a/Tests/ExtData_Testing_Framework/test_cases/extdata_2g_cases.txt +++ b/Tests/ExtData_Testing_Framework/test_cases/extdata_2g_cases.txt @@ -14,6 +14,7 @@ case13 case14 case15 case16 +case17 case18 case19 case20 diff --git a/Tests/ExtData_Testing_Framework/test_cases/test_case_descriptions.md b/Tests/ExtData_Testing_Framework/test_cases/test_case_descriptions.md index f6859c535e8e..8c963de95449 100644 --- a/Tests/ExtData_Testing_Framework/test_cases/test_case_descriptions.md +++ b/Tests/ExtData_Testing_Framework/test_cases/test_case_descriptions.md @@ -21,7 +21,7 @@ path_to_script/run_extdatadriver_cases.py --builddir path_to_geos_install/bin -- 14. Testing that we can take a climatology for a non-leap year and interpolate to a leap year. Daily files each with 1 value for 2007 (non-leap year). Interpolate to 02/29/2008 (leap year) 15. Testing that we can take a climatology for a non-leap year and interpolate to a non-leap year. Daily files each with 1 value for 2007 (non-leap year). Interpolate to 03/29/2006 (leap year) 16. Testing that we can take a climatology for a leap year and interpolate to a non-leap year. Daily files each with 1 value for 2008 (leap year). Interpolate to 03/29/2006 15z (leap year) -17. Not used +17. Test ability of ExtData (2G only) to allow for subconfigs, i.e. split input yaml files into multiple files 18. Test vector regridding 19. Test set file to /dev/null 20. Make daily files for 2016. Then start on February 29th in 2020 and allow extrapolation outside of dataset a climatology diff --git a/gridcomps/ExtData2G/CMakeLists.txt b/gridcomps/ExtData2G/CMakeLists.txt index 286af145629d..0088a84b77fd 100644 --- a/gridcomps/ExtData2G/CMakeLists.txt +++ b/gridcomps/ExtData2G/CMakeLists.txt @@ -20,6 +20,8 @@ set (srcs ExtData_IOBundleMod.F90 ExtData_IOBundleVectorMod.F90 ExtDataMasking.F90 + ExtDataYamlNodeStack.F90 + ExtDataYamlNodeWrapper.F90 ) diff --git a/gridcomps/ExtData2G/ExtDataConfig.F90 b/gridcomps/ExtData2G/ExtDataConfig.F90 index 9c2ea8f754e7..9e9321434bfc 100644 --- a/gridcomps/ExtData2G/ExtDataConfig.F90 +++ b/gridcomps/ExtData2G/ExtDataConfig.F90 @@ -17,6 +17,8 @@ module MAPL_ExtDataConfig use MAPL_ExtDataTimeSampleMap use MAPL_TimeStringConversion use MAPL_ExtDataMask + use MAPL_ExtDataYamlNodeStack + use MAPL_ExtDataYamlNodeWrapper implicit none private @@ -49,7 +51,11 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_ integer, optional, intent(out) :: rc type(Parser) :: p +#ifndef __GFORTRAN__ class(YAML_Node), allocatable :: config +#else + integer :: my_stack +#endif class(YAML_Node), pointer :: subcfg, ds_config, rule_config, derived_config, sample_config, subconfigs, rule_map class(NodeIterator), allocatable :: iter character(len=:), pointer :: key @@ -74,6 +80,11 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_ inquire(file=trim(config_file),exist=file_found) _ASSERT(file_found,"could not find: "//trim(config_file)) +#ifdef __GFORTRAN__ + stack_depth = stack_depth + 1 + my_stack = stack_depth + associate(config => yaml_node_stack(my_stack)%a_yaml_node) +#endif p = Parser('core') config = p%load(config_file,rc=status) if (status/=_SUCCESS) then @@ -88,7 +99,12 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_ call new_ExtDataConfig_from_yaml(ext_config,sub_file,current_time,rc=status) _VERIFY(status) end do +#ifdef __GFORTRAN__ + deallocate(config) + config = p%load(config_file,rc=status) +#endif end if + if (config%has("Samplings")) then sample_config => config%of("Samplings") @@ -164,6 +180,9 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_ _VERIFY(status) end if +#ifdef __GFORTRAN__ + end associate +#endif _RETURN(_SUCCESS) end subroutine new_ExtDataConfig_from_yaml diff --git a/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 b/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 new file mode 100644 index 000000000000..7d1d2e91b785 --- /dev/null +++ b/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 @@ -0,0 +1,12 @@ +module MAPL_ExtDataYamlNodeStack + use yaFyaml + use MAPL_ExtDataYamlNodeWrapper + implicit none + + public :: stack_depth + public :: yaml_node_stack + + integer, save :: stack_depth = 0 + type(YamlNodeWrapper), save :: yaml_node_stack(20) + +end module MAPL_ExtDataYamlNodeStack diff --git a/gridcomps/ExtData2G/ExtDataYamlNodeWrapper.F90 b/gridcomps/ExtData2G/ExtDataYamlNodeWrapper.F90 new file mode 100644 index 000000000000..4e88b19047f1 --- /dev/null +++ b/gridcomps/ExtData2G/ExtDataYamlNodeWrapper.F90 @@ -0,0 +1,11 @@ +module MAPL_ExtDataYamlNodeWrapper + use yaFyaml + implicit none + + public YamlNodeWrapper + + type :: YamlNodeWrapper + class(YAML_Node), allocatable :: a_yaml_node + end type + +end module MAPL_ExtDataYamlNodeWrapper From c1d65e64685305067e54f3a4ca7149d7dd5b3da1 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Wed, 7 Dec 2022 10:24:42 -0500 Subject: [PATCH 2/8] updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0561cc7780d3..22043c7f2d6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Fixed bug with mutliple ExtData2G files when using gfortran + ### Removed ### Deprecated From f8fab431544e4849fb642de7af4a4a9a570cec8d Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Wed, 7 Dec 2022 10:27:15 -0500 Subject: [PATCH 3/8] remove files that should have not been comitted --- .../test_cases/case17/egress | 0 .../test_cases/case17/run.log | 101 ------------------ .../test_cases/case17/vars_2d.2004.nc4 | Bin 219976 -> 0 bytes .../test_cases/case17/vars_2d.rcx | 6 -- .../test_cases/case17/vars_3d.2004.nc4 | Bin 612219 -> 0 bytes .../test_cases/case17/vars_3d.rcx | 6 -- .../test_cases/case17/warnings_and_errors.log | 40 ------- 7 files changed, 153 deletions(-) delete mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/egress delete mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/run.log delete mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.2004.nc4 delete mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.rcx delete mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.2004.nc4 delete mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx delete mode 100644 Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/egress b/Tests/ExtData_Testing_Framework/test_cases/case17/egress deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/run.log b/Tests/ExtData_Testing_Framework/test_cases/case17/run.log deleted file mode 100644 index 702218d749d6..000000000000 --- a/Tests/ExtData_Testing_Framework/test_cases/case17/run.log +++ /dev/null @@ -1,101 +0,0 @@ - MAPL: No configure file specified for logging layer. Using defaults. - Starting pFIO input server on Clients - Starting pFIO output server on Clients - Running new case - SHMEM: NumCores per Node = 1 - SHMEM: NumNodes in use = 1 - SHMEM: Total PEs = 1 - SHMEM: NumNodes in use = 1 - Character Resource Parameter: ROOT_CF:AGCM2.rc - Character Resource Parameter: ROOT_NAME:Root - Character Resource Parameter: HIST_CF:HISTORY2.rc - Logical Resource Parameter: USE_EXTDATA2G:T - oserver is not split - - EXPSRC: - EXPID: - Descr: - DisableSubVmChecks: F - - Reading HISTORY RC Files: - ------------------------- - bmaa load 0 extdata.yaml - bmaa going to parse extdata_2d.yaml - bmaa load 0 extdata_2d.yaml - bmaa loading collection: twod_fstream - bmaa collec key is twod_fstream - bmaa done parsing extdata_2d.yaml - bmaa parsed 0 extdata_2d.yaml - bmaa going to parse extdata_3d.yaml - bmaa load 0 extdata_3d.yaml - bmaa loading collection: threed_fstream - bmaa collec key is threed_fstream - bmaa done parsing extdata_3d.yaml - bmaa parsed 0 extdata_3d.yaml - -Program received signal SIGABRT: Process abort signal. - -Backtrace for this error: -#0 0x2ae847d0e14f in ??? -#1 0x2ae847d0e0d7 in ??? -#2 0x2ae847d0f4a9 in ??? -#3 0x2ae847d4d333 in ??? -#4 0x2ae847d527a5 in ??? -#5 0x2ae8406314cf in __fy_mapping_MOD_omap_i_s_clear - at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/gFTL/include/v2/set/procedures.inc:149 -#6 0x2ae840628684 in __fy_mapping_MOD_omap_i_clear - at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/gFTL/include/v2/map/procedures.inc:301 -#7 0x2ae840617cba in __fy_mapping_MOD_omap_clear - at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/gFTL/include/v2/ordered_map/procedures.inc:282 -#8 0x2ae8405fa4b7 in __fy_mappingnode_MOD_clear - at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/yaFyaml/src/Nodes/MappingNode.F90:227 -#9 0x2ae8405fa4e5 in __fy_mappingnode_MOD_clear_final - at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/yaFyaml/src/Nodes/MappingNode.F90:221 -#10 0x2ae8405f90b2 in __fy_mappingnode_MOD___final_fy_mappingnode_Mappingnode - at /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.7.0/src/GFE/yaFyaml/src/Nodes/MappingNode.F90:330 -#11 0x2ae84048fc47 in __mapl_extdataconfig_MOD_new_extdataconfig_from_yaml - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/gridcomps/ExtData2G/ExtDataConfig.F90:105 -#12 0x2ae840506f4f in __mapl_extdataoldtypescreator_MOD_new_extdataoldtypescreator - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/gridcomps/ExtData2G/ExtDataOldTypesCreator.F90:51 -#13 0x2ae8404d0012 in initialize_ - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/gridcomps/ExtData2G/ExtDataGridCompNG.F90:345 -#14 0x2ae83de4b9c5 in ??? -#15 0x2ae83de4bd39 in ??? -#16 0x2ae83e10bdd5 in ??? -#17 0x2ae83e100493 in ??? -#18 0x2ae83de4a5c1 in ??? -#19 0x2ae83e31cbee in ??? -#20 0x2ae83e5db4a5 in ??? -#21 0x2ae840ce38e5 in mapl_genericwrapper - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/generic/MAPL_Generic.F90:1808 -#22 0x2ae83de4b9c5 in ??? -#23 0x2ae83de4bd39 in ??? -#24 0x2ae83e10bdd5 in ??? -#25 0x2ae83e100493 in ??? -#26 0x2ae83de4a5c1 in ??? -#27 0x2ae83e31cbee in ??? -#28 0x2ae83e5db4a5 in ??? -#29 0x411faa in initialize_gc - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriverGridComp.F90:410 -#30 0x2ae83de4b9c5 in ??? -#31 0x2ae83de4bd39 in ??? -#32 0x2ae83e10bdd5 in ??? -#33 0x2ae83e100493 in ??? -#34 0x2ae83de4a5c1 in ??? -#35 0x2ae83e31cbee in ??? -#36 0x2ae83e5db4a5 in ??? -#37 0x40d946 in __extdata_drivergridcompmod_MOD_initialize - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriverGridComp.F90:520 -#38 0x432010 in __extdatadrivermod_MOD_run - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriverMod.F90:127 -#39 0x42d2bc in extdata_driver - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriver.F90:25 -#40 0x42d344 in main - at /discover/swdev/bmauer/models/geosapp_pr_fail/GEOSgcm/src/Shared/@MAPL/Tests/ExtDataDriver.F90:6 --------------------------------------------------------------------------- -Primary job terminated normally, but 1 process returned -a non-zero exit code. Per user-direction, the job has been aborted. --------------------------------------------------------------------------- --------------------------------------------------------------------------- -mpirun noticed that process rank 0 with PID 0 on node borgi190 exited on signal 6 (Aborted). --------------------------------------------------------------------------- diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.2004.nc4 b/Tests/ExtData_Testing_Framework/test_cases/case17/vars_2d.2004.nc4 deleted file mode 100644 index 178869eb33c606e502ced85361b772e573f75503..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219976 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 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<`_RC54q6+0)BytwFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}Sj_ z11HA%^-%{5Fu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb nFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L>*?+pAu#JPU; diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx b/Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx deleted file mode 100644 index 1d3e3d161286..000000000000 --- a/Tests/ExtData_Testing_Framework/test_cases/case17/vars_3d.rcx +++ /dev/null @@ -1,6 +0,0 @@ - vars_3d.template: '%y4.nc4', - vars_3d.format: 'CFIO', - vars_3d.frequency: 010000, - vars_3d.duration: 000000 - vars_3d.fields: 'VAR3D', 'Root', - :: diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log b/Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log deleted file mode 100644 index f3a7e06cd433..000000000000 --- a/Tests/ExtData_Testing_Framework/test_cases/case17/warnings_and_errors.log +++ /dev/null @@ -1,40 +0,0 @@ -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: EXTDATA: In ExtData resource file, could not find: VAR2D -pe=00000: EXTDATA: In ExtData resource file, could not find: VAR3D -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. -pe=00000: MAPL: No configure file specified for logging layer. Using defaults. From 80381a7e163b197724bc9a482c658870bb9a127f Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Wed, 7 Dec 2022 10:32:03 -0500 Subject: [PATCH 4/8] updated changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22043c7f2d6b..06de951d6c51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,11 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Added new test case for ExtData2G to test multiple input files + ### Changed ### Fixed -- Fixed bug with mutliple ExtData2G files when using gfortran +- Implemented workaround for gfortran runtime issue with YafYaml when parsing multiple ExtData yaml files for ExtData2G ### Removed From a8c68167dde5b17e0fd9f5a8a065e007ea9d1749 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Wed, 7 Dec 2022 11:22:16 -0500 Subject: [PATCH 5/8] fix typo in case 17 and protect stack depth --- Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc | 1 + gridcomps/ExtData2G/ExtDataConfig.F90 | 1 + 2 files changed, 2 insertions(+) diff --git a/Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc index a822bdb36532..680d0ffa9c5b 100644 --- a/Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc +++ b/Tests/ExtData_Testing_Framework/test_cases/case17/CAP.rc @@ -1,3 +1,4 @@ CASES:: +CAP1.rc CAP2.rc :: diff --git a/gridcomps/ExtData2G/ExtDataConfig.F90 b/gridcomps/ExtData2G/ExtDataConfig.F90 index 9e9321434bfc..8ca333cfbef8 100644 --- a/gridcomps/ExtData2G/ExtDataConfig.F90 +++ b/gridcomps/ExtData2G/ExtDataConfig.F90 @@ -82,6 +82,7 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_ #ifdef __GFORTRAN__ stack_depth = stack_depth + 1 + _ASSERT(stack_depth <=max_depth,"yaml config stack too small") my_stack = stack_depth associate(config => yaml_node_stack(my_stack)%a_yaml_node) #endif From 3a352335d3d38e2fcd8931e6e198d84193da3665 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Wed, 7 Dec 2022 11:46:37 -0500 Subject: [PATCH 6/8] fix bug in previous commit --- gridcomps/ExtData2G/ExtDataConfig.F90 | 2 +- gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gridcomps/ExtData2G/ExtDataConfig.F90 b/gridcomps/ExtData2G/ExtDataConfig.F90 index 8ca333cfbef8..bbd1d570db17 100644 --- a/gridcomps/ExtData2G/ExtDataConfig.F90 +++ b/gridcomps/ExtData2G/ExtDataConfig.F90 @@ -82,7 +82,7 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_ #ifdef __GFORTRAN__ stack_depth = stack_depth + 1 - _ASSERT(stack_depth <=max_depth,"yaml config stack too small") + _ASSERT(stack_depth <=max_file_depth,"yaml config stack too small") my_stack = stack_depth associate(config => yaml_node_stack(my_stack)%a_yaml_node) #endif diff --git a/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 b/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 index 7d1d2e91b785..c38b1ea600c9 100644 --- a/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 +++ b/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 @@ -3,10 +3,12 @@ module MAPL_ExtDataYamlNodeStack use MAPL_ExtDataYamlNodeWrapper implicit none + public :: max_file_depth public :: stack_depth public :: yaml_node_stack integer, save :: stack_depth = 0 - type(YamlNodeWrapper), save :: yaml_node_stack(20) + integer, parameter :: max_file_depth = 20 + type(YamlNodeWrapper), save :: yaml_node_stack(max_file_depth) end module MAPL_ExtDataYamlNodeStack From 7e8ca46ee98fd2667dbfda31c6b4e2c3f7fe9c06 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Wed, 7 Dec 2022 12:43:22 -0500 Subject: [PATCH 7/8] Update gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 --- gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 b/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 index c38b1ea600c9..8a46e80933f2 100644 --- a/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 +++ b/gridcomps/ExtData2G/ExtDataYamlNodeStack.F90 @@ -8,7 +8,7 @@ module MAPL_ExtDataYamlNodeStack public :: yaml_node_stack integer, save :: stack_depth = 0 - integer, parameter :: max_file_depth = 20 - type(YamlNodeWrapper), save :: yaml_node_stack(max_file_depth) + integer, parameter :: MAX_FILE_DEPTH = 20 + type(YamlNodeWrapper), save :: yaml_node_stack(MAX_FILE_DEPTH) end module MAPL_ExtDataYamlNodeStack From d36444093694310f4c4fe0301710f87ce1566ead Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Wed, 7 Dec 2022 12:43:51 -0500 Subject: [PATCH 8/8] Update gridcomps/ExtData2G/ExtDataConfig.F90 --- gridcomps/ExtData2G/ExtDataConfig.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gridcomps/ExtData2G/ExtDataConfig.F90 b/gridcomps/ExtData2G/ExtDataConfig.F90 index bbd1d570db17..cc20edc46671 100644 --- a/gridcomps/ExtData2G/ExtDataConfig.F90 +++ b/gridcomps/ExtData2G/ExtDataConfig.F90 @@ -82,7 +82,7 @@ recursive subroutine new_ExtDataConfig_from_yaml(ext_config,config_file,current_ #ifdef __GFORTRAN__ stack_depth = stack_depth + 1 - _ASSERT(stack_depth <=max_file_depth,"yaml config stack too small") + _ASSERT(stack_depth <= MAX_FILE_DEPTH,"yaml config stack too small") my_stack = stack_depth associate(config => yaml_node_stack(my_stack)%a_yaml_node) #endif