Changeset 3516 for trunk


Ignore:
Timestamp:
Nov 14, 2024, 12:57:31 PM (10 days ago)
Author:
jbclement
Message:

PEM:
Small corrections related to r3498 (time step from integer to real) for the launching script + making a proper initilization of 'year_bp_ini' in case of there is no orbital evolution.
JBC

Location:
trunk/LMDZ.COMMON/libf/evolution
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LMDZ.COMMON/libf/evolution/changelog.txt

    r3514 r3516  
    483483== 13/11/2024 == JBC
    484484Small correction for the launching script following the r3498 (time step from integer to real).
     485
     486== 14/11/2024 == JBC
     487Small corrections related to r3498 (time step from integer to real) for the launching script + making a proper initilization of 'year_bp_ini' in case of there is no orbital evolution.
  • trunk/LMDZ.COMMON/libf/evolution/conf_pem.F90

    r3498 r3516  
    6262call getin('evol_orbit_pem',evol_orbit_pem)
    6363
    64 year_bp_ini = 0.
     64year_earth_bp_ini = 0.
    6565call getin('year_earth_bp_ini',year_earth_bp_ini)
    6666year_bp_ini = year_earth_bp_ini/convert_years
     
    6868var_obl = .true.
    6969call getin('var_obl',var_obl)
    70 write(*,*) 'Does obliquity vary ?',var_obl
     70write(*,*) 'Does obliquity vary?',var_obl
    7171
    7272var_ecc = .true.
    7373call getin('var_ecc',var_ecc)
    74 write(*,*) 'Does eccentricity vary ?',var_ecc
     74write(*,*) 'Does eccentricity vary?',var_ecc
    7575
    7676var_lsp = .true.
    7777call getin('var_lsp',var_lsp)
    78 write(*,*) 'Does Ls peri vary ?',var_lsp
     78write(*,*) 'Does Ls peri vary?',var_lsp
    7979
    8080!#---------- Stopping criteria parameters ----------#
    8181Max_iter_pem = 100000000
    8282call getin('Max_iter_pem',Max_iter_pem)
     83write(*,*) 'Max_iter_pem =',Max_iter_pem
    8384
    8485h2o_ice_crit = 0.2
    8586call getin('h2o_ice_crit',h2o_ice_crit)
     87write(*,*) 'h2o_ice_crit =',h2o_ice_crit
    8688
    8789co2_ice_crit = 0.2
    8890call getin('co2_ice_crit',co2_ice_crit)
     91write(*,*) 'co2_ice_crit =',co2_ice_crit
    8992
    9093ps_criterion = 0.15
    9194call getin('ps_criterion',ps_criterion)
     95write(*,*) 'ps_criterion =',ps_criterion
    9296
    9397dt = 1.
     
    128132    call abort_physic(modname,"Ice table must be used when soil_pem = T",1)
    129133endif
    130 if (icetable_equilibrium .or. icetable_dynamic) then
     134if (icetable_equilibrium .and. icetable_dynamic) then
    131135    write(*,*) 'Ice table is asked to be computed both by the equilibrium and dynamic method.'
    132136    write(*,*) 'The dynamic method is then chosen.'
     137    icetable_dynamic = .false.
    133138endif
    134139
  • trunk/LMDZ.COMMON/libf/evolution/deftank/lib_launchPEM.sh

    r3514 r3516  
    5252
    5353    if [ -v n_mars_years ] && [ ! -z "$n_mars_years" ]; then
    54         if [ $n_mars_years -lt 0. ]; then
     54        if [ $(echo "$n_mars_years < 0." | bc -l) ]; then
    5555            echo "Error: the value of 'n_mars_years' must be >0!"
    5656            errlaunch
    5757        fi
    5858    elif [ -v n_earth_years ] && [ ! -z "$n_earth_years" ]; then
    59         if [ $n_earth_years -lt 0. ]; then
     59        if [ $(echo "$n_earth_years < 0." | bc -l) ]; then
    6060            echo "Error: the value of 'n_earth_years' must be >0!"
    6161            errlaunch
  • trunk/LMDZ.COMMON/libf/evolution/pem.F90

    r3512 r3516  
    10121012!    II_f Update the tendencies
    10131013!------------------------
    1014     call recomp_tend_co2_slope(ngrid,nslope,timelen,d_co2ice,d_co2ice_ini,co2_ice,emis,vmr_co2_PCM,vmr_co2_PEM_phys,ps_timeseries, &
    1015                                global_avg_press_PCM,global_avg_press_new)
     1014    call recomp_tend_co2_slope(ngrid,nslope,timelen,d_co2ice,d_co2ice_ini,co2_ice,emis,vmr_co2_PCM,vmr_co2_PEM_phys,ps_timeseries,global_avg_press_PCM,global_avg_press_new)
    10161015
    10171016!------------------------
Note: See TracChangeset for help on using the changeset viewer.