Skip to content

Commit 368369e

Browse files
authored
Merge pull request #1303 from cacraigucar/cam_rpointer
cam6_4_089: Update externals to match alpha06f and bring in timestamped rpointer files
2 parents c8bf04e + 096a0aa commit 368369e

File tree

13 files changed

+139
-25
lines changed

13 files changed

+139
-25
lines changed

.gitmodules

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git
1414

1515
[submodule "pumas"]
16-
path = src/physics/pumas
17-
url = https://github.com/ESCOMP/PUMAS
16+
path = src/physics/pumas
17+
url = https://github.com/ESCOMP/PUMAS
1818
fxrequired = AlwaysRequired
1919
fxtag = pumas_cam-release_v1.38
2020
fxDONOTUSEurl = https://github.com/ESCOMP/PUMAS
@@ -116,21 +116,21 @@
116116
[submodule "cism"]
117117
path = components/cism
118118
url = https://github.com/ESCOMP/CISM-wrapper
119-
fxtag = cismwrap_2_2_005
119+
fxtag = cismwrap_2_2_006
120120
fxrequired = ToplevelRequired
121121
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
122122

123123
[submodule "rtm"]
124124
path = components/rtm
125125
url = https://github.com/ESCOMP/RTM
126-
fxtag = rtm1_0_84
126+
fxtag = rtm1_0_86
127127
fxrequired = ToplevelRequired
128128
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
129129

130130
[submodule "mosart"]
131131
path = components/mosart
132132
url = https://github.com/ESCOMP/MOSART
133-
fxtag = mosart1.1.07
133+
fxtag = mosart1.1.08
134134
fxrequired = ToplevelRequired
135135
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
136136

@@ -144,28 +144,28 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
144144
[submodule "ccs_config"]
145145
path = ccs_config
146146
url = https://github.com/ESMCI/ccs_config_cesm.git
147-
fxtag = ccs_config_cesm1.0.39
147+
fxtag = ccs_config_cesm1.0.40
148148
fxrequired = ToplevelRequired
149149
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
150150

151151
[submodule "cime"]
152152
path = cime
153153
url = https://github.com/ESMCI/cime
154-
fxtag = cime6.1.72
154+
fxtag = cime6.1.93
155155
fxrequired = ToplevelRequired
156156
fxDONOTUSEurl = https://github.com/ESMCI/cime
157157

158158
[submodule "cmeps"]
159159
path = components/cmeps
160160
url = https://github.com/ESCOMP/CMEPS.git
161-
fxtag = cmeps1.0.39
161+
fxtag = cmeps1.0.47
162162
fxrequired = ToplevelRequired
163163
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
164164

165165
[submodule "cdeps"]
166166
path = components/cdeps
167167
url = https://github.com/ESCOMP/CDEPS.git
168-
fxtag = cdeps1.0.69
168+
fxtag = cdeps1.0.73
169169
fxrequired = ToplevelRequired
170170
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
171171

@@ -179,7 +179,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
179179
[submodule "parallelio"]
180180
path = libraries/parallelio
181181
url = https://github.com/NCAR/ParallelIO
182-
fxtag = pio2_6_3
182+
fxtag = pio2_6_4
183183
fxrequired = ToplevelRequired
184184
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
185185

@@ -193,14 +193,14 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
193193
[submodule "clm"]
194194
path = components/clm
195195
url = https://github.com/ESCOMP/CTSM
196-
fxtag = ctsm5.3.017
196+
fxtag = ctsm5.3.029
197197
fxrequired = ToplevelRequired
198198
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
199199

200200
[submodule "fms"]
201201
path = libraries/FMS
202202
url = https://github.com/ESCOMP/FMS_interface
203-
fxtag = fi_240828
203+
fxtag = fi_250411
204204
fxrequired = ToplevelRequired
205205
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
206206

cime_config/config_archive.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
<hist_file_extension>e</hist_file_extension>
1010
<rest_history_varname>nhfil</rest_history_varname>
1111
<rpointer>
12-
<rpointer_file>rpointer.atm$NINST_STRING</rpointer_file>
12+
<rpointer_file>rpointer.cam$NINST_STRING.$DATENAME</rpointer_file>
1313
<rpointer_content>$CASE.cam$NINST_STRING.r.$DATENAME.nc </rpointer_content>
1414
</rpointer>
1515
<test_file_names>
16-
<tfile disposition="copy">rpointer.atm</tfile>
17-
<tfile disposition="copy">rpointer.atm_9999</tfile>
16+
<tfile disposition="copy">rpointer.cam.1976-01-01-00000</tfile>
17+
<tfile disposition="copy">rpointer.cam_9999.1976-01-01-00000</tfile>
18+
<tfile disposition="ignore">rpointer.cam.1976-02-01-00000</tfile>
19+
<tfile disposition="ignore">rpointer.cam_9999.1976-01-02-00000</tfile>
1820
<tfile disposition="copy">casename.cam.r.1976-01-01-00000.nc</tfile>
1921
<tfile disposition="copy">casename.cam.rh4.1976-01-01-00000.nc</tfile>
2022
<tfile disposition="move">casename.cam.h0.1976-01-01-00000.nc</tfile>

components/cism

components/clm

Submodule clm updated 79 files

0 commit comments

Comments
 (0)