Merge remote-tracking branch 'rgknox:rgknox/ACME/rgknox-ed-springclea…

…ning' (PR #1423)

In this change-set, like the title implies, the old and obsolete ED code was removed.
Likewise, the various interface connection points were also cleaned.

[BFB]

config/acme/machines/config_compilers.xml

@@ -1290,6 +1290,13 @@ lude </CFLAGS>
         <ADD_SLIBS>-L/soft/netcdf/fortran-4.4-intel-sp1-update3-parallel/lib -lnetcdff -L/soft/hdf5/hdf5-1.8.13-intel-2013-sp1-update3-impi-5.0.0.028/lib -openmp -fPIC -lnetcdf -lnetcdf -L/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -lpthread -lm </ADD_SLIBS>
 </compiler>
 
+<compiler COMPILER="gnu" MACH="eddi">
+  <ADD_GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY -DHAVE_BACKTRACE </ADD_GPTL_CPPDEFS>
+  <ADD_SLIBS> -L$(NETCDF_HOME)/lib/ -lnetcdff -lnetcdf -lcurl -llapack -lblas </ADD_SLIBS>
+  <NETCDF_PATH>$(NETCDF_HOME)</NETCDF_PATH>
+</compiler>
+
+
 <compiler COMPILER="gnu">
 	<ADD_CFLAGS MODEL="csm_share"> -std=c99 </ADD_CFLAGS>
 </compiler>

config/acme/machines/config_machines.xml

@@ -2289,6 +2289,39 @@
      </module_system>
 </machine>
 
+<machine MACH="eddi">
+  <DESC>small developer workhorse at lbl climate sciences</DESC>
+  <OS>LINUX</OS>
+  <COMPILERS>gnu</COMPILERS>
+  <MPILIBS>openmpi,mpi-serial</MPILIBS>
+  <PROJECT>ngeet</PROJECT>
+  <CIME_OUTPUT_ROOT>/home/lbleco/acme/</CIME_OUTPUT_ROOT>
+  <DIN_LOC_ROOT>/home/lbleco/cesm/cesm_input_datasets/</DIN_LOC_ROOT>
+  <DIN_LOC_ROOT_CLMFORC>/home/lbleco/cesm/cesm_input_datasets/atm/datm7/</DIN_LOC_ROOT_CLMFORC>
+  <DOUT_S_ROOT>/home/lbleco/acme/cesm_archive/$CASE</DOUT_S_ROOT>
+  <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
+  <BASELINE_ROOT>/home/lbleco/acme/cesm_baselines</BASELINE_ROOT>
+  <CCSM_CPRNC>/home/lbleco/cesm/cesm_tools/cprnc/cprnc</CCSM_CPRNC>
+  <GMAKE_J>1</GMAKE_J>
+  <BATCH_SYSTEM>none</BATCH_SYSTEM>
+  <SUPPORTED_BY>rgknox at lbl gov</SUPPORTED_BY>
+  <MAX_TASKS_PER_NODE>4</MAX_TASKS_PER_NODE>
+  <PES_PER_NODE>4</PES_PER_NODE>
+  <PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
+  <mpirun mpilib="mpi-serial">
+    <executable></executable>
+  </mpirun>
+  <mpirun mpilib="default">
+    <executable>mpirun</executable>
+    <arguments>
+      <arg name="num_tasks">-np $TOTALPES</arg>
+      <arg name="tasks_per_node"> -npernode $PES_PER_NODE</arg>
+    </arguments>
+  </mpirun>
+  <module_system type="none"/>
+</machine>
+
+
 <default_run_suffix>
   <default_run_exe>${EXEROOT}/acme.exe </default_run_exe>
   <default_run_misc_suffix> >> acme.log.$LID 2>&amp;1 </default_run_misc_suffix>