-
Couldn't load subscription status.
- Fork 0
additional default settings and command line args for land-atm DAS #94
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
modified: ldas_setup
|
@gmao-rreichle This PR contains the addition/modification to ldas_setup on top of ldasGC 2.0.0. When the coupling is on, it sets default values to a list of parameters. It also accepts a few more command line options that allow fvsetup pass adas information for the coupling. With these updates fvsetup will query where to get ldas initial conditions and pass them to ldas_setup. We only need one exeinp.txt ( work for both det and ens) . The modifications in fvsetup corresponding to this ldasGC PR are also implemented, but not yet in PR#327. The updated version has been tested. |
…tup): - renamed new command line arguments - edited comments & help messages for clarity - cleaned up white space and indent
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@saraqzhang, @weiyuan-jiang: See inline comments below.
@weiyuan-jiang, the changes in this PR (#94) supplement what was merged in #81. Together, the two PRs modify ldas_setup by adding command line arguments for the benefit of setting up LDAS within the ADAS, where ldas_setup is called from within fvsetup (see GEOS-ESM/GEOSadas#327 and GEOS-ESM/GEOSadas#352).
@weiyuan-jiang, in addition to addressing the inline comments below, please take a look at the aforementioned PRs (#81 and #94) and make sure the modifications to ldas_setup are consistent with the overall design of ldas_setup. Thanks!
edit lines responding to comments
|
added command line option to accept land BCs version info from fvsetup. |
|
fvsetup only provide BCs version info, not the whole path. In exeinp we still need to specify BCS_PATH such as: |
|
@saraqzhang : I made a few more changes in an attempt to simplify things. I hope I didn't break anything. Please review my changes: https://github.com/GEOS-ESM/GEOSldas_GridComp/compare/29f77d8..7742280?w=1 (white-space changes are hidden in this link). |
|
@gmao-rreichle I pulled the updated version and ran setup test, it works. I have an updated version of exeinp.txt, I can put it to this branch served as a draft sample file in GEOSldas_App/sample_config_files/LADAS. |
Yes, please! And use "git rm ..." to delete the old sample files. |
remove outdated sample files
|
@gmao-rreichle I add a README file in the directory, it turned out no need a sample file, just the information on which parameters will be taken care of by fvsetup or by ldas_setup default. |
|
it may no longer need this directory in the repo, or change the dir name ? |
|
Co-authored-by: Weiyuan Jiang <[email protected]>
…S setup (ldas_setup)
|
@weiyuan-jiang : Many thanks for the review. I implemented the suggested changes in two commits: |
|
@weiyuan-jiang Weiyuan, thanks for the update, I will make tests today. |
|
@weiyuan-jiang @gmao-rreichle I made minor changes ( df1b1f3 ) and ran setup test with dummyexeinp and batinp.txt ( generated by previous sample run) in position arguments, the test successfully setup the exp. |
|
the test is with ldas_cpl =1 and all command line inputs from fvsetup. |
- cleaned up logic of processing resource manager inputs - reverted to relative paths for rc files in ./etc - documentation of new functionality - updated language about compute nodes in sample batinp file (removed Skylake, added Milan) - fixed indentation
|
@saraqzhang, @weiyuan-jiang : I made more changes (4a1802e). Besides editing comments, I tried to clean up the logic of how resource manager inputs are processed. I also (tentatively) reverted back to relative paths for the location of the rc template files. With the absolute paths, the sample --exeinp command broke for me, and I think that ldas_setup should in any case be run from the ./install dir, so ../etc/ should always point to the rc template files. I have done some limited testing, but I can't promise that everything will work. We may have to iterate more. |
@gmao-rreichle Can you post the broken message? Or simply print out current_directory = os.path.dirname(file). There are two underline before and after file. it does not show here |
@gmao-rreichle Can you post the broken message? Or simply print out current_directory = os.path.dirname(file). There are two underline before and after file. it does not show here. Sara needs absolute path. Otherwise it is relative to fvsetup directory |
@weiyuan-jiang, @saraqzhang : I realized that I was running ldas_setup from a directory that was not called "./bin" but had a longer name. (I just copied the key executables from a build by Matt's system tests.) In my testing, I then keep the rc template files in a directory ../etc/. The "full path" approach assumes that the current dir has a name that is 3 chars long |
I believe the current directory is where fvsetup sits when Sara runs fvsetup. So the relative path would not work. |
So fvsetup isn't run from the install directory? And if it isn't, why do we expect the rc files in [abspath]/etc/? Sara, please point me to a build of the DAS (with the integrated LDAS). |
The absolute path is ldas_setup's path. |
|
@gmao-rreichle @weiyuan-jiang fvsetup runs ldas_setup as : $fvbin/ldas_setup .... $fvbin = /.../GEOSadas/install-SLES15/bin . During fvsetup run "pwd" could be in various different dir, but $fvbin/ldas_setup will guarantee the abs. path for etc/ is $fvbin with /bin replaced by /etc. |
|
I just pushed another commit c3ca2d5 |
I think it should work |
|
@gmao-rreichle @weiyuan-jiang The current version passed setup test ( with dummyexeinp and dummybatinp ) and run exp test. |
|
I will make updates to fvsetup corresponding to the current ldas_setup and test the coupled setup from adas. |
…lly resolved conflict in CHANGELOG.md)
|
@weiyuan-jiang, @saraqzhang : I added one more commit (0f220cb) in an attempt to clean up the logic of processing the default values from the GEOS_SurfaceGridComp.rc file. I did some limited testing but can't promise for sure it's flawless. When you get a chance, please test and/or take a look at the mods. Thanks! PS: I just remembered that we have essentially the same logic in two places:
I suppose we can clean this up by creating a function for processing GEOS_SurfaceGridComp.rc. Maybe we can leave this for the bigger cleanup of ldas_setup. |
Yes. I will clean that up |
Updates ldas_setup for improved integration of land-atm DAS config.
New functionality needed for revisions in GEOS-ESM/GEOSadas#352 (for coupled land-atm experiments).
Successfully 0-diff tested by @gmao-rreichle after 3d9121e
For the record: Spreadsheet with GEOSldas rc variables as discussed after ab9c3c3 (~7-8 May 2025)
LADAS_exeinp_variables_20250508T1113.xlsx
Left for future cleanup of ldas_setup:
ldas_setup -h) when run without any arguments (i.e., justldas_setup, which currently exits with an error)?