Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Auto PR - develop → MAPL-v3 - moving input description to input directory and adding NAS path for input files. #960

Merged
merged 79 commits into from
Jul 10, 2024
Merged

Auto PR - develop → MAPL-v3 - moving input description to input directory and adding NAS path for input files. #960

merged 79 commits into from
Jul 10, 2024

Commits on Sep 26, 2023

  1. preprocessing for routing

    @biljanaorescanin
    biljanaorescanin committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    495f5a2 View commit details
    Browse the repository at this point in the history

  2. update some scripts

    Yujin Zeng committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    562383d View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. improved run.sh

    Yujin Zeng committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    a69c57d View commit details
    Browse the repository at this point in the history

  2. improved code to make all inputs are raw files

    Yujin Zeng authored and Yujin Zeng committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    e29ab36 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @gmao-rreichle
    gmao-rreichle authored Oct 3, 2023
    Configuration menu
    Copy the full SHA
    6979ee4 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. re-write all ncl code to f90 code.

    Yujin Zeng authored and Yujin Zeng committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    ebfef85 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. change mk_runofftbl.F90 to include the feature of moving outlets to o… 

    …cean defined in the ocean model. Now the default adjust_oceanLandSea_mask is set to true.
    Yujin Zeng authored and Yujin Zeng committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    6cdae0b View commit details
    Browse the repository at this point in the history

  2. code fixed for mask_MAPL_2d

    Yujin Zeng authored and Yujin Zeng committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    e84a25e View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. cleaned up the code

    Yujin Zeng authored and Yujin Zeng committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    e56959a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou… 

    …ting_outlets_inBCS
    Yujin Zeng authored and Yujin Zeng committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    b8c88e6 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/feature/yujinz/mk_runofftbl_inBC… 

    …S' into feature/yujinz/Routing_outlets_inBCS
    Yujin Zeng authored and Yujin Zeng committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    07fa4ef View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. change the mk_runofftbl.F90 to make the ocean resolution not hard coded.

    Yujin Zeng authored and Yujin Zeng committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    859e63b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou… 

    …ting_outlets_inBCS
    Yujin Zeng authored and Yujin Zeng committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    cdd6fec View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2023

  1. preprocess cleaned up, only the outlet locations in land are produced

    Yujin Zeng authored and Yujin Zeng committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    ae80fdf View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. readme.txt added

    Yujin Zeng authored and Yujin Zeng committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    ade7eae View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @biljanaorescanin
    biljanaorescanin authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    e55ed62 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Updated readme.txt

    @gmao-rreichle
    gmao-rreichle authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    05fbd70 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. change run.sh to run.py; remove ncdioMod.f90 and rwncMod.f90; remove … 

    …build script
    Yujin Zeng authored and Yujin Zeng committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    f8bfb91 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. change nf_ to nf90_

    Yujin Zeng authored and Yujin Zeng committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    01acd34 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. use netcdf in the baselib of GEOS

    Yujin Zeng committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    66b7add View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature/yujinz/Routing_outlets_i… 

    …nBCS' into feature/yujinz/Routing_outlets_inBCS
    Yujin Zeng committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    330db41 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou… 

    …ting_outlets_inBCS
    Yujin Zeng committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    c4bdc7c View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @biljanaorescanin
    biljanaorescanin authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    e43375f View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. mk_runofftbl can read more general resolution name

    Yujin Zeng authored and Yujin Zeng committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    a77594f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature/yujinz/Routing_outlets_i… 

    …nBCS' into feature/yujinz/Routing_outlets_inBCS
    Yujin Zeng authored and Yujin Zeng committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    b9fd53e View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @biljanaorescanin
    biljanaorescanin authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    f4dfb5d View commit details
    Browse the repository at this point in the history

  2. input path changed to a public directory

    Yujin Zeng committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    07fd402 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. using netcdf in Discover

    Yujin Zeng committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    26d4c94 View commit details
    Browse the repository at this point in the history

  2. mk_runofftbl.F90 now can read MOM5 resolutions as well.

    Yujin Zeng authored and Yujin Zeng committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    41a8a36 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @biljanaorescanin
    biljanaorescanin authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    53e7359 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. build routing bcs executable without installation

    @weiyuan-jiang
    weiyuan-jiang committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    cf6a9d0 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. run.py will not build code, only run exe now.

    Yujin Zeng committed Dec 12, 2023
    8 Configuration menu
    Copy the full SHA
    e009390 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. add NOINSTALL option to routing bc executables

    @weiyuan-jiang
    weiyuan-jiang committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    9fcc82b View commit details
    Browse the repository at this point in the history

  2. simplify running script in build directory

    @weiyuan-jiang
    weiyuan-jiang committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    440a97f View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Readme.txt modified, and rename the run_routing.sh to run_routing_ras… 

    …ter.sh.
    Yujin Zeng committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7c10381 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2023

  1. cleanup of mk_runofftbl.F90: 

    - replaced hardcoded Discover path with MAKE_BCS_INPUT_PATH
