Log In | Get Help   
Home My Page Projects Code Snippets Project Openings Mareframe
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files
[mareframe] Diff of /trunk/gadget/ecosystem.h
[mareframe] / trunk / gadget / ecosystem.h Repository:
ViewVC logotype

Diff of /trunk/gadget/ecosystem.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 12, Fri Jul 24 18:36:24 2015 UTC revision 20, Fri Apr 7 09:20:55 2017 UTC
# Line 39  Line 39 
39     */     */
40    Ecosystem(const MainInfo& main);    Ecosystem(const MainInfo& main);
41    /**    /**
42       * \brief This is the Ecosystem constructor specifying details about the model
43       * \param main is the MainInfo specifying the command line options for the model run
44       */
45      Ecosystem(const Ecosystem& ecosystem);
46      /**
47     * \brief This is the default Ecosystem destructor     * \brief This is the default Ecosystem destructor
48     */     */
49    ~Ecosystem();    ~Ecosystem();
# Line 124  Line 129 
129     * \param Stochastic is the StochasticData containing the new values of the parameters     * \param Stochastic is the StochasticData containing the new values of the parameters
130     */     */
131    void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };    void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };
132  #ifndef NO_OPENMP  #ifdef _OPENMP
133    /**    /**
134     * \brief This function will update the store values of the parameters of the Ecosystems used with OpenMP     * \brief This function will update the store values of the parameters of the Ecosystems used with OpenMP
135     * \param v is the DoubleVector that store the values of the parameters of the main Ecosystem     * \param v is the DoubleVector that store the values of the parameters of the main Ecosystem
# Line 272  Line 277 
277    /**    /**
278     * \brief This is the flag used to denote whether the user has interrupted the current model run     * \brief This is the flag used to denote whether the user has interrupted the current model run
279     */     */
280    volatile int interrupted;    //volatile int interrupted;
281  protected:  protected:
282    /**    /**
283     * \brief This is the value of the likelihood score for the current simulation     * \brief This is the value of the likelihood score for the current simulation
# Line 349  Line 354 
354     * \note This vector is only used to temporarily store values during an optimising run     * \note This vector is only used to temporarily store values during an optimising run
355     */     */
356    IntVector optflag;    IntVector optflag;
357    #ifdef _OPENMP
358      /**
359     * \brief This empty char is used for the purpose of avoiding false sharing between the EcoSystems.
360     */
361      char filling[128];
362     /**
363     * \brief Type of selected parallel optimization
364     */
365      const int static SPECULATIVE=1;
366      const int static REPRODUCIBLE=2;
367      int runParallel;
368    #endif
369  };  };
370    
371  #endif  #endif
Legend:
Removed from v.12  
changed lines
  Added in v.20
root@forge.cesga.es
 ViewVC Help
Powered by ViewVC 1.0.0  

Powered By FusionForge