@@ -45,21 +45,18 @@ def buildlib(bldroot, installpath, case):
4545 modeldir = "{}/WW3/model" .format (repodir )
4646 builddir = "{}/wav" .format (exeroot )
4747
48- # TODO: these work dirs will have to be changed to live in the binary/build area.
49- # Achieving this will probably require a significant refactor of the ww3 infrastructure.
50- # Doing this stuff in-source not only clutters the repo, but also introduces potential race
51- # conditions if we were to try to build multiple ww3 cases simultaneously.
52- bindir1 = "{}/bin" .format (modeldir )
53- bindir = "{}/wav/bin" .format (exeroot )
54- shutil .copytree (bindir1 , bindir )
55- auxdir1 = "{}/aux" .format (modeldir )
56- auxdir = "{}/wav/aux" .format (exeroot )
57- shutil .copytree (auxdir1 , auxdir )
58- ftndir1 = "{}/ftn" .format (modeldir )
59- ftndir = "{}/wav/ftn" .format (exeroot )
60- shutil .copytree (ftndir1 , ftndir )
48+ # work dirs are placed in the binary/build area.
49+ bindir_source = "{}/bin" .format (modeldir )
50+ bindir = "{}/bin" .format (builddir )
51+ shutil .copytree (bindir_source , bindir )
52+ auxdir_source = "{}/aux" .format (modeldir )
53+ auxdir = "{}/aux" .format (builddir )
54+ shutil .copytree (auxdir_source , auxdir )
55+ ftndir_source = "{}/ftn" .format (modeldir )
56+ ftndir = "{}/ftn" .format (builddir )
57+ shutil .copytree (ftndir_source , ftndir )
6158
62- tmpdir = "{}/wav/ tmp" .format (exeroot )
59+ tmpdir = "{}/tmp" .format (builddir )
6360
6461 # Run w3_setup to create wwatch3.env file
6562 env_file = os .path .join (bindir , "wwatch3.env" )
0 commit comments