diff --git a/.github/workflows/integ.yml b/.github/workflows/integ.yml index 4f017f42..7808f050 100644 --- a/.github/workflows/integ.yml +++ b/.github/workflows/integ.yml @@ -10,7 +10,6 @@ jobs: test: [ CYL ] env: MOR_DIR: /home/runner/work/NekROM/NekROM - USR: "ana.o aux.o batch.o conv.o dump.o ei.o filter.o ip.o lapack.o pod.o qoi.o rom.o read.o time.o const.o unit.o rk.o legacy.o mpar.o tensor.o riesz.o" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/integ_t.yaml b/.github/workflows/integ_t.yaml index 1177ce2d..51b651fd 100644 --- a/.github/workflows/integ_t.yaml +++ b/.github/workflows/integ_t.yaml @@ -10,7 +10,6 @@ jobs: test: [ ANN ] env: MOR_DIR: /home/runner/work/NekROM/NekROM - USR: "ana.o aux.o batch.o conv.o dump.o ei.o filter.o ip.o lapack.o pod.o qoi.o rom.o read.o time.o const.o unit.o rk.o legacy.o mpar.o tensor.o riesz.o" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 352e7873..86ff9cbb 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -11,7 +11,6 @@ jobs: ips: [L2, H10] env: MOR_DIR: /home/runner/work/NekROM/NekROM - USR: "ana.o aux.o batch.o conv.o dump.o ei.o filter.o ip.o lapack.o pod.o qoi.o rom.o read.o time.o const.o unit.o rk.o legacy.o mpar.o tensor.o riesz.o" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/unit_rbf.yaml b/.github/workflows/unit_rbf.yaml index d20fb008..ef8a7609 100644 --- a/.github/workflows/unit_rbf.yaml +++ b/.github/workflows/unit_rbf.yaml @@ -10,7 +10,6 @@ jobs: test: [RBF_WT] env: MOR_DIR: /home/runner/work/NekROM/NekROM - USR: "ana.o aux.o batch.o conv.o dump.o ei.o filter.o ip.o lapack.o pod.o qoi.o rom.o read.o time.o const.o unit.o rk.o legacy.o mpar.o tensor.o riesz.o" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/unit_rf.yaml b/.github/workflows/unit_rf.yaml index 30eb5d65..9edb55de 100644 --- a/.github/workflows/unit_rf.yaml +++ b/.github/workflows/unit_rf.yaml @@ -10,7 +10,6 @@ jobs: test: [rf] env: MOR_DIR: /home/runner/work/NekROM/NekROM - USR: "ana.o aux.o batch.o conv.o dump.o ei.o filter.o ip.o lapack.o pod.o qoi.o rom.o read.o time.o const.o unit.o rk.o legacy.o mpar.o tensor.o riesz.o" steps: - uses: actions/checkout@v2 diff --git a/bin/makerom b/bin/makerom index 7728f849..d39ae416 100755 --- a/bin/makerom +++ b/bin/makerom @@ -1,4 +1,5 @@ #!/bin/bash $MOR_DIR/bin/linkm -USR="$USR ana.o aux.o conv.o dump.o ei.o filter.o lapack.o pod.o qoi.o rom.o read.o time.o const.o rk.o legacy.o tensor.o mpar.o riesz.o batch.o ip.o" makenek $1 +source $MOR_DIR/setusr +makenek $1 diff --git a/bin/setup b/bin/setup index 5c7f034f..458e1ea5 100755 --- a/bin/setup +++ b/bin/setup @@ -2,4 +2,4 @@ export MOR_DIR=$(cd ..; pwd -P) export PATH=$MOR_DIR/bin:$PATH -export USR="$USR ana.o aux.o conv.o dump.o ei.o filter.o lapack.o pod.o qoi.o rom.o read.o time.o const.o unit.o rk.o legacy.o mpar.o riesz.o batch.o ip.o" +source $MOR_DIR/bin/setusr diff --git a/bin/setusr b/bin/setusr new file mode 100644 index 00000000..a481c768 --- /dev/null +++ b/bin/setusr @@ -0,0 +1 @@ +export USR="$USR ana.o aux.o batch.o conv.o dump.o ei.o filter.o ip.o lapack.o pod.o qoi.o rom.o read.o time.o const.o unit.o rk.o legacy.o mpar.o riesz.o" diff --git a/code/makefile_usr.inc b/code/makefile_usr.inc index 56ddab10..efd1d303 100644 --- a/code/makefile_usr.inc +++ b/code/makefile_usr.inc @@ -16,7 +16,7 @@ $(OBJDIR)/riesz.o :$(MOR_DIR)/code/riesz.f MOR LMOR; $(FC) -c $(FL2) $< -o $@ $(OBJDIR)/rk.o :$(MOR_DIR)/code/rk.f MOR LMOR; $(FC) -c $(FL2) $< -o $@ $(OBJDIR)/rom.o :$(MOR_DIR)/code/rom.f MOR LMOR; $(FC) -c $(FL2) $< -o $@ $(OBJDIR)/time.o :$(MOR_DIR)/code/time.f MOR LMOR; $(FC) -c $(FL2) $< -o $@ -$(OBJDIR)/tensor.o :$(MOR_DIR)/code/tensor.f MOR LMOR; $(FC) -c $(FL2) $< -o $@ $(OBJDIR)/mpar.o :$(MOR_DIR)/code/mpar.f MORDICT MOR LMOR; $(FC) -c $(FL2) $< -o $@ +$(OBJDIR)/tensor.o :$(MOR_DIR)/code/tensor.f MOR LMOR; $(FC) -c $(FL2) $< -o $@ $(OBJDIR)/unit.o :$(MOR_DIR)/tests/unit.f MOR LMOR; $(FC) -c $(FL2) $< -o $@ diff --git a/tests/integ.sh b/tests/integ.sh index 5469f9e7..cbe5a9ea 100644 --- a/tests/integ.sh +++ b/tests/integ.sh @@ -6,6 +6,8 @@ ls bas/bascyl0.f* > bas.list cp ../../data/cyl_rect/cyl0.f01000 r0.f00001 +source $MOR_DIR/bin/setusr +USR="$USR tensor.o" $SOURCE_ROOT/bin/makenek test $SOURCE_ROOT/bin/genmap << Z test diff --git a/tests/test_t.sh b/tests/test_t.sh index eb73a063..3f1c970b 100755 --- a/tests/test_t.sh +++ b/tests/test_t.sh @@ -29,6 +29,8 @@ sed -i.bu "s/ls=.*)/ls=2)/g" LMOR sed -i.bu "s/lx1=.*)/lx1=12)/g" SIZE sed -i.bu "s/lxd=.*)/lxd=18)/g" SIZE +source $MOR_DIR/bin/setusr +USR="$USR tensor.o" $SOURCE_ROOT/bin/makenek test1 $SOURCE_ROOT/bin/genmap << Z test1 diff --git a/tests/unit.sh b/tests/unit.sh index a2fb08bb..6b1f8b1b 100644 --- a/tests/unit.sh +++ b/tests/unit.sh @@ -6,6 +6,9 @@ ls bas/bascyl0.f* > bas.list cp ../../data/cyl_rect/cyl0.f01000 r0.f00001 +source $MOR_DIR/bin/setusr +USR="$USR tensor.o" + fold_start makenek Makenek $SOURCE_ROOT/bin/makenek test fold_end makenek diff --git a/tests/unit_rbf.sh b/tests/unit_rbf.sh index 5ab47630..e801963d 100755 --- a/tests/unit_rbf.sh +++ b/tests/unit_rbf.sh @@ -3,6 +3,8 @@ source travis_fn mkdir t cd t $MOR_DIR/bin/linkm +source $MOR_DIR/bin/setusr +USR="$USR tensor.o" sed 's/(ltr=.*)/(ltr=80)/g' LMOR > LMOR.tmp mv LMOR.tmp LMOR diff --git a/tests/unit_rf.sh b/tests/unit_rf.sh index 7523d756..416ec0d8 100755 --- a/tests/unit_rf.sh +++ b/tests/unit_rf.sh @@ -3,6 +3,8 @@ source travis_fn mkdir t cd t $MOR_DIR/bin/linkm +source $MOR_DIR/bin/setusr +USR="$USR tensor.o" sed 's/(ltr=.*)/(ltr=80)/g' LMOR > LMOR.tmp mv LMOR.tmp LMOR @@ -24,6 +26,7 @@ sed -i.bu "s/ls=.*)/ls=2)/g" LMOR sed -i.bu "s/lx2=.*)/lx2=lx1)/g" SIZE sed -i.bu "s/leleg=.*)/leleg=48)/g" SIZE sed -i.bu "s/ldimt=.*)/ldimt=4)/g" SIZE + fold_start makenek Makenek $SOURCE_ROOT/bin/makenek rf_unit fold_end makenek