diff --git a/da/examples/dasgridded.py b/da/examples/dasgridded.py index 5649b45c4025ad9688b2a1b489d5a39ec66d8332..930a7ca65f7100567036df279af0e104e7d036ac 100755 --- a/da/examples/dasgridded.py +++ b/da/examples/dasgridded.py @@ -39,18 +39,17 @@ DaCycle = CycleControl(opts,args) from da.tools.pipeline import EnsembleSmootherPipeline from da.platform.maunaloa import MaunaloaPlatForm -#from da.ct.dasystem import CtDaSystem from da.ctgridded.dasystem import CtGriddedDaSystem -#from da.ct.statevector import CtStateVector from da.ctgridded.statevector import CtGriddedStateVector -from da.ct.obs import CtObservations +from da.ct.obspack import ObsPackObservations + from da.tm5.observationoperator import TM5ObservationOperator from da.ct.optimizer import CtOptimizer PlatForm = MaunaloaPlatForm() DaSystem = CtGriddedDaSystem(DaCycle['da.system.rc']) ObsOperator = TM5ObservationOperator(DaCycle['da.obsoperator.rc']) -Samples = CtObservations() +Samples = ObsPackObservations() StateVector = CtGriddedStateVector() Optimizer = CtOptimizer() @@ -74,10 +73,14 @@ msg = header+"Starting analysis"+footer ; logging.info(msg) from da.analysis.expand_fluxes import SaveWeeklyAvg1x1Data from da.analysis.expand_fluxes import SaveWeeklyAvgStateData from da.analysis.expand_fluxes import SaveWeeklyAvgTCData +from da.analysis.expand_fluxes import SaveWeeklyAvgExtTCData +from da.analysis.expand_mixingratios import WriteMixingRatios savedas = SaveWeeklyAvg1x1Data(DaCycle, StateVector) savedas = SaveWeeklyAvgStateData(DaCycle, StateVector) savedas = SaveWeeklyAvgTCData(DaCycle, StateVector) +savedas = SaveWeeklyAvgExtTCData(DaCycle) +savedas = WriteMixingRatios(DaCycle) sys.exit(0)