- added missing intent() statements
- cleaned up commented out lines
- edited comments
- fixed indentation
- removed redundant "implicit none" statements
    @gmao-rreichle
    gmao-rreichle committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    9108c73 View commit details
    Browse the repository at this point in the history

  2. fixed "executable" permissions (./Raster/preproc/routing/*[f90,txt])

    @gmao-rreichle
    gmao-rreichle committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    882f93c View commit details
    Browse the repository at this point in the history

  3. minor edits (./Raster/preproc/routing/readme.txt)

    @gmao-rreichle
    gmao-rreichle committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    048ec24 View commit details
    Browse the repository at this point in the history

  4. fixed indentation (./Raster/preproc/routing/*.f90)

    @gmao-rreichle
    gmao-rreichle committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    d47592c View commit details
    Browse the repository at this point in the history

  5. a couple of trivial changes (run_routing_raster.py, get_outlets_land.… 

    …f90)
    @gmao-rreichle
    gmao-rreichle committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    21dcbd2 View commit details
    Browse the repository at this point in the history

  6. fixed typo/build error from earlier commit (mk_runofftbl.F90)

    @gmao-rreichle
    gmao-rreichle committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    ba2577f View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Add get_finalID_msk.f90 to let the program read raw input from Discov… 

    …er, avoiding using self-processed data
    Yujin Zeng authored and Yujin Zeng committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    029fa1f View commit details
    Browse the repository at this point in the history

  2. fix a bug in get_landocean_Greenland_real.f90

    Yujin Zeng committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    290e447 View commit details
    Browse the repository at this point in the history

  3. avoiding request of lat_30s.txt and lon_30s.txt from inputs

    Yujin Zeng authored and Yujin Zeng committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    44d2d3b View commit details
    Browse the repository at this point in the history

  4. Input data description was added to readme.txt.

    Yujin Zeng committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    2bb8167 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @biljanaorescanin
    biljanaorescanin authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1a6f663 View commit details
    Browse the repository at this point in the history

  2. removing the dependence on Pfafstetter.rst

    Yujin Zeng authored and Yujin Zeng committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    671b8fd View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou… 

    …ting_outlets_inBCS
    Yujin Zeng authored and Yujin Zeng committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    3a203dc View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @gmao-rreichle
    gmao-rreichle authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    268ed1a View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @gmao-rreichle
    gmao-rreichle authored Mar 24, 2024
    Configuration menu
    Copy the full SHA
    c62f4ae View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. minor cleanup and documentation (routing_constant.f90)

    @gmao-rreichle
    gmao-rreichle committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    2088626 View commit details
    Browse the repository at this point in the history

  2. fixed indentation (get_finalID_msk.f90)

    @gmao-rreichle
    gmao-rreichle committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    3ae8dfd View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Inputs are passed into the program via a command line argument

    Yujin Zeng authored and Yujin Zeng committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3869f51 View commit details
    Browse the repository at this point in the history

  2. fix bug in run_routing_raster.py

    Yujin Zeng authored and Yujin Zeng committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2f9964c View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Adding comments to mk_runofftbl.F90

    Yujin Zeng committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    dd53aa1 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. moving input description to input directory and adding NAS path for i… 

    …nput files.
    Yujin Zeng committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    07856b5 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @gmao-rreichle
    gmao-rreichle authored May 4, 2024
    Configuration menu
    Copy the full SHA
    3f6e2a8 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @gmao-rreichle
    gmao-rreichle authored May 10, 2024
    Configuration menu
    Copy the full SHA
    7380ec3 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Adding note (suggested by Randy Koster) to the code under preproc/rou… 

    …ting to let it be more understandable.
    Yujin Zeng authored and Yujin Zeng committed May 21, 2024
    Configuration menu
    Copy the full SHA
    7dfb381 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. bug fix: remove double-counting of heat corr (StieglitzSnow.F90) 

    In the rare circumstance that more snow would need to be sublimated than is available in the top layer, the residual energy accounting term was added twice, once here and again ~30 lines further down.
    @gmao-rreichle
    gmao-rreichle authored May 31, 2024
    Configuration menu
    Copy the full SHA
    3a040e5 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. re-write get_domain_name() in the mk_runofftbl.F90

    Yujin Zeng committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    cc738ca View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature/yujinz/Routing_outlets_i… 

    …nBCS' into feature/yujinz/Routing_outlets_inBCS
    Yujin Zeng committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    6076b83 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. fix a bug (missing fileT definition) in the get_domain_name() of the … 

    …mk_runofftbl.f90
    Yujin Zeng committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    32822f3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bugfix/rreichle/hcorr_double_counting

    @gmao-rreichle
    gmao-rreichle authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    7c45d84 View commit details
    Browse the repository at this point in the history

  3. changed example grid to "M6TP0072x0036" and rename var file to Gridname

    Yujin Zeng authored and Yujin Zeng committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    cbd311d View commit details
    Browse the repository at this point in the history

  4. fix a small bug

    Yujin Zeng committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    b71f106 View commit details
    Browse the repository at this point in the history

  5. documentation added in mk_runofftble.f90

    Yujin Zeng authored and Yujin Zeng committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    d17d852 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. edited documentation and comments in mk_runofftbl.F90

    @gmao-rreichle
    gmao-rreichle committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    349249f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS

    @gmao-rreichle
    gmao-rreichle authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    76b9bee View commit details
    Browse the repository at this point in the history

  3. cleaned up specification of path to bcs_shared directory (run_routing… 

    …_raster.py)
    @gmao-rreichle
    gmao-rreichle committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    0d8b396 View commit details
    Browse the repository at this point in the history

  4. nx_MAPL=-9999 and ny_MAPL=-9999

    Yujin Zeng committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    d614312 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. version information added in mk_runofftble.f90

    Yujin Zeng authored and Yujin Zeng committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6b1395d View commit details
    Browse the repository at this point in the history

  2. Add documentation for version information in mk_runofftbl.f90 and add… 

    … version arg in make_bcs_latlon.py and make_bcs_cube.py
    Yujin Zeng authored and Yujin Zeng committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    ecda649 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. outlet version definition was moved to rmTinyCatchParaMod.F90

    Yujin Zeng authored and Yujin Zeng committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    303b84f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. fixed bugs, now the correct version information can be read in mk_run… 

    …offtbl.f90
    Yujin Zeng committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    a54f139 View commit details
    Browse the repository at this point in the history

  2. cleaned up and improved documentation of outlet locations version (mk… 

    …_runofftbl.F90, rmTinyCatchParaMod.F90)
    @gmao-rreichle
    gmao-rreichle committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    4be7ffe View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge pull request #827 from GEOS-ESM/feature/yujinz/Routing_outlets_… 

    …inBCS

Routing Outlets in Boundary Conditions
    @sdrabenh
    sdrabenh authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8bfa81a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bugfix/rreichle/hcorr_double_counting

    @sdrabenh
    sdrabenh authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b02a43c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #946 from GEOS-ESM/bugfix/rreichle/hcorr_double_co… 

    …unting

bug fix: remove double-counting of heat corr (StieglitzSnow.F90)
    @sdrabenh
    sdrabenh authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f5fd2a3 View commit details
    Browse the repository at this point in the history