destroy cached copy of mesh before it is submitted to the pickler

noaa-ocs-modeling · Sep 20, 2021 · 6f7d76d · 6f7d76d
1 parent f0b12a6
commit 6f7d76d
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 39 deletions.
diff --git a/coupledmodeldriver/generate/adcirc/base.py b/coupledmodeldriver/generate/adcirc/base.py
@@ -1,5 +1,4 @@
 from datetime import datetime, timedelta
-import os
 from os import PathLike
 from pathlib import Path
 from typing import Any, Union

diff --git a/coupledmodeldriver/generate/adcirc/configure.py b/coupledmodeldriver/generate/adcirc/configure.py
@@ -132,15 +132,6 @@ def __init__(
         for forcing in forcings:
             self.add_forcing(forcing)
 
-    def perturb(self, relative_to: PathLike = None) -> {str: 'ADCIRCRunConfiguration'}:
-        perturbations = super().perturb(relative_to=relative_to)
-
-        for run_name, perturbation in perturbations.items():
-            if self.adcircpy_mesh == perturbation.adcircpy_mesh:
-                perturbation.adcircpy_mesh = self.adcircpy_mesh
-
-        return perturbations
-
     def add_forcing(self, forcing: ForcingJSON):
         if forcing not in self:
             forcing = self[self.add(forcing)]

diff --git a/coupledmodeldriver/generate/adcirc/generate.py b/coupledmodeldriver/generate/adcirc/generate.py
@@ -192,8 +192,7 @@ def generate_adcirc_configuration(
             'duration': spinup_duration,
             'local_fort13_filename': local_fort13_filename,
             'local_fort14_filename': local_fort14_filename,
-            'link_mesh': use_original_mesh
-            or spinup_configuration.adcircpy_mesh == base_configuration.adcircpy_mesh,
+            'link_mesh': True,
             'relative_paths': relative_paths,
             'overwrite': overwrite,
             'platform': platform,
@@ -218,15 +217,19 @@ def generate_adcirc_configuration(
     for run_name, run_configuration in perturbations.items():
         run_directory = runs_directory / run_name
 
+        link_mesh = (
+            use_original_mesh
+            or run_configuration.adcircpy_mesh == base_configuration.adcircpy_mesh
+        )
+
         run_kwargs = {
             'directory': run_directory,
             'name': run_name,
             'phase': run_phase,
             'configuration': run_configuration,
             'local_fort13_filename': local_fort13_filename,
             'local_fort14_filename': local_fort14_filename,
-            'link_mesh': use_original_mesh
-            or run_configuration.adcircpy_mesh == base_configuration.adcircpy_mesh,
+            'link_mesh': link_mesh,
             'relative_paths': relative_paths,
             'overwrite': overwrite,
             'platform': platform,
@@ -243,6 +246,8 @@ def generate_adcirc_configuration(
         }
 
         if parallel:
+            # destroy stored copy of adcircpy mesh, because it cannot be pickled across processes
+            run_configuration.adcircpy_mesh = None
             futures.append(process_pool.submit(write_run_directory, **run_kwargs))
         else:
             write_run_directory(**run_kwargs)

diff --git a/tests/data/reference/test_hera_adcirc/runs/unperturbed/fort.15 b/tests/data/reference/test_hera_adcirc/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_nems_atmesh_ww3data/runs/unperturbed/fort.15 b/tests/data/reference/test_hera_adcirc_nems_atmesh_ww3data/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal/runs/unperturbed/fort.15 b/tests/data/reference/test_hera_adcirc_tidal/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal/spinup/fort.15 b/tests/data/reference/test_hera_adcirc_tidal/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data/runs/unperturbed/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data/spinup/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/...ta/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_aswip/runs/unperturbed/fort.15 b/...ta/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_aswip/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_aswip/spinup/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_aswip/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/...ference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/runs/unperturbed/fort.15 b/...ference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/...ference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/runs/unperturbed/fort.22 b/...ference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/runs/unperturbed/fort.22
@@ -154,4 +154,4 @@ AL, 09, 2008091418,   , BEST, 324, 403N,  872W,  50,  988, EX,  34, NEQ,    0,
 AL, 09, 2008091418,   , BEST, 324, 403N,  872W,  50,  988, EX,  50, NEQ,    0,  160,    0,    0, 1007,  300,  50,     ,    ,    ,    ,    , 53,  27,    IKE     ,  59
 AL, 09, 2008091500,   , BEST, 330, 433N,  815W,  50,  988, EX,  34, NEQ,    0,  180,  150,    0, 1007,  300,  50,     ,    ,    ,    ,    , 58,  26,    IKE     ,  60
 AL, 09, 2008091500,   , BEST, 330, 433N,  815W,  50,  988, EX,  50, NEQ,    0,  160,    0,    0, 1007,  300,  50,     ,    ,    ,    ,    , 58,  26,    IKE     ,  60
-AL, 09, 2008091506,   , BEST, 336, 458N,  753W,  40,  986, EX,  34, NEQ,    0,  180,  150,    0, 1007,  300,  50,     ,    ,    ,    ,    , 63,  17,    IKE     ,  61
+AL, 09, 2008091506,   , BEST, 336, 458N,  753W,  40,  986, EX,  34, NEQ,    0,  180,  150,    0, 1007,  300,  50,     ,    ,    ,    ,    ,243,  26,    IKE     ,  61
diff --git a/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/spinup/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/spinup/fort.22 b/tests/data/reference/test_hera_adcirc_tidal_besttrack_nems_ww3data_nointernet/spinup/fort.22
@@ -154,4 +154,4 @@ AL, 09, 2008091418,   , BEST, 324, 403N,  872W,  50,  988, EX,  34, NEQ,    0,
 AL, 09, 2008091418,   , BEST, 324, 403N,  872W,  50,  988, EX,  50, NEQ,    0,  160,    0,    0, 1007,  300,  50,     ,    ,    ,    ,    , 53,  27,    IKE     ,  59
 AL, 09, 2008091500,   , BEST, 330, 433N,  815W,  50,  988, EX,  34, NEQ,    0,  180,  150,    0, 1007,  300,  50,     ,    ,    ,    ,    , 58,  26,    IKE     ,  60
 AL, 09, 2008091500,   , BEST, 330, 433N,  815W,  50,  988, EX,  50, NEQ,    0,  160,    0,    0, 1007,  300,  50,     ,    ,    ,    ,    , 58,  26,    IKE     ,  60
-AL, 09, 2008091506,   , BEST, 336, 458N,  753W,  40,  986, EX,  34, NEQ,    0,  180,  150,    0, 1007,  300,  50,     ,    ,    ,    ,    , 63,  17,    IKE     ,  61
+AL, 09, 2008091506,   , BEST, 336, 458N,  753W,  40,  986, EX,  34, NEQ,    0,  180,  150,    0, 1007,  300,  50,     ,    ,    ,    ,    ,243,  26,    IKE     ,  61
diff --git a/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data/runs/unperturbed/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data/spinup/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data_perturbed/runs/run_1/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data_perturbed/runs/run_1/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data_perturbed/runs/run_2/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data_perturbed/runs/run_2/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data_perturbed/spinup/fort.15 b/tests/data/reference/test_hera_adcirc_tidal_nems_atmesh_ww3data_perturbed/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:16                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_local_adcirc_tidal/runs/unperturbed/fort.15 b/tests/data/reference/test_local_adcirc_tidal/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:22                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_local_adcirc_tidal/spinup/fort.15 b/tests/data/reference/test_local_adcirc_tidal/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:22                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_local_adcirc_tidal_nems_atmesh_ww3data/runs/unperturbed/fort.15 b/tests/data/reference/test_local_adcirc_tidal_nems_atmesh_ww3data/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:22                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_local_adcirc_tidal_nems_atmesh_ww3data/spinup/fort.15 b/tests/data/reference/test_local_adcirc_tidal_nems_atmesh_ww3data/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:22                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:17                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_stampede2_adcirc_tidal/runs/unperturbed/fort.15 b/tests/data/reference/test_stampede2_adcirc_tidal/runs/unperturbed/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:18                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER

diff --git a/tests/data/reference/test_stampede2_adcirc_tidal/spinup/fort.15 b/tests/data/reference/test_stampede2_adcirc_tidal/spinup/fort.15
@@ -1,4 +1,4 @@
-created on 2021-09-07 12:21                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
+created on 2021-09-07 14:18                                     ! RUNDES                              - 32 CHARACTER ALPHANUMERIC RUN DESCRIPTION
 Shinacock Inlet Coarse Grid                                     ! RUNID                               - 24 CHARACTER ALPANUMERIC RUN IDENTIFICATION
 1                                                               ! NFOVER                              - NONFATAL ERROR OVERRIDE OPTION
 1                                                               ! NABOUT                              - ABREVIATED OUTPUT OPTION PARAMETER