Changeset 5355

Timestamp:

Oct 23, 2022 8:49:57 PM (5 months ago)

Author:

toby

Message:

start work on interfacing NIST*LATTICE

Location:

trunk/fsource

Files:

• LATTIC.f (added)
• NISTlatsubs (added)
• NISTlatsubs/BLOCKDATA1.f (added)
• NISTlatsubs/CENTER.f (added)
• NISTlatsubs/CKPT02.f (added)
• NISTlatsubs/DERIV.f (added)
• NISTlatsubs/DETERM.f (added)
• NISTlatsubs/DOT.f (added)
• NISTlatsubs/HEAD0.f (added)
• NISTlatsubs/HEAD2.f (added)
• NISTlatsubs/HEAD3.f (added)
• NISTlatsubs/HEAD4.f (added)
• NISTlatsubs/HEAD5.f (added)
• NISTlatsubs/HEAD6.f (added)
• NISTlatsubs/HMATRX.f (added)
• NISTlatsubs/INVERS.f (added)
• NISTlatsubs/MNCOND.f (added)
• NISTlatsubs/MULTIP.f (added)
• NISTlatsubs/NORMAL.f (added)
• NISTlatsubs/OUTPT1.f (added)
• NISTlatsubs/OUTPT2.f (added)
• NISTlatsubs/QMATRI.f (added)
• NISTlatsubs/RD021.f (added)
• NISTlatsubs/RD051.f (added)
• NISTlatsubs/RD061.f (added)
• NISTlatsubs/REDUCE.f (added)
• NISTlatsubs/SET.f (added)
• NISTlatsubs/SHORTV.f (added)
• NISTlatsubs/SPCON2.f (added)
• NISTlatsubs/SPCOND.f (added)
• NISTlatsubs/TRANS.f (added)
• NISTlatsubs/VOLUME.f (added)
• SConstruct (modified) (5 diffs)
• convcell.f (added)

trunk/fsource/SConstruct

@@ -117 +117 @@
 tmpdir = None
 #==========================================================================================
+EXEsuffix = ''
 # configure platform dependent options here: 
 if sys.platform == "win32":
     F2PYsuffix = '.pyd'
+    EXEsuffix = '.exe'
     if G77path != "":
       FCompiler='g77'
@@ -371 +373 @@
 env.Append(BUILDERS = {'fort' : fort, 'lib' : lib},)
 
+# Define a builder to compile and copy NIST*LATTICE programs
+def generate_nist(source, target, env, for_signature):
+    #exe = os.path.splitext(str(source[0]))[0] + EXEsuffix
+    exe = target
+#    cmd = FCompiler + ' $SOURCE ' + NISTlib[0] + ' -o ' + exe
+    cmd = FCompiler + ' $SOURCE ' + NISTlib[0] + ' -o $TARGET'
+    if sys.platform == "win32":
+        installcmd = "copy $TARGET " + InstallLoc
+    else:
+        installcmd = "cp $TARGET " + InstallLoc
+    return [cmd, installcmd]
+env.Append(BUILDERS = {'nist' : Builder(generator = generate_nist)},)
+
+
 #==========================================================================================
 # Setup build Environment
@@ -388 +404 @@
 # locate libraries to be built (subdirectories named *subs)
 liblist = []
+NISTlib = []
 for sub in glob.glob('*subs'):
     filelist = []
-    for file in glob.glob(os.path.join(sub,'*.for')):
+    for file in glob.glob(os.path.join(sub,'*.for'))+glob.glob(os.path.join(sub,'*.f')):
         #target = os.path.splitext(file)[0]+'.o'
         target = env.fort(file) # connect .o files to .for files
@@ -400 +417 @@
     else:
        lib = Library(sub, filelist) # register library to be created
-    liblist.append(lib[0].name)
+    if 'NIST' in lib[0].name:
+       NISTlib = [lib[0].name]
+    else:       
+       liblist.append(lib[0].name)
     filename = str(lib[0])
+
+# NIST*LATTICE programs
+for src in 'LATTIC.f','convcell.f':
+    target = os.path.splitext(src)[0] + EXEsuffix
+    out = env.nist(target,src)
+    Clean(out, target)
+    Depends(target, NISTlib) # make sure library is rebuilt if old
+
 # find modules that need to be built
 modlist = []
 for src in glob.glob('*.for'):
+    #break # bail out early for testing
     target = os.path.splitext(src)[0] + F2PYsuffix # xxx.pyd or xxx.so
     out = env.f2py(target,src)
@@ -410 +439 @@
     Depends(target, liblist) # make sure libraries are rebuilt if old
     modlist.append(out[0].name)
-    #break # bail out early for testing
 #==========================================================================================
 # all done with setup, show the user the options and let scons do the work