Skip to content
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

Resume the Marine Vrfy Task on ctests #1107

Merged
merged 3 commits into from
May 21, 2024
Merged

Resume the Marine Vrfy Task on ctests #1107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96a116a
WIP
apchoiCMD May 11, 2024
1096da4
resolve conflict
apchoiCMD May 21, 2024
67c8677
Merge branch 'develop' into bugfix/marine-vrfy
apchoiCMD May 21, 2024
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
4 changes: 2 additions & 2 deletions scripts/exgdas_global_marine_analysis_vrfy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def plot_marine_vrfy(config):
projs=['North', 'South', 'Global'],
comout=os.path.join(comout, 'vrfy', 'ana')), # sea ice analysis
plotConfig(grid_file=grid_file,
data_file=os.path.join(com_ice_history, f'{RUN}.t{gcyc}z.icef006.nc'),
data_file=os.path.join(com_ice_history, f'{RUN}.ice.t{gcyc}z.inst.f006.nc'),
variables_horiz={'aice_h': [0.0, 1.0],
'hs_h': [0.0, 4.0],
'hi_h': [0.0, 0.5]},
Expand All @@ -140,7 +140,7 @@ def plot_marine_vrfy(config):
colormap='jet',
comout=os.path.join(comout, 'vrfy', 'ana')), # ocean surface analysis
plotConfig(grid_file=grid_file,
data_file=os.path.join(com_ocean_history, f'{RUN}.t{gcyc}z.ocnf006.nc'),
data_file=os.path.join(com_ocean_history, f'{RUN}.ocean.t{gcyc}z.inst.f006.nc'),
variables_horiz={'ave_ssh': [-1.8, 1.3],
'Temp': [-1.8, 34.0],
'Salt': [30, 38]},
Expand Down
4 changes: 2 additions & 2 deletions test/soca/gw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ set(jjob_list "JGLOBAL_PREP_OCEAN_OBS"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN"
# "JGDAS_GLOBAL_OCEAN_ANALYSIS_LETKF"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_POST")
"JGDAS_GLOBAL_OCEAN_ANALYSIS_POST"
# TODO(WaterPeople) Add back to the list of tested jobs once fixed
# "JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY")
"JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY")

set(setup "")
foreach(jjob ${jjob_list})
Expand Down
3 changes: 1 addition & 2 deletions ush/soca/run_jjobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ def _conda_envs(self, jjob):
self.f.write(f"set -u \n")
elif self.machine == "hera":
if jjob in ENVS:
self.f.write(f"module unload GDAS \n")
self.f.write(f"module load {ENVS[jjob].upper()/{self.machine}} \n")
self.f.write(f"module load {ENVS[jjob].upper()}/{self.machine} \n")

def precom(self, com, tmpl):
cmd = f"RUN={self.RUN} YMD={self.gPDY} HH={self.gcyc} declare_from_tmpl -xr {com}:{tmpl}"
Expand Down
4 changes: 2 additions & 2 deletions ush/soca/soca_vrfy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def plotZonalSlice(config):
data = xr.open_dataset(config['fields file'])
lat_index = np.argmin(np.array(np.abs(np.squeeze(grid.lat)[:, 0]-lat)))
slice_data = np.squeeze(np.array(data[variable]))[:, lat_index, :]
depth = np.squeeze(np.array(grid['h']))[:, lat_index, :]
depth = np.squeeze(np.array(data['h']))[:, lat_index, :]
depth[np.where(np.abs(depth) > 10000.0)] = 0.0
depth = np.cumsum(depth, axis=0)
bounds = config['bounds']
Expand Down Expand Up @@ -161,7 +161,7 @@ def plotMeridionalSlice(config):
data = xr.open_dataset(config['fields file'])
lon_index = np.argmin(np.array(np.abs(np.squeeze(grid.lon)[0, :]-lon)))
slice_data = np.squeeze(np.array(data[config['variable']]))[:, :, lon_index]
depth = np.squeeze(np.array(grid['h']))[:, :, lon_index]
depth = np.squeeze(np.array(data['h']))[:, :, lon_index]
depth[np.where(np.abs(depth) > 10000.0)] = 0.0
depth = np.cumsum(depth, axis=0)
bounds = config['bounds']
Expand Down
Loading