Skip to content

Commit 5c7d171

Browse files
authored
Add capability to create varobs and cx files for MTG-IRS (#234)
* namelists for mtgirs * add ops code to include mtgirs for cx and varobs files * add MTG-IRS ctests * add tests to CMakeLists file * add MTG-IRS * to retrigger CI * retrigger CI * test with older version of JCSDA container
1 parent abd7c20 commit 5c7d171

24 files changed

+189
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
--entrypoint=/usr/local/src/${REPO}/${PR}/build-and-test \
7676
--workdir=/usr/local/src/${REPO}/${PR} \
7777
--volume ${PWD}/${PR}:/usr/local/src/${REPO}/${PR} \
78-
'jcsda/docker-gnu-openmpi-dev:latest'
78+
'jcsda/docker-gnu-openmpi-dev:skylab-v8'
7979
8080
build2:
8181
if: |

deps/ops/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ set(OPS_SOURCE_FILES
2020
code/OpsMod_AirQuality/OpsMod_AirQuality.f90
2121
code/OpsMod_Argument/OpsMod_Argument.f90
2222
code/OpsMod_CXInfo/OpsMod_CXInfo.f90
23-
code/OpsMod_Control/OpsMod_Control.f90
2423
code/OpsMod_DateTime/OpsMod_DateTime.f90
2524
code/OpsMod_GatherSpread/OpsMod_GatherSpread.F90
2625
code/OpsMod_HorizontalInterp/OpsMod_HorizontalInterp.f90
@@ -88,6 +87,7 @@ set(OPS_SOURCE_FILES
8887
stubs/OpsMod_Varobs/OpsMod_Varobs.f90
8988
stubs/Ops_SatRad_Info/OpsMod_SatRad_RTmodel.f90
9089
stubs/Ops_SatRad_SetUp/OpsMod_SatRad_SetUp.f90
90+
stubs/OpsMod_Control/OpsMod_Control.f90
9191
)
9292

9393
# Intel inserts lines in the source during pre-processing that contain the source file path, if the pathname

deps/ops/code/OpsMod_Control/OpsFn_ModelRuntoModelId.inc renamed to deps/ops/stubs/OpsMod_Control/OpsFn_ModelRuntoModelId.inc

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

deps/ops/code/OpsMod_Control/Ops_ReadObsGroupSwitches.inc renamed to deps/ops/stubs/OpsMod_Control/Ops_ReadObsGroupSwitches.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Using(ObsGroupHIRAS) = ops_env_is_true ("OPS_HIRAS")
102102
Using(ObsGroupOceanWinds) = ops_env_is_true ("OPS_OCEANWINDS")
103103
Using(ObsGroupGIIRSLW) = ops_env_is_true ("OPS_GIIRSLW")
104104
Using(ObsGroupGIIRSMW) = ops_env_is_true ("OPS_GIIRSMW")
105+
Using(ObsGroupMTGIRS) = ops_env_is_true ("OPS_MTGIRS")
105106

106107
ALLOCATE (obs_group_list(COUNT (using)))
107108
obs_group_list = IMDI

deps/ops/code/OpsMod_Control/Ops_ReadOutputSwitches.inc renamed to deps/ops/stubs/OpsMod_Control/Ops_ReadOutputSwitches.inc

File renamed without changes.

deps/ops/stubs/OpsMod_Varobs/Ops_GetDefaultVarfields.inc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,15 @@ SELECT CASE (ObsGroup)
177177
IF (.NOT. RTTOV_CloudSwitch) THEN
178178
Varfields(13:14) = (/Varfield_cloudtopp, Varfield_cloudfrac/)
179179
END IF
180+
CASE (ObsGroupMTGIRS)
181+
Varfields(1:12) = (/Varfield_tskin,Varfield_tcozone,Varfield_satzenith, &
182+
Varfield_surface,Varfield_stratt,Varfield_satid, &
183+
Varfield_numchans,Varfield_channum,Varfield_britemp, &
184+
Varfield_emissivity,Varfield_solzenith, &
185+
Varfield_qcinfo/)
186+
IF (.NOT. RTTOV_CloudSwitch) THEN
187+
Varfields(13:14) = (/Varfield_cloudtopp, Varfield_cloudfrac/)
188+
END IF
180189
CASE (ObsGroupIN3DIClr)
181190
Varfields(1:12) = (/Varfield_britemp,Varfield_satid,Varfield_satzenith, &
182191
Varfield_solzenith,Varfield_tskin,Varfield_tcozone, &

0 commit comments

Comments
 (0)