Skip to content
Snippets Groups Projects

Resolve Merge Conflict

Merged Resolve Merge Conflict
k.kutscher/VirtualFluids_dev:develop into develop
1 unresolved thread
Merged Konstantin Kutscher requested to merge k.kutscher/VirtualFluids_dev:develop into develop
1 unresolved thread

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
apps/cpu/LaminarPipeFlow/LaminarPipeFlow.cpp
33 33 //=======================================================================================
34 34 #include <iostream>
35 35 #include <string>
36 //#include <omp.h>
36 // #include <omp.h>
37 37
38 38 #include "VirtualFluids.h"
39 39
40 40 using namespace std;
41 41
42 void run(const vf::basics::ConfigurationFile& config)
42 void run(string configname)
  • Sören Peters
    Sören Peters @soe.peters ·
    Owner

    Would only like to keep the old version of the LaminarPipeFlow, otherwise I have no complaints.

  • Sören Peters requested review from @soe.peters

    requested review from @soe.peters

  • Konstantin Kutscher added 1 commit

    added 1 commit

    Compare with previous version

  • Konstantin Kutscher mentioned in commit 211bd5c8

    mentioned in commit 211bd5c8

  • Konstantin Kutscher merged

    merged

    • Please register or sign in to reply