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

Cleaning out deprecated hooks into FATES (ED). #1423

Merged
merged 5 commits into from
Apr 21, 2017
Merged

Cleaning out deprecated hooks into FATES (ED). #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57c8f2e
Added eddi machine files. eddi is a small developer node at LBNL.
rgknox Apr 13, 2017
860bded
Removed the edpft structures and use of the ed allocation vector.
rgknox Apr 14, 2017
978c73b
Cleaned CanopyFluxes for fates content.
rgknox Apr 14, 2017
0dec8c6
Conintued work on removing deprecated ed code from ACME.
rgknox Apr 17, 2017
187fe23
Both fates and non-fates type runs need to calculate the fraction of …
rgknox Apr 18, 2017
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
7 changes: 7 additions & 0 deletions cime/cime_config/acme/machines/config_compilers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,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>
Expand Down
33 changes: 33 additions & 0 deletions cime/cime_config/acme/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2255,6 +2255,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>
Expand Down
6 changes: 1 addition & 5 deletions components/clm/bld/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,11 +654,7 @@ sub write_filepath_cesmbld
"biogeophys/vsfm",
"biogeochem",
"dyn_subgrid",
"ED",
"ED/main",
"ED/biogeophys",
"ED/biogeochem",
"ED/fire",
"ED/main",
"utils",
"cpl" );

Expand Down
632 changes: 0 additions & 632 deletions components/clm/src/ED/biogeochem/EDCanopyStructureMod.F90
View file
Open in desktop

This file was deleted.

962 changes: 0 additions & 962 deletions components/clm/src/ED/biogeochem/EDCohortDynamicsMod.F90
View file
Open in desktop

This file was deleted.

Loading