Big Reoganization: Old projects in NonCompile

   Stuff that we don't currently use a lot will now go in NonCompile
   You can copy the files to Main and it will work. Currenly sorting
   out the non-compile of stuff for those projects.

Author: SAnsell

CMake.pl

@@ -100,7 +100,8 @@ sub findSubSrcDir
   foreach my $dname (@DPts)
     {
       if ($dname=~/$topDirName\/(.*)\// &&
-	  $dname!~/\/Main\//)
+	  $dname!~/\/Main\// &&
+	  $dname!~/NonCompile/)
         {
 	  my $flag=0;
 	  foreach my $exclude (@EXCL)

CMakeList.pm

@@ -0,0 +1,26 @@
+## Simple stuff for CMake
+
+
+sub getAllMain()
+ ##
+ ## Find the main files
+ ##
+{
+  my $self=shift;
+
+  my $cppMain=`ls ./Main/*.cxx 2> /dev/null`;
+  my @files=split /\s+/,$cppMain;
+  my @Out;
+  foreach my $item (@files)
+  {
+      if ($item=~/Main\/(\S+)\.cxx/)
+      {
+	  push(@Out,$1);
+      }
+  }
+  return @Out;
+}
+
+  
+ 
+1;

CMakeSupport.pm

@@ -77,7 +77,6 @@
 #include "defaultConfig.h"
 #include "DefUnitsESS.h"
 #include "ImportControl.h"
-#include "World.h"
 #include "makeESS.h"
 
 
@@ -123,7 +122,6 @@ main(int argc,char* argv[])
       mainSystem::setMaterialsDataBase(IParam);
 
       essSystem::makeESS ESSObj;
-      World::createOuterObjects(*SimPtr);
       ESSObj.build(*SimPtr,IParam);
 
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);

Main/combLayer.cxx

@@ -3,7 +3,7 @@
  
  * File:   Main/fullBuild.cxx
  *
- * Copyright (c) 2004-2017 by Stuart Ansell
+ * Copyright (c) 2004-2020 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +77,6 @@
 #include "makeTS2.h"
 #include "chipDataStore.h"
 #include "mainJobs.h"
-#include "World.h"
 #include "Volumes.h"
 
 #include "MemStack.h"
@@ -131,7 +130,6 @@ main(int argc,char* argv[])
 	    setVFlag(IParam.getValue<int>("memStack"));
 	}
 
-      World::createOuterObjects(*SimPtr);
       moderatorSystem::makeTS2 TS2Obj;
       TS2Obj.build(SimPtr,IParam);
 

Main/ess.cxx

@@ -3,7 +3,7 @@
  
  * File:   Main/reactor.cxx
  *
- * Copyright (c) 2004-2018 by Stuart Ansell
+ * Copyright (c) 2004-2020 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -115,7 +115,6 @@ main(int argc,char* argv[])
       mainSystem::setMaterialsDataBase(IParam);
 
       delftSystem::makeDelft RObj;
-      World::createOuterObjects(*SimPtr);
       RObj.build(*SimPtr,IParam);
 
       //      RObj.setSource(*SimPtr,IParam);

Main/fullBuild.cxx

@@ -122,7 +122,6 @@ main(int argc,char* argv[])
 
 
       ts1System::makeT1Real T1Obj;
-      World::createOuterObjects(*SimPtr);
       T1Obj.build(*SimPtr,IParam);
 
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);

Main/reactor.cxx

@@ -3,7 +3,7 @@
  
  * File:   Main/bilbau.cxx
  *
- * Copyright (c) 2004-2018 by Stuart Ansell
+ * Copyright (c) 2004-2020 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -116,7 +116,6 @@ main(int argc,char* argv[])
 
 
       bibSystem::makeBib BibObj;
-      World::createOuterObjects(*SimPtr);
       BibObj.build(*SimPtr,IParam);
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);
 

Main/t1Real.cxx

@@ -148,7 +148,6 @@ main(int argc,char* argv[])
 	  SimPtr->resetAll();
 
 	  d4cSystem::makeD4C dObj; 
