Skip to content

Commit

Permalink
added back the cycamore archetypes
Browse files Browse the repository at this point in the history
  • Loading branch information
jbae11 committed Feb 10, 2018
1 parent e125c05 commit 8acb36f
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 151 deletions.
22 changes: 21 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,27 @@ CONFIGURE_FILE(recycle_version.h.in "${CMAKE_CURRENT_SOURCE_DIR}/recycle_version

SET(CYCLUS_CUSTOM_HEADERS "recycle_version.h")

USE_CYCLUS("recycle" "corrm")
USE_CYCLUS("recycle" "reactor")

USE_CYCLUS("recycle" "fuel_fab")

USE_CYCLUS("recycle" "mixer")

USE_CYCLUS("recycle" "enrichment")

USE_CYCLUS("recycle" "separations")

USE_CYCLUS("recycle" "sink")

USE_CYCLUS("recycle" "source")

USE_CYCLUS("recycle" "deploy_inst")

USE_CYCLUS("recycle" "manager_inst")

USE_CYCLUS("recycle" "growth_region")

USE_CYCLUS("recycle" "storage")

INSTALL_CYCLUS_MODULE("recycle" "" "NONE")

Expand Down
33 changes: 0 additions & 33 deletions src/corrm.cc

This file was deleted.

46 changes: 0 additions & 46 deletions src/corrm.h

This file was deleted.

65 changes: 0 additions & 65 deletions src/corrm_tests.cc

This file was deleted.

20 changes: 15 additions & 5 deletions src/recycle.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
#ifndef RECYCLE_SRC_RECYCLE_H_
#define RECYCLE_SRC_RECYCLE_H_

// These includes must come before others.
#include "cyclus.h"
#include "recycle_version.h"

#include "corrm.h"

#if CYCLUS_HAS_COIN
#include "batch_reactor.h"
#include "batch_reactor_tests.h"
#include "deploy_inst.h"
#include "enrichment.h"
#include "enrichment_tests.h"
#include "growth_region.h"
#include "growth_region_tests.h"
#include "inpro_reactor.h"
#include "inpro_reactor_tests.h"
#include "manager_inst.h"
#include "manager_inst_tests.h"
#include "sink.h"
#include "sink_tests.h"
#include "source.h"
#include "source_tests.h"

#endif // RECYCLE_SRC_RECYCLE_H_
2 changes: 1 addition & 1 deletion src/recycle_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#define RECYCLE_VERSION_MAJOR 0
#define RECYCLE_VERSION_MINOR 0
#define RECYCLE_VERSION_MICRO 1
#define RECYCLE_VERSION "0.0.0-3-g11dd120"
#define RECYCLE_VERSION "0.0.0-5-g64dcbb2"

#endif // RECYCLE_SRC_VERSION_H_

0 comments on commit 8acb36f

Please sign in to comment.