Solar Terminator #404
Open
Solar Terminator #404
Conversation
This file contains 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
added 14 commits
September 1, 2024 22:50
adagucserverEC/CDataPostProcessors/CDataPostProcessor_SolarTerminator.cpp
Outdated
Show resolved
Hide resolved
adagucserverEC/CDataPostProcessors/CDataPostProcessor_SolarTerminator.h
Outdated
Show resolved
Hide resolved
belentorrente
force-pushed
the
newsolarterminator
branch
from
f7bac5d
to
b58596c
Compare
adagucserverEC/CRequest.cpp
Outdated
| printf("%s%c%c\n", "Content-Type:image/png", 13, 10); | ||
| image.printImagePng8(true); | ||
| CDBDebug("in special liveupdate case with timesteps %d", dataSources[j]->getNumTimeSteps()); | ||
| if (dataSources[j]->cfgLayer->DataPostProc.empty()) { |
There was a problem hiding this comment.
Can you place this code inside layerTypeLiveUpdateRenderIntoDrawImage? We are trying to make CRequest.cpp a bit smaller
There was a problem hiding this comment.
Yes, I added some aux functions within the LayerTypeLiveUpdate to deal with the case of the Solar Terminator
| @@ -289,7 +289,9 @@ int storeLayerStyleListIntoMetadataDb(MetadataLayer *metadataLayer) { | |||
| } | |||
|
|
|||
| int loadLayerStyleListFromMetadataDb(MetadataLayer *metadataLayer) { | |||
| if (metadataLayer->dataSource->dLayerType == CConfigReaderLayerTypeCascaded || metadataLayer->dataSource->dLayerType == CConfigReaderLayerTypeLiveUpdate) { | |||
| CDBWarning("loadLayerStyleListFromMetadataDb start"); | |||
| @@ -215,7 +215,8 @@ int CXMLGen::getWMS_1_1_1_Capabilities(CT::string *XMLDoc, std::vector<MetadataL | |||
| addErrorInXMLForMisconfiguredLayer(XMLDoc, layer); | |||
| } | |||
| if (layer->hasError == 0) { | |||
| XMLDoc->printconcat("<Layer queryable=\"%d\" opaque=\"1\" cascaded=\"%d\">\n", layer->layerMetadata.isQueryable, layer->dataSource->dLayerType == CConfigReaderLayerTypeCascaded ? 1 : 0); | |||
| XMLDoc->printconcat("<Layer queryable=\"%d\" opaque=\"1\" cascaded=\"%d\">\n", layer->layerMetadata.isQueryable, | |||
There was a problem hiding this comment.
Would it be possible to derive isQueryable in the layerMetadata section? Then other code can rely on the same checks too.
| </Style> | ||
|
|
||
| <Configuration> | ||
| <Layer type="liveupdate"> |
There was a problem hiding this comment.
A layer should have a Name element
| </Style> | ||
|
|
||
| <Layer type="liveupdate"> | ||
| <FilePath filter="" gfi_openall="true">{ADAGUC_PATH}data/datasets/solt.nc</FilePath> |
There was a problem hiding this comment.
Should have a Name element
|
|
||
| </Style> | ||
|
|
||
| <Layer type="liveupdate"> |
There was a problem hiding this comment.
Should have a Name element
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This MR introduces the CDataPostProcessor that calculates the Solar Terminator, which will assign one of five standard categories to a pixel (day, night, astronomical twilight, nautical twilight, and civil twilight) based on the solar zenith angle. Three test cases have been added.
The solar terminator algorithm itself is based on a book (Astronomical Algorithms, by Jean Meeus) that provides an approximation. An old scan of the book is available here, if you're interested.
More considerations:
liveupdatewith no post processors, it will go the pre-existing route, creating an image with the timestamp.CDataWriter::addData, so I have discarded this idea (for now). So for now, and empty netCDF file is used. Another problem is that the units in the legend depend on this and I could not find the way of overwriting this in the data post processor.