State tax filing

First, let me say that when I began this project I inquired with a CPA and he said I could include the roof as part of the Solar deduction since it was structurally required to bear the weight of the solar panels.  The project was started in 2019 and qualifies for the 30% credit.

 

Now, reading through this thread I have a couple of questions but first some background:

 

When I looked at getting solar panels, the company was unsure of the load characteristics of the existing roof.  Therefore, I had the company do an engineering analysis.  That report stated that I needed to reinforce the existing roof (Homasote with a built-up tar covering, supported by 4x6 beams on 32" centers, common here in South Florida in houses built in the '50's) to carry the weight of the solar panels.  The restructure of the entire roof was done to the engineering specifications and a Metal standing seam roof (with insulation) was installed.  The structural analysis was reviewed and approved by the local government as was the installation (4 separate inspections).

 

So, now the solar panels are installed.  They cover about 66% of the restructured roof.

 

My questions are:

1)  Since the restructure of the entire roof was required, can I add the cost to the solar credit?

2)  If so, can I use the entire amount?  Of course, I could not have rebuilt only 66% of the roof since the entire roof bears the weight.

 

Thank you.