Deleted files in the old version

[jinmuluo]

Hi,

I found the newest version of CLM has deleted "src/cpl/mct/clm_cpl_indices.F90" when I was merging my code with the newest version of CLM. I have several important definitions in the deleted file, where I can relocate my code?

In case you need to check my code status: /glade/u/home/jinmuluo/CLM6.0-FANv3tag01

Thanks!

Jinmu

 

[slevis]

I visited the directory with your code, and I typed
git status
At the top I see this suggestion:
use "git merge --abort" to abort the merge
I wonder if this will bring your code back to the state that you were familiar with.

 

[jinmuluo]

I visited the directory with your code, and I typed
git status
At the top I see this suggestion:
use "git merge --abort" to abort the merge
I wonder if this will bring your code back to the state that you were familiar with.

Hi Sam,

Thank you, but if I wish to continue the merge, how can I find the "src/cpl/mct/clm_cpl_indices.F90: in the new code? I suppose this file has been moved to somewhere in the newest CLM?

best,

 

[slevis]

how can I find the "src/cpl/mct/clm_cpl_indices.F90: in the new code? I suppose this file has been moved to somewhere in the newest CLM?

I think /mct has been removed in the version that you're looking at. This is why I suggested aborting the merge, so that you may bring it back. Then you can save a copy of that file elsewhere and start over with the merge. Alternatively, in another directory, you could checkout the older version of the code to find the file of interest and then come back to this one and continue the merge.

 

[slevis]

Oh, but mct was replaced with nuopc. Maybe you can find what you're looking for in the nuopc code. However, I'm not familiar with it to guide you where to look.

 

[jinmuluo]

Oh, but mct was replaced with nuopc. Maybe you can find what you're looking for in the nuopc code. However, I'm not familiar with it to guide you where to look.

Thank you Sam!

Hi @oleson @erik
Could you help guide me to where I can start moving my code under src/cpl/mct ? I guess both "mct" and "share_esmf" have very similar functions but mct has been removed but "share_esmf" still exists.

best,

Jinmu

 

[oleson]

I think the code in src/cpl/nuopc is similar.

 

[jinmuluo]

I think the code in src/cpl/nuopc is similar.

Hi Keith,

I need "src/cpl/mct/clm_cpl_indices.F90" to call my functions like


! FAN fluxes
if (shr_fan_to_atm) then
index_l2x_Fall_flxnh3 = mct_avect_indexra(l2x,trim(shr_fan_fields_token))
else
index_l2x_Fall_flxnh3 = 0
end if

Is there any similar function in "src/cpl/nuopc", thanks! Happy new year.

 

[oleson]

I don't know specifics about how the mct to nuopc transition was implemented, sorry. I'll ping @erik here. Maybe he knows of some documentation somewhere.

 

[jinmuluo]

I don't know specifics about how the mct to nuopc transition was implemented, sorry. I'll ping @erik here. Maybe he knows of some documentation somewhere.

Hi Keith,

I am still working on this issue but have one uncommon error, I don't know does this error is associated with the conflicts above, do you know what kind of error it is?

/glade/derecho/scratch/jinmuluo/CLM6test/bld/cesm.bldlog.250103-112837

Best,

Jinmu

 

[slevis]

This error
/glade/u/home/jinmuluo/CLM6.0-FANv3tag01/src/main/controlMod.F90:591: undefined reference to `lunareadnml_'
is not as uncommon as you may think. Code developers may see this error when they introduce a call to a subroutine that has not been referenced in the "use" statements. I think a relatively easy way to do this is to look at how it was done for other calls in the same section of code.

 

[jinmuluo]

Hi Sam,

Thank you, but if I wish to continue the merge, how can I find the "src/cpl/mct/clm_cpl_indices.F90: in the new code? I suppose this file has been moved to somewhere in the newest CLM?

best,

@erik
Hi Erik,

Could you please give me some suggestions on this issue? Thank you so much!

best,