ACG-fication of SetServices - #100
Open
pchakraborty wants to merge 2 commits into
Open
Conversation
Purely mechanical follow-up to the earlier formatting pass, no functional
changes. Replaces SetServices's hand-written MAPL_AddImportSpec/
AddExportSpec/AddInternalSpec calls with a single Irrad_StateSpecs.rc file
and three generated #include's (Irrad_Import___.h / Irrad_Export___.h /
Irrad_Internal___.h), driven by mapl_acg() in CMakeLists.txt. This matches
how the MAPL3 port already declares its state specs, so the two versions
stay easier to diff and maintain side by side. SetServices drops from ~980
to ~310 lines.
- AERO (needs a state-item datatype the .rc schema can't express), the 3-D
CO2 import (config-driven, needs a local variable in scope), and the
RATS-diagnostics block (fully dynamic - names and count depend on a
runtime config list) don't fit the static .rc model and are left
hand-written, same as the MAPL3 port does for the same reasons.
- Extracted the OLRB{bb}RG/TBRB{bb}RG band exports/internals out of a
runtime do-loop (checking a band_output_supported(ibnd) array) into 8
static, conditional .rc rows (COND = USE_RRTMG .or. USE_RRTMGP) instead
of a straight syntax swap. Verified these are the exact same 8 bands the
array marked true, so this is behavior-preserving. Removed the loop
variables (ibnd, bb) and the _ASSERT(NB_RRTMG == nbndlw, ...) checks that
only existed to support that loop, since they're now dead code.
- CMakeLists.txt's mapl_acg() call also generates Irrad_GetPointer___.h and
Irrad_DeclarePointer___.h, though SetServices doesn't #include them yet -
harmless to generate now, ready for a later round that converts Run's/
LW_Driver's manual MAPL_GetPointer calls.
pchakraborty
added
0 diff
|
Label error. Requires exactly 0 of: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. Found: 0 diff, Contingent - DNA, acg-migration |
3 similar comments
|
Label error. Requires exactly 0 of: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. Found: 0 diff, Contingent - DNA, acg-migration |
|
Label error. Requires exactly 0 of: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. Found: 0 diff, Contingent - DNA, acg-migration |
|
Label error. Requires exactly 0 of: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. Found: 0 diff, Contingent - DNA, acg-migration |
|
Label error. Requires exactly 0 of: Contingent - DNA, Needs Lead Approval, Contingent -- Do Not Approve. Found: 0 diff, Contingent - DNA, acg-migration |
pchakraborty
removed
the
Contingent - DNA
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace SetServices's hand-written
MAPL_AddImportSpec/AddExportSpec/AddInternalSpeccalls with a singleIrrad_StateSpecs.rcfile and three generated#include's (Irrad_Import___.h / Irrad_Export___.h / Irrad_Internal___.h), driven bymapl_acg()inCMakeLists.txt. This matches how the MAPL3 port already declares its state specs, so the two versions stay easier to diff and maintain side by side. SetServices drops from ~980 to ~310 lines.Note
AERO(needs a state-item datatype the .rc schema can't express), the3-D CO2import (config-driven, needs a local variable in scope), and theRATS-diagnostics block (fully dynamic - names and count depend on a runtime config list) don't fit the staticStateSpecsmodel and are left hand-written, same as the MAPL3 port does for the same reasons.Note
Extracted the
OLRB{bb}RG/TBRB{bb}RGband exports/internals out of a runtime do-loop (checking a band_output_supported(ibnd) array) into 8 static, conditionalStateSpecsrows (COND = USE_RRTMG .or. USE_RRTMGP) instead of a straight syntax swap. Verified these are the exact same 8 bands the array marked true, so this is behavior-preserving. Removed the loop variables (ibnd,bb) and the_ASSERT(NB_RRTMG == nbndlw, ...)checks that only existed to support that loop, since they're now dead code.Note
CMakeLists.txt'smapl_acg()call also generatesIrrad_GetPointer___.handIrrad_DeclarePointer___.h, thoughSetServicesdoesn't #include them yet - harmless to generate now, ready for a later round that convertsRun's/LW_Driver's manualMAPL_GetPointercalls.