Fixes merge clashes with build update

LLNL · Oct 28, 2023 · 045f416 · 045f416
1 parent be5f967
commit 045f416
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 704 deletions.
diff --git a/aph/Package b/aph/Package
@@ -3,6 +3,6 @@ POINTER = cray
 
 VDF = aph.v
 
-NVDF = ../com/com_basis.v
+NVDF = ../com/com.v
 
 SM = aphrates.m aphread.m
diff --git a/api/Package b/api/Package
@@ -3,7 +3,7 @@ POINTER = cray
 
 VDF = api.v
 
-NVDF = ../com/com_basis.v ../bbb/bbb_basis.v
+NVDF = ../com/com.v
 
 SM = apifcn.m apip93.m apisorc.m fimp.m inelrates.m fmombal.m sputt.m
 
diff --git a/bbb/Package b/bbb/Package
@@ -3,7 +3,7 @@ POINTER = cray
 
 VDF = bbb.v
 
-NVDF = ../com/com_basis.v
+NVDF = ../com/com.v
 
 SM = boundary.m convert.m geometry.m griddubl.m \
      oderhs.m odesetup.m odesolve.m potencur.m turbulence.m \

diff --git a/com/Package b/com/Package
@@ -2,7 +2,7 @@ LANGUAGE = C
 PKG = com
 POINTER = cray
 
-VDF = com_basis.v
+VDF = com.v
 
 NVDF = ../aph/aph.v ../api/api.v ../bbb/bbb.v ../grd/grd.v\
        ../flx/flx.v  ../wdf/wdf.v

diff --git a/com/com_basis.v b/com/com_basis.v
diff --git a/grd/Package b/grd/Package
@@ -3,6 +3,6 @@ POINTER = cray
 
 VDF = grd.v
 
-NVDF = ../com/com_basis.v
+NVDF = ../com/com.v
 
 SM = grdcomp.m grddriv.m grdinit.m grdread.m grdwrit.m
diff --git a/wdf/Package b/wdf/Package
@@ -3,6 +3,6 @@ POINTER = cray
 
 VDF = wdf.v
 
-NVDF = ../com/com_basis.v
+NVDF = ../com/com.v
 
 SM = wdf.m