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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
495f5a2
preprocessing for routing
biljanaorescanin Sep 26, 2023
562383d
update some scripts
Sep 26, 2023
a69c57d
improved run.sh
Oct 3, 2023
e29ab36
improved code to make all inputs are raw files
Oct 3, 2023
6979ee4
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
gmao-rreichle Oct 3, 2023
ebfef85
re-write all ncl code to f90 code.
Oct 6, 2023
6cdae0b
change mk_runofftbl.F90 to include the feature of moving outlets to o…
Oct 12, 2023
e84a25e
code fixed for mask_MAPL_2d
Oct 12, 2023
e56959a
cleaned up the code
Oct 13, 2023
b8c88e6
Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou…
Oct 13, 2023
07fa4ef
Merge remote-tracking branch 'origin/feature/yujinz/mk_runofftbl_inBC…
Oct 13, 2023
859e63b
change the mk_runofftbl.F90 to make the ocean resolution not hard coded.
Nov 3, 2023
cdd6fec
Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou…
Nov 3, 2023
ae80fdf
preprocess cleaned up, only the outlet locations in land are produced
Nov 4, 2023
ade7eae
readme.txt added
Nov 8, 2023
e55ed62
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
biljanaorescanin Nov 13, 2023
05fbd70
Updated readme.txt
gmao-rreichle Nov 14, 2023
f8bfb91
change run.sh to run.py; remove ncdioMod.f90 and rwncMod.f90; remove …
Nov 20, 2023
01acd34
change nf_ to nf90_
Nov 21, 2023
66b7add
use netcdf in the baselib of GEOS
Nov 22, 2023
330db41
Merge remote-tracking branch 'origin/feature/yujinz/Routing_outlets_i…
Nov 22, 2023
c4bdc7c
Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou…
Nov 22, 2023
e43375f
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
biljanaorescanin Nov 30, 2023
a77594f
mk_runofftbl can read more general resolution name
Dec 3, 2023
b9fd53e
Merge remote-tracking branch 'origin/feature/yujinz/Routing_outlets_i…
Dec 3, 2023
f4dfb5d
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
biljanaorescanin Dec 5, 2023
07fd402
input path changed to a public directory
Dec 5, 2023
26d4c94
using netcdf in Discover
Dec 6, 2023
41a8a36
mk_runofftbl.F90 now can read MOM5 resolutions as well.
Dec 6, 2023
53e7359
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
biljanaorescanin Dec 8, 2023
cf6a9d0
build routing bcs executable without installation
weiyuan-jiang Dec 11, 2023
e009390
run.py will not build code, only run exe now.
Dec 12, 2023
9fcc82b
add NOINSTALL option to routing bc executables
weiyuan-jiang Dec 13, 2023
440a97f
simplify running script in build directory
weiyuan-jiang Dec 13, 2023
7c10381
Readme.txt modified, and rename the run_routing.sh to run_routing_ras…
Dec 14, 2023
9108c73
cleanup of mk_runofftbl.F90:
gmao-rreichle Dec 16, 2023
882f93c
fixed "executable" permissions (./Raster/preproc/routing/*[f90,txt])
gmao-rreichle Dec 16, 2023
048ec24
minor edits (./Raster/preproc/routing/readme.txt)
gmao-rreichle Dec 16, 2023
d47592c
fixed indentation (./Raster/preproc/routing/*.f90)
gmao-rreichle Dec 16, 2023
21dcbd2
a couple of trivial changes (run_routing_raster.py, get_outlets_land.…
gmao-rreichle Dec 16, 2023
ba2577f
fixed typo/build error from earlier commit (mk_runofftbl.F90)
gmao-rreichle Dec 16, 2023
029fa1f
Add get_finalID_msk.f90 to let the program read raw input from Discov…
Jan 23, 2024
290e447
fix a bug in get_landocean_Greenland_real.f90
Jan 23, 2024
44d2d3b
avoiding request of lat_30s.txt and lon_30s.txt from inputs
Jan 23, 2024
2bb8167
Input data description was added to readme.txt.
Jan 23, 2024
1a6f663
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
biljanaorescanin Jan 24, 2024
671b8fd
removing the dependence on Pfafstetter.rst
Jan 24, 2024
3a203dc
Merge remote-tracking branch 'origin/develop' into feature/yujinz/Rou…
Feb 5, 2024
268ed1a
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
gmao-rreichle Mar 8, 2024
c62f4ae
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
gmao-rreichle Mar 24, 2024
2088626
minor cleanup and documentation (routing_constant.f90)
gmao-rreichle Mar 27, 2024
3ae8dfd
fixed indentation (get_finalID_msk.f90)
gmao-rreichle Mar 27, 2024
3869f51
Inputs are passed into the program via a command line argument
Apr 11, 2024
2f9964c
fix bug in run_routing_raster.py
Apr 11, 2024
dd53aa1
Adding comments to mk_runofftbl.F90
Apr 18, 2024
07856b5
moving input description to input directory and adding NAS path for i…
Apr 26, 2024
3f6e2a8
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
gmao-rreichle May 4, 2024
7380ec3
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
gmao-rreichle May 10, 2024
7dfb381
Adding note (suggested by Randy Koster) to the code under preproc/rou…
May 21, 2024
3a040e5
bug fix: remove double-counting of heat corr (StieglitzSnow.F90)
gmao-rreichle May 31, 2024
cc738ca
re-write get_domain_name() in the mk_runofftbl.F90
Jun 16, 2024
6076b83
Merge remote-tracking branch 'origin/feature/yujinz/Routing_outlets_i…
Jun 16, 2024
32822f3
fix a bug (missing fileT definition) in the get_domain_name() of the …
Jun 17, 2024
7c45d84
Merge branch 'develop' into bugfix/rreichle/hcorr_double_counting
gmao-rreichle Jun 17, 2024
cbd311d
changed example grid to "M6TP0072x0036" and rename var file to Gridname
Jun 17, 2024
b71f106
fix a small bug
Jun 17, 2024
d17d852
documentation added in mk_runofftble.f90
Jun 17, 2024
349249f
edited documentation and comments in mk_runofftbl.F90
gmao-rreichle Jun 18, 2024
76b9bee
Merge branch 'develop' into feature/yujinz/Routing_outlets_inBCS
gmao-rreichle Jun 18, 2024
0d8b396
cleaned up specification of path to bcs_shared directory (run_routing…
gmao-rreichle Jun 18, 2024
d614312
nx_MAPL=-9999 and ny_MAPL=-9999
Jun 18, 2024
6b1395d
version information added in mk_runofftble.f90
Jun 21, 2024
ecda649
Add documentation for version information in mk_runofftbl.f90 and add…
Jun 21, 2024
303b84f
outlet version definition was moved to rmTinyCatchParaMod.F90
Jul 2, 2024
a54f139
fixed bugs, now the correct version information can be read in mk_run…
Jul 3, 2024
4be7ffe
cleaned up and improved documentation of outlet locations version (mk…
gmao-rreichle Jul 3, 2024
8bfa81a
Merge pull request #827 from GEOS-ESM/feature/yujinz/Routing_outlets_…
sdrabenh Jul 10, 2024
b02a43c
Merge branch 'develop' into bugfix/rreichle/hcorr_double_counting
sdrabenh Jul 10, 2024
f5fd2a3
Merge pull request #946 from GEOS-ESM/bugfix/rreichle/hcorr_double_co…
sdrabenh Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ subroutine StieglitzSnow_snowrt(tile_lon, tile_lat, &
if(-dw > wesn(1) ) then
dw = -wesn(1)
evap = -dw/(dts*areasc)
hcorr=hcorr+(lhflux-evap*alhv)*areasc
!hcorr=hcorr+(lhflux-evap*alhv)*areasc ! removed, was double-counting corr, see "Store excess heat in hcorr" below; koster+reichle, 31 May 2024
lhflux=evap*alhv
endif
wesn(1) = wesn(1) + dw
Expand Down
2 changes: 1 addition & 1 deletion ..._GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
/bin/mv rst/Pfafstetter-M.rst rst/Pfafstetter.rst
bin/CombineRasters.x -f 0 -t {NT} {OCEAN_VERSION}{DATENAME}{IMO}x{POLENAME}{JMO} Pfafstetter >/dev/null
bin/CombineRasters.x -t {NT} CF{NC}x6C{SGNAME} {OCEAN_VERSION}{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter
bin/mk_runofftbl.x CF{NC}x6C{SGNAME}_{OCEAN_VERSION}{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter
bin/mk_runofftbl.x -g CF{NC}x6C{SGNAME}_{OCEAN_VERSION}{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter -v {lbcsv}
setenv OMP_NUM_THREADS 1
if ({SKIPLAND} != True) bin/mkCatchParam.x -x {NX} -y {NY} -g CF{NC}x6C{SGNAME}_{OCEAN_VERSION}{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter -v {lbcsv}
endif
Expand Down
2 changes: 1 addition & 1 deletion ...ridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_latlon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
/bin/mv rst/Pfafstetter-M.rst rst/Pfafstetter.rst
bin/CombineRasters.x -f 0 -t {NT} {DATENAME}{IMO}x{POLENAME}{JMO} Pfafstetter >/dev/null
bin/CombineRasters.x -t {NT} DC{IM}xPC{JM} {DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter
bin/mk_runofftbl.x DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter
bin/mk_runofftbl.x -g DC{IM}xPC{JM}_{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter -v {lbcsv}
setenv OMP_NUM_THREADS 1
if ( {SKIPLAND} != True ) bin/mkCatchParam.x -x {NX} -y {NY} -g DE{IMO}xPE{JMO}_DE{IMO}xPE{JMO}-Pfafstetter -v {lbcsv}
setenv OMP_NUM_THREADS {NCPUS}
Expand Down
Loading
Loading