Changeset 9775 for issm/trunk/src/c/Container/DataSet.cpp

Timestamp:

09/12/11 12:42:33 (14 years ago)

Author:

Eric.Larour

Message:

Reduced compilation to the maximum when adic flag is on, so that we do not have to forward differentiate the whole code.
Added 3D, Rifts, Transient, Prognostic, Steadystate conditional compilation.
Added eraselinks in src/ad/ directory to get rid of symlinks.
From mods in ad/Makefile.am, applied to c/Makefile.am -> better compilation.

File:

• issm/trunk/src/c/Container/DataSet.cpp (modified) (6 diffs)

issm/trunk/src/c/Container/DataSet.cpp

@@ -229 +229 @@
                                 dataset->AddObject(triavertexinput);}
                                 break;
+                        #ifdef _HAVE_THREED_
                         case PentaVertexInputEnum:{
                                 PentaVertexInput* pentavertexinput=NULL;
@@ -235 +236 @@
                                 dataset->AddObject(pentavertexinput);}
                                 break;
+                        #endif
                         case TransientInputEnum:{
                                 TransientInput* transientinput=NULL;
@@ -261 +263 @@
                                 dataset->AddObject(triavertexelementresult);}
                                 break;
+                         #ifdef _HAVE_THREED_
                         case PentaVertexElementResultEnum:{
                                 PentaVertexElementResult* pentavertexelementresult=NULL;
@@ -273 +276 @@
                                 dataset->AddObject(penta);}
                                 break;
+                        #endif
                         case MaticeEnum:{
                                 Matice* matice=NULL;
@@ -327 +331 @@
                                 dataset->AddObject(numericalflux);}
                                 break;
+                        #ifdef _HAVE_RIFTS_
                         case RiftfrontEnum:{
                                 Riftfront* riftfront=NULL;
@@ -333 +338 @@
                                 dataset->AddObject(riftfront);}
                                 break;
+                        #endif
                         case DoubleInputEnum:{
                                 DoubleInput* doubleinput=NULL;