Changeset 3586 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Jan 20, 2025, 10:31:40 AM (6 months ago)

Author:

jbclement

Message:

Mars PCM:

• Albedo is now set properly in every situation given the presence of CO2/H2O ice and frost + water albedo is done solely in "physiq".
• Small update to make the display of code version status/diff clearer.

JBC

File:

• trunk/LMDZ.COMMON/makelmdz_fcm (modified) (5 diffs)

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -611 +611 @@
 vcs_info=""
 vcs_diff=""
-vcs_status=""
+vcs_stat=""
 for dir in "$LMDGCM/.."/*; do
     # Skip if it is not a directory or the name contains "git" or "svn"
@@ -619 +619 @@
     # Determine the version control system for each subdirectory
     if command -v svn > /dev/null && svn info "$dir" > /dev/null 2>&1; then # SVN
-        vcs_info+="\n=== SVN Information for $(basename "$dir") ===\n$(svn info "$dir")\n"
-        vcs_diff+="\n=== SVN Diff for $(basename "$dir") ===\n$(svn diff "$dir")\n"
-        vcs_status+="\n=== SVN Status for $(basename "$dir") ===\n$(svn status "$dir")\n"
+        vcs_info+="\n-> SVN Information for \"$(basename "$dir")\"\n$(svn info "$dir")\n"
+        vcs_diff+="\n-> SVN Diff for \"$(basename "$dir")\"\n$(svn diff "$dir")\n"
+        vcs_stat+="\n-> SVN Status for \"$(basename "$dir")\"\n$(svn status "$dir")\n"
     elif command -v git > /dev/null && git -C "$dir" rev-parse --is-inside-work-tree > /dev/null 2>&1; then # Git
-        vcs_info+="=== Git Information for $(basename "$dir") ===\n$(git -C "$dir" log -1 --pretty=format:"%H%n%an%n%ad%n%s")\n"
-        vcs_diff+="\n=== Git Diff for $(basename "$dir") ===\n$(git -C "$dir" diff)\n"
-        vcs_status+="\n=== Git Status for $(basename "$dir") ===\n$(git -C "$dir" status --short)\n"
+        vcs_info+="-> Git Information for \"$(basename "$dir")\"\n$(git -C "$dir" log -1 --pretty=format:"%H%n%an%n%ad%n%s")\n"
+        vcs_diff+="\n-> Git Diff for \"$(basename "$dir")\"\n$(git -C "$dir" diff)\n"
+        vcs_stat+="\n-> Git Status for \"$(basename "$dir")\"\n$(git -C "$dir" status --short)\n"
     else # None
-        vcs_info+="\n=== No version control system for $(basename "$dir") ===\n"
+        vcs_info+="\n-> No version control system for \"$(basename "$dir")\"\n"
     fi
 done
@@ -659 +659 @@
 
 write(*,'(a)') '======= Compilation details ======='
-write(*,'(a)') '> Date: ${current_date}'
-write(*,'(a)') '> Command: ${compilation_command}'
+write(*,'(a)') '-> Date: ${current_date}'
+write(*,'(a)') '-> Command: ${compilation_command}'
 write(*,*)
 EOF
@@ -670 +670 @@
     done <<< "$(echo -e "$vcs_info")"
 else
-    echo "write(*,'(a)') '=== No version control system ==='" >> "$info_file"
-fi
-
-if [ -n "$vcs_status" ]; then
+    echo "write(*,'(a)') '==== No version control system ===='" >> "$info_file"
+fi
+
+if [ -n "$vcs_stat" ]; then
     echo "write(*,*)" >> "$info_file"
-    echo "write(*,'(a)') '=== Version Control Status ==='" >> "$info_file"
-    echo "write(*,'(a)') '> Writing status result to the file \"${res_file}\".'" >> "$info_file"
+    echo "write(*,'(a)') '====== Version Control Status ====='" >> "$info_file"
+    echo "write(*,'(a)') '-> Writing status result to the file \"${res_file}\".'" >> "$info_file"
     echo "open(unit = 1, file = \"${res_file}\",status = 'replace',action = 'write')" >> "$info_file"
     while IFS= read -r line; do
         echo "write(1,'(a)') '${line//\'/\'\'}'" >> "$info_file"
-    done <<< "$(echo -e "$vcs_status")"
+    done <<< "$(echo -e "$vcs_stat")"
     echo "close(1)" >> "$info_file"
 fi
@@ -687 +687 @@
     echo "write(*,*)" >> "$info_file"
     echo "write(*,'(a)') '====== Version Control Diff ======='" >> "$info_file"
-    echo "write(*,'(a)') '> Writing diff result to the file \"${res_file}\".'" >> "$info_file"
+    echo "write(*,'(a)') '-> Writing diff result to the file \"${res_file}\".'" >> "$info_file"
     echo "open(unit = 1, file = \"${res_file}\",status = 'unknown',position = 'append',action = 'write')" >> "$info_file"
     while IFS= read -r line; do