Skip to content

Commit 8ba1f82

Browse files
committed
Move init of iac component
Move init of iac component to first so that iac_present can be set correctly. Default for all _present logicals is true and the init methods will set them to false if no model is present. lnd init now needs it set correctly.
1 parent a437652 commit 8ba1f82

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

driver-moab/main/cime_comp_mod.F90

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,15 +1395,17 @@ subroutine cime_pre_init2()
13951395
ice_present=ice_present, &
13961396
rof_present=rof_present, &
13971397
flood_present=flood_present, &
1398-
rofice_present=rofice_present)
1398+
rofice_present=rofice_present, &
1399+
iac_present=iac_present)
13991400

14001401
call seq_infodata_putData(infodata, &
14011402
lnd_present=lnd_present, &
14021403
ocn_present=ocn_present, &
14031404
ice_present=ice_present, &
14041405
rof_present=rof_present, &
14051406
flood_present=flood_present, &
1406-
rofice_present=rofice_present)
1407+
rofice_present=rofice_present, &
1408+
iac_present=iac_present)
14071409
endif
14081410
if(PIO_FILE_IS_OPEN(pioid)) then
14091411
call pio_closefile(pioid)
@@ -1505,6 +1507,12 @@ subroutine cime_init()
15051507
call t_startf('CPL:comp_init_cc_atm')
15061508
call t_adj_detailf(+2)
15071509

1510+
call t_startf('CPL:comp_init_cc_iac')
1511+
call t_adj_detailf(+2)
1512+
call component_init_cc(Eclock_z, iac, iac_init, infodata, NLFilename)
1513+
call t_adj_detailf(-2)
1514+
call t_stopf('CPL:comp_init_cc_iac')
1515+
15081516
call component_init_cc(Eclock_a, atm, atm_init, infodata, NLFilename)
15091517
call t_adj_detailf(-2)
15101518
call t_stopf('CPL:comp_init_cc_atm')
@@ -1551,12 +1559,6 @@ subroutine cime_init()
15511559
call t_adj_detailf(-2)
15521560
call t_stopf('CPL:comp_init_cc_esp')
15531561

1554-
call t_startf('CPL:comp_init_cc_iac')
1555-
call t_adj_detailf(+2)
1556-
call component_init_cc(Eclock_z, iac, iac_init, infodata, NLFilename)
1557-
call t_adj_detailf(-2)
1558-
call t_stopf('CPL:comp_init_cc_iac')
1559-
15601562

15611563
!---------------------------------------------------------------------------------------
15621564
! Initialize coupler-component data
@@ -1579,14 +1581,14 @@ subroutine cime_init()
15791581
!---------------------------------------------------------------------------------------
15801582
call t_startf('CPL:comp_init_cx_all')
15811583
call t_adj_detailf(+2)
1584+
call component_init_cx(iac, infodata)
15821585
call component_init_cx(atm, infodata)
15831586
call component_init_cx(lnd, infodata)
15841587
call component_init_cx(rof, infodata)
15851588
call component_init_cx(ocn, infodata)
15861589
call component_init_cx(ice, infodata)
15871590
call component_init_cx(glc, infodata)
15881591
call component_init_cx(wav, infodata)
1589-
call component_init_cx(iac, infodata)
15901592
call t_adj_detailf(-2)
15911593
call t_stopf('CPL:comp_init_cx_all')
15921594

0 commit comments

Comments
 (0)