Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fox grid2 #59

Merged
merged 10 commits into from
Aug 28, 2024
Merged

Fox grid2 #59

merged 10 commits into from
Aug 28, 2024

Conversation

janrohlicek
Copy link
Collaborator

@janrohlicek janrohlicek commented Aug 19, 2024

Re-worked Fox Grid interfaces

@vincefn
Copy link
Owner

vincefn commented Aug 23, 2024

Is this working under windows when creating a job from an xml file ? I could not make this work under macOS - the job window creation remains stuck as if the number of trials provided was zero regardless of the number given.

@janrohlicek
Copy link
Collaborator Author

Is this working under windows when creating a job from an xml file ? I could not make this work under macOS - the job window creation remains stuck as if the number of trials provided was zero regardless of the number given.

Hi, it works well under windows. Strange, that it does not work under MacOS. I will check for possible errors...

@vincefn
Copy link
Owner

vincefn commented Aug 23, 2024

Could you also merge back the main branch into this one ? There's a conflict with the visual c++ project file (now that I merged the ssNMR branch), it's likely better if you do this merge.

@vincefn
Copy link
Owner

vincefn commented Aug 24, 2024

OK, I found the issue when editing a job: you are using ToLong((long * ) &trials) (where trials is an int), which is incorrect- on windows it's OK as both int and long are 32-bit, but this does not work under linux or macOS (int is 32-bit, long 64, see https://www.ccoderun.ca/programming/2017-03-10_sizeof/).

Using ToInt() instead solves this. I removed all int->long pointer casting.

vincefn and others added 3 commits August 24, 2024 13:38
* commit '6770100aee1a7814f2f82a8a8cece6e4199a25de':
  Correct mutable vector<vector<int> > (missing space between >>)
  Remove IMD in GUI and one bug
  Removing mName from ScatteringComponent
  Getting back one change that should not be in ssNMR branch
  InterMolDistPar::mAt1 -> vector
  Fine tunning
  speeding up
  Updating project file
  Bug repaired
  Trying to rewrite/restore the lost code
  changes from GUI
  Update Crystal.cpp
  InterMolDistPar XML input and output InterMolDistCost and Scale in GUI
  ssNMR: user-input introduced window with a list of intermolecular restraints
  **The aim of this branch is to introduce intermolecular distances (conditions) between selected atoms and calculation of additional cost function based on that. Intermolecular distances can be measured by ssNMR.**

# Conflicts:
#	.gitignore
#	Fox/Fox_vc12.vcxproj
@vincefn
Copy link
Owner

vincefn commented Aug 24, 2024

@janrohlicek OK, I should have fixed the compilation on macOS and linux. I let you check if everything is still OK under windows, then I will merge.

I has some issues starting the local client in macOS, it was not always working, not yet sure why. otherwise looks good !

@janrohlicek
Copy link
Collaborator Author

Hi, I apologize, I was out of PC during the weekend. Both, client and master search free ports for communication. They check it using the GridCommunication::getUsedPorts(). This function uses netstat -an command to get the info about free ports. Isnt that the source of troubles under macOS?

@vincefn
Copy link
Owner

vincefn commented Aug 26, 2024

Hi, I apologize, I was out of PC during the weekend. Both, client and master search free ports for communication. They check it using the GridCommunication::getUsedPorts(). This function uses netstat -an command to get the info about free ports. Isnt that the source of troubles under macOS?

I don't know - it did not work a few times, and then it did - I am not sure why. Maybe there was still a Fox client leftover, and that created an issue. I'll do some more tests when I have the time, but don't worry about it.

Can you test if the code works for you correctly under windows correctly (also the parts coming from inter-molecular restraints). If yes, I'll merge the code, and can start preparing a release (or maybe beta release) by the end of the week so it's available for you at EPDIC.

@janrohlicek
Copy link
Collaborator Author

I just finished testing on 3 PCs in the network and it works. Also the ssNMR functionality works. Great!:)

@vincefn vincefn merged commit 5f14da6 into master Aug 28, 2024
@vincefn vincefn deleted the FOXGrid2 branch September 4, 2024 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants