Skip to content

Commit

Permalink
machine files for eddiB
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'ryan/rgknox-cime-eddimachine'

Summary: This PR contains the addition of machine configuration files
for eddi, a GNU/Linux system. Eddi does not have a batch system, no
batch directives were applied. Eddi is a workstation and is only
intended for single site and small grids. Eddi is used by a limited
number of researchers on the NGEET project who understand its usage
and limited support.

Fixes: None

User interface changes?: new MACH=eddi configuration case

Code review: knox

Test suite: ed - lawrencium-lr3-intel; ed - yellowstone intel, pgi, gnu
Test baseline: 534d152
Test namelist changes: None
Test answer changes: None

Test summary: All lrc-intel expected PASS were passes. yellowstone
passed except for expected failures in #14, #43.
  • Loading branch information
bandre-ucar committed Mar 28, 2016
2 parents 534d152 + 95f8cb1 commit 5d12066
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 0 deletions.
10 changes: 10 additions & 0 deletions cime/machines/config_batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
<directive name=""></directive>
</directives>
</batch_system>

<batch_system type="eddi" version="x.y">
<batch_query args=""></batch_query>
<batch_submit></batch_submit>
<batch_redirect></batch_redirect>
<batch_directive></batch_directive>
<directives>
<directive name=""></directive>
</directives>
</batch_system>

<batch_system MACH="wolf" version="x.y">
<batch_directive>#MSUB</batch_directive>
Expand Down
9 changes: 9 additions & 0 deletions cime/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,15 @@ for mct, etc.
<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
</compiler>

<compiler COMPILER="gnu" MACH="eddi">
<NETCDF_PATH>$(NETCDF_HOME)</NETCDF_PATH>
<ADD_CPPDEFS> -DLinux -DCPRGNU </ADD_CPPDEFS>
<ADD_SLIBS> -L${NETCDF_PATH}/lib/ -lnetcdff -lnetcdf -lcurl -llapack -lblas</ADD_SLIBS>
<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
<ESMF_LIBDIR></ESMF_LIBDIR>
</compiler>


<compiler COMPILER="gnu" MACH="yellowstone">
<LAPACK_LIBDIR> /glade/apps/opt/lib </LAPACK_LIBDIR>
<PIO_TYPENAME>netcdf</PIO_TYPENAME>
Expand Down
31 changes: 31 additions & 0 deletions cime/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,37 @@
<MAX_TASKS_PER_NODE>USERDEFINED_required_build</MAX_TASKS_PER_NODE>
</machine>

<machine MACH="eddi">
<DESC>eddi linux PC</DESC>
<OS>LINUX</OS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>mpi-serial</MPILIBS>
<CESMSCRATCHROOT>/home/lbleco/clmed</CESMSCRATCHROOT>
<RUNDIR>$CESMSCRATCHROOT/$CASE/run</RUNDIR>
<EXEROOT>$CESMSCRATCHROOT/$CASE/bld</EXEROOT>
<DIN_LOC_ROOT>$CESMSCRATCHROOT/cesm_input_datasets/</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>$DIN_LOC_ROOT/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>$CESMSCRATCHROOT/cesm_archive/$CASE</DOUT_S_ROOT>
<DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
<CCSM_BASELINE>$CESMSCRATCHROOT/cesm_baselines</CCSM_BASELINE>
<CCSM_CPRNC>$CESMSCRATCHROOT/cesm_tools/cprnc/cprnc</CCSM_CPRNC>
<BATCHQUERY>USERDEFINED_optional_run</BATCHQUERY>
<BATCHSUBMIT>USERDEFINED_optional_run</BATCHSUBMIT>
<BATCHREDIRECT></BATCHREDIRECT>
<SUPPORTED_BY>rgknox-that-weird-a-with-circle-dot-lbl-dot-guvment</SUPPORTED_BY>
<GMAKE_J>1</GMAKE_J>
<MAX_TASKS_PER_NODE>4</MAX_TASKS_PER_NODE>
<batch_system type="none" version="x.y"></batch_system>
<mpirun mpilib="mpi-serial">
<executable>mpirun</executable>
<arguments>
<arg name="num_tasks">-np {{ num_tasks }}</arg>
<arg name="tasks_per_node"> -npernode {{ tasks_per_node }}</arg>
</arguments>
</mpirun>
</machine>


<machine MACH="wolf">
<DESC>LANL Linux Cluster, 16 pes/node, batch system Moab</DESC>
<NODENAME_REGEX>wolf</NODENAME_REGEX>
Expand Down
29 changes: 29 additions & 0 deletions cime/machines/env_mach_specific.eddi
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#! /bin/csh -f

# -------------------------------------------------------------------------
# eddi.lbl.gov
# eddi is a linux PC workstation that does not use module environments
# -------------------------------------------------------------------------

set CESM_REPO = `./xmlquery CCSM_REPOTAG -value`

if($status == 0) then
set COMPILER = `./xmlquery COMPILER -value`
set MPILIB = `./xmlquery MPILIB -value`
set DEBUG = `./xmlquery DEBUG -value`
set OS = `./xmlquery OS -value`
set PROJECT = `./xmlquery PROJECT -value`
else
echo $0 using settings from environment:
endif

echo "COMPILER=$COMPILER"
echo "MPILIB=$MPILIB"
echo "DEBUG=$DEBUG"
echo "OS=$OS"
echo "PROJECT=$PROJECT"

#limit coredumpsize unlimited
if ( $?PERL ) then
printenv
endif

0 comments on commit 5d12066

Please sign in to comment.