Skip to content

Updated ogstm python scripts to be compatible with the "main" branch of bit.sea #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spiani wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated ogstm python scripts to be compatible with the "main" branch of bit.sea #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DA/external_scripts/float_postproc/makeplots_postDA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/float_postproc/postproc_float_3dvar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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????
Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/float_postproc/var_aggregator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/float_preproc/CheckFloatperDate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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????
Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/float_preproc/CheckFloatperDate_calcalastd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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????
Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/float_preproc/preproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/float_preproc/var_aggregator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/preproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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????
Expand Down
2 changes: 1 addition & 1 deletion src/DA/external_scripts/var_aggregator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
103 changes: 39 additions & 64 deletions testcase/Main_create_TEST.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion testcase/checkdiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"

Expand Down
2 changes: 1 addition & 1 deletion testcase/subgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)