diff --git a/src/DA/external_scripts/float_postproc/makeplots_postDA.py b/src/DA/external_scripts/float_postproc/makeplots_postDA.py index 4d1b9897..2890f128 100644 --- a/src/DA/external_scripts/float_postproc/makeplots_postDA.py +++ b/src/DA/external_scripts/float_postproc/makeplots_postDA.py @@ -10,7 +10,7 @@ def plot_floatvsmodel(modelvarname,idate1,AllProfiles,AllChl, NewPres, Float,wmolist): - TheMask=Mask("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") + TheMask=Mask.from_file("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") nav_lev = TheMask.zlevels dz= TheMask.dz diff --git a/src/DA/external_scripts/float_postproc/postproc_float_3dvar.py b/src/DA/external_scripts/float_postproc/postproc_float_3dvar.py index 403483e3..0e60df55 100755 --- a/src/DA/external_scripts/float_postproc/postproc_float_3dvar.py +++ b/src/DA/external_scripts/float_postproc/postproc_float_3dvar.py @@ -74,7 +74,7 @@ def argument(): read_adjusted = [True] #,False,False] # MASK of the domain -TheMask=Mask("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") +TheMask=Mask.from_file("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") nav_lev = TheMask.zlevels layer=Layer(0,200) #layer of the Float profile???? diff --git a/src/DA/external_scripts/float_postproc/var_aggregator.py b/src/DA/external_scripts/float_postproc/var_aggregator.py index 5dded109..da2e9ad1 100644 --- a/src/DA/external_scripts/float_postproc/var_aggregator.py +++ b/src/DA/external_scripts/float_postproc/var_aggregator.py @@ -92,7 +92,7 @@ def addsep(string): SingleVar_filelist=glob.glob(PATH_NAME) SingleVar_filelist.sort() -TheMask=Mask(args.maskfile) +TheMask=Mask.from_file(args.maskfile) for N1pfile in SingleVar_filelist[rank::nranks]: dailyAve = os.path.basename(N1pfile) diff --git a/src/DA/external_scripts/float_preproc/CheckFloatperDate.py b/src/DA/external_scripts/float_preproc/CheckFloatperDate.py index 43a16a41..5db9fb70 100755 --- a/src/DA/external_scripts/float_preproc/CheckFloatperDate.py +++ b/src/DA/external_scripts/float_preproc/CheckFloatperDate.py @@ -73,7 +73,7 @@ def argument(): read_adjusted = [True] #,False,False] # MASK of the domain -TheMask=Mask("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") +TheMask=Mask.from_file("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") nav_lev = TheMask.zlevels layer=Layer(0,200) #layer of the Float profile???? diff --git a/src/DA/external_scripts/float_preproc/CheckFloatperDate_calcalastd.py b/src/DA/external_scripts/float_preproc/CheckFloatperDate_calcalastd.py index b61cf618..9a053511 100755 --- a/src/DA/external_scripts/float_preproc/CheckFloatperDate_calcalastd.py +++ b/src/DA/external_scripts/float_preproc/CheckFloatperDate_calcalastd.py @@ -72,7 +72,7 @@ def argument(): read_adjusted = [True] #,False,False] # MASK of the domain -TheMask=Mask("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") +TheMask=Mask.from_file("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") nav_lev = TheMask.zlevels layer=Layer(0,200) #layer of the Float profile???? diff --git a/src/DA/external_scripts/float_preproc/preproc.py b/src/DA/external_scripts/float_preproc/preproc.py index 59f1fea0..866e0572 100755 --- a/src/DA/external_scripts/float_preproc/preproc.py +++ b/src/DA/external_scripts/float_preproc/preproc.py @@ -69,7 +69,7 @@ def argument(): INPUTDIR = addsep(args.inputdir) OUTDIR = addsep(args.outdir) varmod = args.variable -TheMask = Mask(args.maskfile) +TheMask = Mask.from_file(args.maskfile) deplim = np.int(args.deplim) nav_lev = TheMask.zlevels diff --git a/src/DA/external_scripts/float_preproc/var_aggregator.py b/src/DA/external_scripts/float_preproc/var_aggregator.py index 712a1192..6bdbbead 100644 --- a/src/DA/external_scripts/float_preproc/var_aggregator.py +++ b/src/DA/external_scripts/float_preproc/var_aggregator.py @@ -93,7 +93,7 @@ def addsep(string): SingleVar_filelist=glob.glob(PATH_NAME) SingleVar_filelist.sort() -TheMask=Mask(args.maskfile) +TheMask=Mask.from_file(args.maskfile) for N1pfile in SingleVar_filelist[rank::nranks]: dailyAve = os.path.basename(N1pfile) diff --git a/src/DA/external_scripts/preproc.py b/src/DA/external_scripts/preproc.py index ff55be1e..ae549f56 100755 --- a/src/DA/external_scripts/preproc.py +++ b/src/DA/external_scripts/preproc.py @@ -67,7 +67,7 @@ def argument(): read_adjusted = [True] #,False,False] # MASK of the domain -TheMask=Mask("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") +TheMask=Mask.from_file("/pico/home/usera07ogs/a07ogs00/OPA/V2C/etc/static-data/MED1672_cut/MASK/meshmask.nc") nav_lev = TheMask.zlevels layer=Layer(0,200) #layer of the Float profile???? diff --git a/src/DA/external_scripts/var_aggregator.py b/src/DA/external_scripts/var_aggregator.py index 5dded109..da2e9ad1 100644 --- a/src/DA/external_scripts/var_aggregator.py +++ b/src/DA/external_scripts/var_aggregator.py @@ -92,7 +92,7 @@ def addsep(string): SingleVar_filelist=glob.glob(PATH_NAME) SingleVar_filelist.sort() -TheMask=Mask(args.maskfile) +TheMask=Mask.from_file(args.maskfile) for N1pfile in SingleVar_filelist[rank::nranks]: dailyAve = os.path.basename(N1pfile) diff --git a/testcase/Main_create_TEST.py b/testcase/Main_create_TEST.py index 7a90cf3d..214e8809 100755 --- a/testcase/Main_create_TEST.py +++ b/testcase/Main_create_TEST.py @@ -1,64 +1,39 @@ -#! /usr/bin/python - -#AUTHOR PL 15.X.2013 - -# LOAD PACKAGES - -import os,sys - -import collections - -import numpy as np - -from mydtype import * - -import scipy.io.netcdf as NC - -import pickle - -import create_meshmask_nc as c_mask - -import create_Dom_Dec as c_dom - -import create_extinction_nc as c_ext - -import create_init_nc as c_init - -import create_forcings_nc as c_for - -import create_bc_nc as c_bc - -import deploy_code as d_code - -import create_events as c_events - -import create_da_nc as DA -import create_fluxes - -# MAIN PROGRAM - -TEST_LIST=np.loadtxt('TEST_LIST.dat', dtype=test_conf,skiprows=1,ndmin=1) - -for test in TEST_LIST: - - print(test['Dir']) - - DA.create_dataset(test) - - c_dom.create_Dom_Dec(test) - - c_mask.create_meshmask_nc(test) - - c_for.create_forcings_nc(test) - - c_ext.create_extinction_nc(test) - - c_bc.create_bc_nc(test) - - create_fluxes.create_fluxes(test) - - c_init.create_init_nc(test) - - d_code.deploy_code(test) - - c_events.create_events(test) +#! /usr/bin/python + +#AUTHOR PL 15.X.2013 + +# LOAD PACKAGES +import os,sys +import collections +import numpy as np +from mydtype import * +import scipy.io.netcdf as NC +import pickle +import create_meshmask_nc as c_mask +import create_Dom_Dec as c_dom +import create_extinction_nc as c_ext +import create_init_nc as c_init +import create_forcings_nc as c_for +import create_bc_nc as c_bc +import deploy_code as d_code +import create_events as c_events + +import create_da_nc as DA +import create_fluxes + + +# MAIN PROGRAM +TEST_LIST=np.loadtxt('TEST_LIST.dat', dtype=test_conf,skiprows=1,ndmin=1) + +for test in TEST_LIST: + print(test['Dir']) + DA.create_dataset(test) + c_dom.create_Dom_Dec(test) + c_mask.create_meshmask_nc(test) + c_for.create_forcings_nc(test) + c_ext.create_extinction_nc(test) + c_bc.create_bc_nc(test) + create_fluxes.create_fluxes(test) + c_init.create_init_nc(test) + d_code.deploy_code(test) + c_events.create_events(test) diff --git a/testcase/checkdiff.py b/testcase/checkdiff.py index 805ff2c9..6e0de45a 100644 --- a/testcase/checkdiff.py +++ b/testcase/checkdiff.py @@ -9,7 +9,7 @@ from commons.mask import Mask import os,glob -TheMask=Mask('/gpfs/work/IscrC_MEDCOAST_0/test_swp/TEST01/wrkdir/MODEL/meshmask.nc') +TheMask=Mask.from_file('/gpfs/work/IscrC_MEDCOAST_0/test_swp/TEST01/wrkdir/MODEL/meshmask.nc') DIR1 = "/gpfs/work/IscrC_MEDCOAST_0/test_swp/test_FSA/ogstm/testcase/TEST01/wrkdir/MODEL/AVE_FREQ_2/" DIR2 = "/gpfs/work/IscrC_MEDCOAST_0/test_swp/TEST01/wrkdir/MODEL/AVE_FREQ_2/" diff --git a/testcase/subgen.py b/testcase/subgen.py index 7eb1114a..e0aa69f1 100644 --- a/testcase/subgen.py +++ b/testcase/subgen.py @@ -7,5 +7,5 @@ TheMask=Mask('meshmask.nc',dzvarname="e3t_0") for sub in OGS.Pred: - S=SubMask(sub,maskobject=TheMask) + S=SubMask(sub, TheMask) S.save_as_netcdf('submask.nc', maskvarname=sub.name)