Changeset 909


Ignore:
Timestamp:
06/14/19 11:29:25 (5 years ago)
Author:
dubos
Message:

devel : safeguards when using caldyn_conserv=energy_gassmann

Location:
codes/icosagcm/devel/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • codes/icosagcm/devel/src/dynamics/caldyn_gcm.F90

    r906 r909  
    310310 
    311311    SELECT CASE(caldyn_conserv) 
    312     CASE(conserv_energy) ! energy-conserving 
     312    CASE(conserv_energy, conserv_gassmann) ! energy-conserving 
    313313       DO ind=1,ndomain 
    314314          IF (.NOT. assigned_domain(ind)) CYCLE 
    … …  
    401401        
    402402    CASE DEFAULT 
     403       PRINT *, 'Invalid value of caldyn_conserv : ', caldyn_conserv 
    403404       STOP 
    404405    END SELECT 

  • codes/icosagcm/devel/src/dynamics/caldyn_kernels.f90

    r733 r909  
    284284 
    285285    CASE DEFAULT 
     286       PRINT *, 'Invalid value of caldyn_conserv : ', caldyn_conserv 
    286287       STOP 
    287288    END SELECT 

  • codes/icosagcm/devel/src/time/timeloop_gcm.f90

    r906 r909  
    115115    SELECT CASE(scheme_family) 
    116116    CASE(explicit) 
     117       IF(caldyn_conserv == conserv_gassmann) THEN 
     118          PRINT *, 'caldyn_conserv = energy_gassmann is not implemented for RK time schemes, use time_scheme=ARK2.3 .' 
     119          STOP 
     120       END IF 
    117121       ! Trends 
    118122       CALL allocate_field(f_dps,field_t,type_real,name='dps') 
Note: See TracChangeset for help on using the changeset viewer.