Changeset 3350 for trunk/LMDZ.MARS

Timestamp:

May 31, 2024, 3:04:18 PM (6 months ago)

Author:

jbclement

Message:

Mars PCM:

• Correction for the script "launch_orb_1Dchained.sh" in the deftank.
• Small cleanings related to error detection.

JBC

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• deftank/launch_orb_1Dchained.sh (modified) (1 diff)
• libf/phymars/dyn1d/testphys1d.F90 (modified) (1 diff)
• libf/phymars/phyetat0_mod.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4660 +4660 @@
 Following commit r3337, threshold for vdifc subtimestep is no longer hardcoded
 and explicitly commented.
+
+== 31/05/2024 == JBC
+- Correction for the script "launch_orb_1Dchained.sh" in the deftank.
+- Small cleanings related to error detection.

trunk/LMDZ.MARS/deftank/launch_orb_1Dchained.sh

@@ -88 +88 @@
 while [ $i_myear -lt $n_myears ]; do
     # Get the new values for the orbital parameters
-    yearlask=$(echo "$eyears_bp_ini + $i_myear*$convert_years" | bc -l)
+    yearlask=$(echo "($eyears_bp_ini + $i_myear*$convert_years)/1000." | bc -l)
     found=false
     read -r y1 obl1 ecc1 lsp1 < "$orb_data"

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F90

@@ -268 +268 @@
 if (startfiles_1D) call writerestart1D('restart1D.txt',psurf,tsurf(1,:),nlayer,size(tsurf,2),temp,u,v,nq,noms,qsurf(1,:,:),q)
 
-write(*,*) "testphys1d: everything is cool."
+write(*,*) "testphys1d: everything is cool!"
 
 END PROGRAM testphys1d

trunk/LMDZ.MARS/libf/phymars/phyetat0_mod.F90

@@ -840 +840 @@
         write(*,*) "phyetat0: Failed loading <perennial_co2ice> : ", &
                    "<perennial_co2ice> is set as 10m at the South Pole"
-        if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) then
-            perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
-            qsurf(ngrid,igcm_co2_tmp,:) = qsurf(ngrid - 1,igcm_co2_tmp,:) 
-        endif
+        if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
     endif ! not found
   else ! no startfiphyle
@@ -850 +847 @@
     d_coef = 4.e-4
     perennial_co2ice = 0.
-    if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) then
-        perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
-        qsurf(ngrid,igcm_co2_tmp,:) = qsurf(ngrid - 1,igcm_co2_tmp,:)
-    endif
+    if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
   endif !startphy_file
 else