quick fix for lnd_resume issue, inst_index + 1, no debug output

HPSCTerrSys · Aug 2, 2024 · 370e56f · 370e56f
1 parent 41d46dd
commit 370e56f
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/clm5/cpl/lnd_comp_mct.F90 b/src/clm5/cpl/lnd_comp_mct.F90
@@ -722,23 +722,23 @@ subroutine lnd_handle_resume( infodata )
     call seq_infodata_GetData(infodata, lnd_resume=lnd_resume )
     ! If lnd_resume is blank, restart file wasn't modified
 
-    write(iulog,"(a,i10,i10,i10)") 'eCLM(lnd_comp_mct): iam, inst_index, num_inst_lnd ', iam, inst_index, num_inst_lnd
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, min(inst_index, num_inst_lnd) ', iam, min(num_inst_lnd,inst_index)
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, SHR_KIND_CL ', iam, SHR_KIND_CL
-    write(iulog,*) 'eCLM(lnd_comp_mct): iam, lnd_resume(1) ', iam, lnd_resume(1)
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len(lnd_resume(1)) ', iam, len(lnd_resume(1))
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len_trim(lnd_resume(1)) ', iam, len_trim(lnd_resume(1))
-    write(iulog,*) 'eCLM(lnd_comp_mct): iam, lnd_resume(num_inst_lnd) ', iam, lnd_resume(num_inst_lnd)
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len(lnd_resume(num_inst_lnd)) ', iam, len(lnd_resume(num_inst_lnd))
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len_trim(lnd_resume(num_inst_lnd)) ', iam, len_trim(lnd_resume(num_inst_lnd))
-    write(iulog,*) 'eCLM(lnd_comp_mct): iam, lnd_resume(min(num_inst_lnd,inst_index)) ', iam, lnd_resume(min(num_inst_lnd,inst_index))
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len(lnd_resume(min(num_inst_lnd,inst_index))) ', iam, len(lnd_resume(min(num_inst_lnd,inst_index)))
-    write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len_trim(lnd_resume(min(num_inst_lnd,inst_index))) ', iam, len_trim(lnd_resume(min(num_inst_lnd,inst_index)))
+    ! write(iulog,"(a,i10,i10,i10)") 'eCLM(lnd_comp_mct): iam, inst_index, num_inst_lnd ', iam, inst_index, num_inst_lnd
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, min(inst_index, num_inst_lnd) ', iam, min(num_inst_lnd,inst_index)
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, SHR_KIND_CL ', iam, SHR_KIND_CL
+    ! write(iulog,*) 'eCLM(lnd_comp_mct): iam, lnd_resume(1) ', iam, lnd_resume(1)
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len(lnd_resume(1)) ', iam, len(lnd_resume(1))
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len_trim(lnd_resume(1)) ', iam, len_trim(lnd_resume(1))
+    ! write(iulog,*) 'eCLM(lnd_comp_mct): iam, lnd_resume(num_inst_lnd) ', iam, lnd_resume(num_inst_lnd)
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len(lnd_resume(num_inst_lnd)) ', iam, len(lnd_resume(num_inst_lnd))
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len_trim(lnd_resume(num_inst_lnd)) ', iam, len_trim(lnd_resume(num_inst_lnd))
+    ! write(iulog,*) 'eCLM(lnd_comp_mct): iam, lnd_resume(min(num_inst_lnd,inst_index)) ', iam, lnd_resume(min(num_inst_lnd,inst_index))
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len(lnd_resume(min(num_inst_lnd,inst_index))) ', iam, len(lnd_resume(min(num_inst_lnd,inst_index)))
+    ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len_trim(lnd_resume(min(num_inst_lnd,inst_index))) ', iam, len_trim(lnd_resume(min(num_inst_lnd,inst_index)))
     ! write(iulog,*) 'eCLM(lnd_comp_mct): iam, lnd_resume(0) ', iam, lnd_resume(0)
     ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len(lnd_resume(0)) ', iam, len(lnd_resume(0))
     ! write(iulog,"(a,i10,i10)") 'eCLM(lnd_comp_mct): iam, len_trim(lnd_resume(0)) ', iam, len_trim(lnd_resume(0))
 
-    if ( len_trim(lnd_resume(min(num_inst_lnd,inst_index))) == 0 )then
+    if ( len_trim(lnd_resume(min(num_inst_lnd,inst_index + 1))) == 0 )then
        resume_from_data_assim = .false.
     ! Otherwise restart was modified and we are resuming from data assimulation
     else