-	  World::createOuterObjects(*SimPtr);
 	  dObj.build(SimPtr,IParam);
 
 	  SDef::sourceSelection(*SimPtr,IParam);

Main/bilbau.cxx NonCompiledProjects/bilbau.cxx

@@ -3,7 +3,7 @@
  
  * File:   Main/lens.cxx
  *
- * Copyright (c) 2004-2016 by Stuart Ansell
+ * Copyright (c) 2004-2020 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -80,7 +80,6 @@
 #include "LensSource.h"
 #include "FlightLine.h"
 #include "FlightCluster.h"
-#include "World.h"
 #include "LensTally.h"
 #include "makeLens.h"
 
@@ -135,7 +134,6 @@ main(int argc,char* argv[])
 
 
       lensSystem::makeLens lensObj;
-      World::createOuterObjects(*SimPtr);
       lensObj.build(SimPtr);
 
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);

Main/bnct.cxx NonCompiledProjects/bnct.cxx

@@ -76,7 +76,6 @@
 #include "defaultConfig.h"
 #include "DefUnitsESS.h"
 #include "ImportControl.h"
-#include "World.h"
 
 #include "makeLinac.h"
 
@@ -123,7 +122,6 @@ main(int argc,char* argv[])
       SimPtr->setMCNPversion(IParam.getValue<int>("mcnp"));
 
       essSystem::makeLinac linacObj;
-      World::createOuterObjects(*SimPtr);
       linacObj.build(*SimPtr,IParam);
 
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);

Main/cuBuild.cxx NonCompiledProjects/cuBuild.cxx

@@ -141,7 +141,6 @@ main(int argc,char* argv[])
 	  SimPtr->resetAll();
 
 	  photonSystem::makePhoton LObj;
-	  World::createOuterObjects(*SimPtr);
 	  LObj.build(SimPtr,IParam);
 
 	  SimPtr->removeComplements();

Main/d4c.cxx NonCompiledProjects/d4c.cxx

@@ -50,7 +50,6 @@
 #include "Matrix.h"
 #include "Vec3D.h"
 #include "inputParam.h"
-#include "Transform.h"
 #include "Quaternion.h"
 #include "Surface.h"
 #include "Quadratic.h"
@@ -76,7 +75,6 @@
 #include "DefPhysics.h"
 #include "variableSetup.h"
 #include "ImportControl.h"
-#include "World.h"
 #include "SimInput.h"
 
 #include "makePhoton2.h"
@@ -120,7 +118,6 @@ main(int argc,char* argv[])
       mainSystem::setMaterialsDataBase(IParam);
 
       photonSystem::makePhoton2 LObj;
-      World::createOuterObjects(*SimPtr);
       LObj.build(*SimPtr,IParam);
 
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);

Main/epb.cxx NonCompiledProjects/epb.cxx

@@ -120,7 +120,6 @@ main(int argc,char* argv[])
       mainSystem::setMaterialsDataBase(IParam);
 
       photonSystem::makePhoton3 LObj;
-      World::createOuterObjects(*SimPtr);
       LObj.build(*SimPtr,IParam);
 
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);

Main/example.cxx NonCompiledProjects/example.cxx

@@ -3,7 +3,7 @@
  
  * File:   Main/saxs.cxx
  *
- * Copyright (c) 2004-2019 by Stuart Ansell
+ * Copyright (c) 2004-2020 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,7 +76,6 @@
 #include "DefPhysics.h"
 #include "variableSetup.h"
 #include "ImportControl.h"
-#include "World.h"
 #include "SimInput.h"
 #include "particle.h"
 #include "photon.h"
@@ -129,7 +128,6 @@ main(int argc,char* argv[])
       mainSystem::setMaterialsDataBase(IParam);
 
       saxsSystem::makeSAXS dObj; 
-      World::createOuterObjects(*SimPtr);
       dObj.build(*SimPtr,IParam);
 
       mainSystem::buildFullSimulation(SimPtr,IParam,Oname);