Skip to content

[DSL] Enable DSL code in SCM & GCM by using USE_DSL #826

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

Merged
sdrabenh merged 4 commits into from
May 6, 2026
Merged

[DSL] Enable DSL code in SCM & GCM by using USE_DSL #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3a5ef3
Setup `PYTHONPATH` for `scm_run` and `gcm_run`
FlorianDeconinck Mar 19, 2026
6a9b5b3
Remove need for custom `pyMoist` path - everything rolled into the de…
FlorianDeconinck Mar 25, 2026
0225e81
Merge branch 'develop' into feature/dsl/enable_DSL_with_USE_DSL_ev
sdrabenh Apr 15, 2026
2bf98e5
Merge branch 'develop' into feature/dsl/enable_DSL_with_USE_DSL_ev
sdrabenh Apr 16, 2026
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
12 changes: 12 additions & 0 deletions gcm_run.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,18 @@ setenv HOMDIR @HOMDIR
setenv RSTDATE @RSTDATE
setenv GCMEMIP @GCMEMIP

#######################################################################
# DSL configuration
#######################################################################

if ( $?USE_DSL ) then
if ( $?PYTHONPATH ) then
setenv PYTHONPATH ${PYTHONPATH}:${GEOSDIR}/lib/Python/
else
setenv PYTHONPATH ${GEOSDIR}/lib/Python/
endif
endif

#######################################################################
# Create Experiment Sub-Directories
#######################################################################
Expand Down
9 changes: 9 additions & 0 deletions scm_run.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ setenv GEOSUTIL @INSTALLDIR

source $GEOSBIN/g5_modules

if ( $?USE_DSL ) then
if ( $?PYTHONPATH ) then
setenv PYTHONPATH ${PYTHONPATH}:${GEOSDIR}/lib/Python/
else
setenv PYTHONPATH ${GEOSDIR}/lib/Python/
endif
endif


# We only prepend to DY/LD_LIBRARY_PATH if it exists
if ( $?@LD_LIBRARY_PATH_CMD ) then
setenv @LD_LIBRARY_PATH_CMD "${@LD_LIBRARY_PATH_CMD}:${GEOSDIR}/lib"
Expand Down
Loading