tweaks for build/run on gaea (#254)

* tweaks for build/run on gaea * fixed path * Updates for PR
ufs-community · May 18, 2022 · bc4efbf · bc4efbf
1 parent f0614ab
commit bc4efbf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/etc/lmod-setup.csh b/etc/lmod-setup.csh
@@ -20,7 +20,7 @@ else if ( "$L_MACHINE" == singularity ) then
    module purge
 
 else if ( "$L_MACHINE" == gaea ) then
-   set ENV="/lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/init/init_lmod.csh"
+   set ENV="/lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/lmod/lmod/init/csh"
    source $ENV
 
 else if ( "$L_MACHINE" == odin ) then

diff --git a/etc/lmod-setup.sh b/etc/lmod-setup.sh
@@ -20,8 +20,9 @@ elif [ "$L_MACHINE" = singularity ]; then
    module purge
 
 elif [ "$L_MACHINE" = gaea ]; then
-   export BASH_ENV="/lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/init/init_lmod.sh"
+   export BASH_ENV="/lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/lmod/lmod/init/bash"
    source $BASH_ENV
+   module purge
 
 elif [ "$L_MACHINE" = odin ]; then
    module unload modules

diff --git a/modulefiles/wflow_gaea b/modulefiles/wflow_gaea
@@ -12,4 +12,7 @@ module load rocoto
 module load miniconda3
 
 setenv CONDA_DEFAULT_ENV "regional_workflow"
-
+setenv PROJ_LIB /lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/regional_workflow/share/proj
+#if { [module-info mode load] } {
+#   system "conda activate regional_workflow;"
+#}