Skip to content

Commit 2213089

Browse files
sdrabenhsdrabenh
authored
Merge branch 'develop' into bugfix/mathomp4/#188-fix-salt-split
2 parents b4d0592 + 937e509 commit 2213089

File tree

5 files changed

+36
-31
lines changed

5 files changed

+36
-31
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ target_link_libraries (GEOSgcm.x ${OpenMP_Fortran_LIBRARIES})
1717
set_target_properties(GEOSgcm.x PROPERTIES LINK_FLAGS "${OpenMP_Fortran_FLAGS}")
1818
target_include_directories (GEOSgcm.x PUBLIC ${INC_ESMF})
1919

20-
file (GLOB templates *.tmpl)
20+
file (GLOB templates CONFIGURE_DEPENDS *.tmpl)
2121

2222
set (programs
2323
gcm_setup

‎HISTORY.AOGCM-MOM6.rc.tmpl‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,21 +199,22 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
199199
'DZ' , 'DYN' , 'HLML',
200200
'RUNOFF' , 'SURFACE' ,
201201
'DISCHARGE' , 'SURFACE' ,
202-
# additonal exports for skin SST
203-
# 'EVAPOUT' , 'SURFACE' ,
204-
# 'DCOOL' , 'SURFACE' ,
205-
# 'DWARM' , 'SURFACE' ,
206-
# 'TDROP' , 'SURFACE' , 'DELT_COOL' ,
207-
# 'TS_FOUND' , 'SURFACE' , 'BULK_SST' ,
208-
# 'TDEL' , 'SURFACE' ,
202+
# additonal exports
203+
'EVAPOUT' , 'SURFACE' ,
204+
'DCOOL' , 'SURFACE' ,
205+
'DWARM' , 'SURFACE' ,
206+
'TDROP' , 'SURFACE' , 'DELT_COOL' ,
207+
'TS_FOUND' , 'SURFACE' , 'BULK_SST' ,
208+
# 'SS_FOUND' , 'SURFACE' , 'BULK_SSS' ,
209+
'TDEL' , 'SURFACE' ,
209210
# 'BCOOL' , 'SURFACE' ,
210211
# 'LCOOL' , 'SURFACE' ,
211212
# 'TBAR' , 'SURFACE' ,
212-
# 'USTARW' , 'SURFACE' ,
213+
'USTARW' , 'SURFACE' ,
213214
# 'SWCOOL' , 'SURFACE' ,
214-
# 'QCOOL' , 'SURFACE' ,
215+
'QCOOL' , 'SURFACE' ,
215216
# 'DELTS' , 'SURFACE' ,
216-
# 'QWARM' , 'SURFACE' ,
217+
'QWARM' , 'SURFACE' ,
217218
# 'SWWARM' , 'SURFACE' ,
218219
# 'LANGM' , 'SURFACE' ,
219220
# 'PHIW' , 'SURFACE' ,

‎HISTORY.AOGCM.rc.tmpl‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,22 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
203203
'DZ' , 'DYN' , 'HLML',
204204
'RUNOFF' , 'SURFACE' ,
205205
'DISCHARGE' , 'SURFACE' ,
206-
# additonal exports for skin SST
207-
# 'EVAPOUT' , 'SURFACE' ,
208-
# 'DCOOL' , 'SURFACE' ,
209-
# 'DWARM' , 'SURFACE' ,
210-
# 'TDROP' , 'SURFACE' , 'DELT_COOL' ,
211-
# 'TS_FOUND' , 'SURFACE' , 'BULK_SST' ,
212-
# 'TDEL' , 'SURFACE' ,
206+
# additonal exports
207+
'EVAPOUT' , 'SURFACE' ,
208+
'DCOOL' , 'SURFACE' ,
209+
'DWARM' , 'SURFACE' ,
210+
'TDROP' , 'SURFACE' , 'DELT_COOL' ,
211+
'TS_FOUND' , 'SURFACE' , 'BULK_SST' ,
212+
# 'SS_FOUND' , 'SURFACE' , 'BULK_SSS' ,
213+
'TDEL' , 'SURFACE' ,
213214
# 'BCOOL' , 'SURFACE' ,
214215
# 'LCOOL' , 'SURFACE' ,
215216
# 'TBAR' , 'SURFACE' ,
216-
# 'USTARW' , 'SURFACE' ,
217+
'USTARW' , 'SURFACE' ,
217218
# 'SWCOOL' , 'SURFACE' ,
218-
# 'QCOOL' , 'SURFACE' ,
219+
'QCOOL' , 'SURFACE' ,
219220
# 'DELTS' , 'SURFACE' ,
220-
# 'QWARM' , 'SURFACE' ,
221+
'QWARM' , 'SURFACE' ,
221222
# 'SWWARM' , 'SURFACE' ,
222223
# 'LANGM' , 'SURFACE' ,
223224
# 'PHIW' , 'SURFACE' ,

‎HISTORY_S2S.rc.tmpl‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -383,21 +383,22 @@ COLLECTIONS: 'geosgcm_6hrins'
383383
'DZ' , 'DYN' , 'HLML',
384384
'RUNOFF' , 'SURFACE' ,
385385
'DISCHARGE' , 'SURFACE' ,
386-
# additonal exports for skin SST
387-
# 'EVAPOUT' , 'SURFACE' ,
388-
# 'DCOOL' , 'SURFACE' ,
389-
# 'DWARM' , 'SURFACE' ,
390-
# 'TDROP' , 'SURFACE' , 'DELT_COOL' ,
391-
# 'TS_FOUND' , 'SURFACE' , 'BULK_SST' ,
392-
# 'TDEL' , 'SURFACE' ,
386+
# additonal exports
387+
'EVAPOUT' , 'SURFACE' ,
388+
'DCOOL' , 'SURFACE' ,
389+
'DWARM' , 'SURFACE' ,
390+
'TDROP' , 'SURFACE' , 'DELT_COOL' ,
391+
'TS_FOUND' , 'SURFACE' , 'BULK_SST' ,
392+
# 'SS_FOUND' , 'SURFACE' , 'BULK_SSS' ,
393+
'TDEL' , 'SURFACE' ,
393394
# 'BCOOL' , 'SURFACE' ,
394395
# 'LCOOL' , 'SURFACE' ,
395396
# 'TBAR' , 'SURFACE' ,
396-
# 'USTARW' , 'SURFACE' ,
397+
'USTARW' , 'SURFACE' ,
397398
# 'SWCOOL' , 'SURFACE' ,
398-
# 'QCOOL' , 'SURFACE' ,
399+
'QCOOL' , 'SURFACE' ,
399400
# 'DELTS' , 'SURFACE' ,
400-
# 'QWARM' , 'SURFACE' ,
401+
'QWARM' , 'SURFACE' ,
401402
# 'SWWARM' , 'SURFACE' ,
402403
# 'LANGM' , 'SURFACE' ,
403404
# 'PHIW' , 'SURFACE' ,

‎gcm_convert.j‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ limit stacksize unlimited
2727
setenv ARCH `uname`
2828

2929
setenv SITE @SITE
30+
setenv GEOSDIR @GEOSDIR
3031
setenv GEOSBIN @GEOSBIN
3132
setenv GCMVER @GCMVER
3233

@@ -340,6 +341,7 @@ sed -r -i -e "/RESTART_TYPE:/ s/binary|pbinary|pnc4/$fromtype/" \
340341
-e "/CHECKPOINT_TYPE:/ s/binary|pbinary|pnc4/$totype/" \
341342
-e "/^ *NX:/ s/[0-9][0-9]*/@CNV_NX/" \
342343
-e "/^ *NY:/ s/[0-9][0-9]*/@CNV_NY/" \
344+
-e "/^ *NUM_READERS:/ s/[0-9][0-9]*/1/" \
343345
-e "/AEROCLIM/ d" AGCM.rc
344346

345347
# Remove any suffixes

0 commit comments

Comments
 (0)