Changeset 3350 for trunk


Ignore:
Timestamp:
May 31, 2024, 3:04:18 PM (7 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
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.COMMON/libf/dyn3d/abort_gcm.F

    r1391 r3350  
    5151      write(lunout,*) 'Reason = ',message
    5252      if (ierr .eq. 0) then
    53         write(lunout,*) 'Everything is cool'
     53        write(lunout,*) 'Everything is cool!'
    5454        stop
    5555      else
    56         write(lunout,*) 'Houston, we have a problem ', ierr
     56        write(lunout,*) 'Houston, we have a problem, ierr =', ierr
    5757        stop 1
    5858      endif

  • trunk/LMDZ.COMMON/libf/dyn3dpar/abort_gcm.F

    r1391 r3350  
    5151      write(lunout,*) 'Reason = ',message
    5252      if (ierr .eq. 0) then
    53         write(lunout,*) 'Everything is cool'
     53        write(lunout,*) 'Everything is cool!'
    5454      else
    55         write(lunout,*) 'Houston, we have a problem, ierr = ', ierr
     55        write(lunout,*) 'Houston, we have a problem, ierr =', ierr
    5656#ifdef CPP_MPI
    5757C$OMP CRITICAL (MPI_ABORT_GCM)

  • trunk/LMDZ.COMMON/libf/phy_common/abort_physic.F90

    r1521 r3350  
    3737      write(lunout,*) 'Reason = ',message
    3838      if (ierr .eq. 0) then
    39         write(lunout,*) 'Everything is cool'
     39        write(lunout,*) 'Everything is cool!'
    4040      else
    41         write(lunout,*) 'Houston, we have a problem, ierr = ', ierr
     41        write(lunout,*) 'Houston, we have a problem, ierr =', ierr
    4242#ifdef CPP_MPI
    4343!$OMP CRITICAL (MPI_ABORT_PHYSIC)

  • trunk/LMDZ.MARS/changelog.txt

    r3348 r3350  
    46604660Following commit r3337, threshold for vdifc subtimestep is no longer hardcoded
    46614661and explicitly commented.
     4662
     4663== 31/05/2024 == JBC
     4664- Correction for the script "launch_orb_1Dchained.sh" in the deftank.
     4665- Small cleanings related to error detection.

  • trunk/LMDZ.MARS/deftank/launch_orb_1Dchained.sh

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

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

    r3262 r3350  
    268268if (startfiles_1D) call writerestart1D('restart1D.txt',psurf,tsurf(1,:),nlayer,size(tsurf,2),temp,u,v,nq,noms,qsurf(1,:,:),q)
    269269
    270 write(*,*) "testphys1d: everything is cool."
     270write(*,*) "testphys1d: everything is cool!"
    271271
    272272END PROGRAM testphys1d

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

    r3343 r3350  
    840840        write(*,*) "phyetat0: Failed loading <perennial_co2ice> : ", &
    841841                   "<perennial_co2ice> is set as 10m at the South Pole"
    842         if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) then
    843             perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
    844             qsurf(ngrid,igcm_co2_tmp,:) = qsurf(ngrid - 1,igcm_co2_tmp,:)
    845         endif
     842        if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
    846843    endif ! not found
    847844  else ! no startfiphyle
    … …  
    850847    d_coef = 4.e-4
    851848    perennial_co2ice = 0.
    852     if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) then
    853         perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
    854         qsurf(ngrid,igcm_co2_tmp,:) = qsurf(ngrid - 1,igcm_co2_tmp,:)
    855     endif
     849    if (abs(latitude(ngrid) - (-pi/2.)) < 1.e-5) perennial_co2ice(ngrid,:) = 10*1.6e3 ! 10m which is convert to kg/m^2
    856850  endif !startphy_file
    857851else
Note: See TracChangeset for help on using the changeset viewer.