Commit afaadd63 authored by Javier Vegas-Regidor's avatar Javier Vegas-Regidor
Browse files

Fixed bug that was preventing to add the f6h to the recon and exp variables

parent 67fa2416
......@@ -17,8 +17,7 @@ CON_FILES = /esnas/autosubmit/con_files/
# an alias defined in the ALIAS section (see more below). If you are using the diagnostics just to CMORize, leave it
# empty
#DIAGS = discretize,atmos,sfcWind,,0,40
#DIAGS = climpercent,atmos,sfcWind,2010,2012,11
DIAGS = daysover,atmos,sfcWind,2010,2012,11
DIAGS = climpercent,atmos,sfcWind,2010,2012,11 daysover,atmos,sfcWind,2010,2012,11
#DIAGS = OHC
# Frequency of the data you want to use by default. Some diagnostics do not use this value: i.e. monmean always stores
# its results at monthly frequency (obvious) and has a parameter to specify input's frequency.
......
# coding: utf-8
import csv
import shutil
import threading
import os
import re
import shutil
import threading
from earthdiagnostics.datafile import NetCDFFile as NCfile, StorageStatus, LocalStatus
from earthdiagnostics.modelingrealm import ModelingRealms
from earthdiagnostics.utils import Utils
from earthdiagnostics.variable import VariableManager
from earthdiagnostics.variable_type import VariableType
from earthdiagnostics.modelingrealm import ModelingRealms
from earthdiagnostics.datafile import NetCDFFile as NCfile, StorageStatus, LocalStatus
class DataManager(object):
......@@ -63,7 +62,7 @@ class DataManager(object):
if grid:
var = '{0}-{1}'.format(var, grid)
if domain in [ModelingRealms.ocean, ModelingRealms.seaIce]:
if domain in [ModelingRealms.ocean, ModelingRealms.seaIce, ModelingRealms.ocnBgchem]:
return '{0}_f{1}h'.format(var, self.experiment.ocean_timestep)
else:
return '{0}_f{1}h'.format(var, self.experiment.atmos_timestep)
......
......@@ -98,7 +98,7 @@ class ObsReconManager(DataManager):
def _get_folder_path(self, frequency, domain, variable, grid, vartype):
if self.config.data_type == 'exp' and not frequency.frequency.endswith('hr'):
if not frequency.frequency.endswith('hr'):
var_folder = self.get_varfolder(domain, variable, grid)
else:
var_folder = variable
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment