fix(str): add consistent fixed and free format approach (#838)

closes #832

autotest/t015_test.py

@@ -1,15 +1,30 @@
 __author__ = 'aleaf'
 
 import os
+
 try:
     import matplotlib
-    # if os.getenv('TRAVIS'):  # are we running https://travis-ci.org/ automated tests ?
-    #     matplotlib.use('Agg')  # Force matplotlib  not to use any Xwindows backend
 except:
     matplotlib = None
 
 import flopy
 
+try:
+    import pymake
+except:
+    pymake = None
+
+tpth = os.path.abspath(os.path.join('temp', 't015'))
+# make the directory if it does not exist
+if not os.path.isdir(tpth):
+    os.makedirs(tpth)
+
+mfexe = 'mf2005'
+v = flopy.which(mfexe)
+run = True
+if v is None:
+    run = False
+
 print(os.getcwd())
 
 if os.path.split(os.getcwd())[-1] == 'flopy3':
@@ -21,13 +36,102 @@
                  'sfrfile': 'str.str'}}
 
 
+def test_str_free():
+    m = flopy.modflow.Modflow.load(str_items[0]['mfnam'], exe_name=mfexe,
+                                   model_ws=path, verbose=True, check=False)
+    ws = tpth
+    m.change_model_ws(ws)
+
+    # get pointer to str package
+    str = m.str
+
+    # add aux variables to str
+    aux_names = ['aux iface', 'aux xyz']
+    names = ['iface', 'xyz']
+    current, current_seg = flopy.modflow.ModflowStr.get_empty(23, 7,
+                                                              aux_names=names)
+
+    # copy data from existing stress period data
+    for name in str.stress_period_data[0].dtype.names:
+        current[:][name] = str.stress_period_data[0][:][name]
+
+    # fill aux variable data
+    for idx, c in enumerate(str.stress_period_data[0]):
+        for jdx, name in enumerate(names):
+            current[idx][name] = idx + jdx * 10
+
+    # replace str data with updated str data
+    str = flopy.modflow.ModflowStr(m, mxacts=str.mxacts, nss=str.nss,
+                                   ntrib=str.ntrib, ndiv=str.ndiv,
+                                   icalc=str.icalc, const=str.const,
+                                   ipakcb=str.ipakcb, istcb2=str.istcb2,
+                                   stress_period_data={0: current},
+                                   segment_data=str.segment_data,
+                                   options=aux_names)
+
+    # add head output to oc file
+    oclst = ['PRINT HEAD', 'PRINT BUDGET', 'SAVE HEAD']
+    spd = {(0,0): oclst, (0,1): oclst, (0,2): oclst}
+    oc = flopy.modflow.ModflowOc(m, stress_period_data=spd)
+    oc.reset_budgetunit()
+
+    m.write_input()
+    if run:
+        try:
+            success, buff = m.run_model()
+        except:
+            success = False
+        assert success, 'base model run did not terminate successfully'
+
+    # load the fixed format model with aux variables
+    try:
+        m2 = flopy.modflow.Modflow.load(str_items[0]['mfnam'], exe_name=mfexe,
+                                        model_ws=ws, verbose=True, check=False)
+    except:
+        m2 = None
+
+    msg = 'could not load the fixed format model with aux variables'
+    assert m2 is not None, msg
+
+    ws = os.path.join(tpth, 'mf2005')
+    m.change_model_ws(ws)
+    m.set_ifrefm()
+    m.write_input()
+    if run:
+        try:
+            success, buff = m.run_model()
+        except:
+            success = False
+        assert success, 'free format model run did not terminate successfully'
+
+    # load the free format model
+    try:
+        m2 = flopy.modflow.Modflow.load(str_items[0]['mfnam'], exe_name=mfexe,
+                                        model_ws=ws, verbose=True, check=False)
+    except:
+        m2 = None
+
+    msg = 'could not load the free format model with aux variables'
+    assert m2 is not None, msg
+
+    # compare the fixed and free format head files
+    if run:
+        if pymake is not None:
+            fn1 = os.path.join(tpth, 'str.nam')
+            fn2 = os.path.join(ws, 'str.nam')
+            success = pymake.autotest.compare_heads(fn1, fn2, verbose=True)
+            msg = 'fixed and free format input output head files are different'
+            assert success, msg
+
+
 def test_str_plot():
     m = flopy.modflow.Modflow.load(str_items[0]['mfnam'], model_ws=path,
-                                   verbose=True)
+                                   verbose=True, check=False)
     if matplotlib is not None:
         assert isinstance(m.str.plot()[0], matplotlib.axes.Axes)
         matplotlib.pyplot.close()
 
 
 if __name__ == '__main__':
-    test_str_plot()
+    test_str_free()
+    #test_str_plot()