Ignore:
Timestamp:
Jun 4, 2007 8:07:41 AM (14 years ago)
Author:
raasch
Message:

more preliminary uncomplete changes for ocean version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/prognostic_equations.f90

    r95 r96  
    44! Actual revisions:
    55! -----------------
    6 ! prognostic equation for salinity
    7 ! new argument zw in calls of diffusion_e
     6! prognostic equation for salinity, density is calculated from equation of
     7! state for seawater, +eqn_state_seawater_mod
     8! new argument zw in calls of diffusion_e, calc_mean_pt_profile renamed
     9! calc_mean_profile
    810!
    911! Former revisions:
     
    4143    USE control_parameters
    4244    USE cpulog
     45    USE eqn_state_seawater_mod
    4346    USE grid_variables
    4447    USE indices
     
    107110!-- Calculate those variables needed in the tendency terms which need
    108111!-- global communication
    109     CALL calc_mean_pt_profile( pt, 4 )
    110     IF ( humidity )  CALL calc_mean_pt_profile( vpt, 44 )
     112    CALL calc_mean_profile( pt, 4 )
     113    IF ( ocean    )  CALL calc_mean_profile( rho, 64 )
     114    IF ( humidity )  CALL calc_mean_profile( vpt, 44 )
    111115
    112116!
     
    495499                ENDIF
    496500             ENDIF
     501
     502!
     503!--          Calculate density by the equation of state for seawater
     504             CALL eqn_state_seawater( i, j )
    497505
    498506          ENDDO
     
    758766!-- Calculate those variables needed in the tendency terms which need
    759767!-- global communication
    760     CALL calc_mean_pt_profile( pt, 4 )
    761     IF ( humidity )  CALL calc_mean_pt_profile( vpt, 44 )
     768    CALL calc_mean_profile( pt, 4 )
     769    IF ( ocean    )  CALL calc_mean_profile( rho, 64 )
     770    IF ( humidity )  CALL calc_mean_profile( vpt, 44 )
    762771    IF ( .NOT. constant_diffusion )  CALL production_e_init
    763772
     
    10201029                   ENDIF
    10211030                ENDIF
     1031
     1032!
     1033!--             Calculate density by the equation of state for seawater
     1034                CALL eqn_state_seawater( i, j )
    10221035
    10231036             ENDIF
     
    11781191!-- Calculate those variables needed in the tendency terms which need
    11791192!-- global communication
    1180     CALL calc_mean_pt_profile( pt, 4 )
    1181     IF ( humidity )  CALL calc_mean_pt_profile( vpt, 44 )
     1193    CALL calc_mean_profile( pt, 4 )
     1194    IF ( ocean    )  CALL calc_mean_profile( rho, 64 )
     1195    IF ( humidity )  CALL calc_mean_profile( vpt, 44 )
    11821196
    11831197!
     
    15891603
    15901604       CALL cpu_log( log_point(37), 'sa-equation', 'stop' )
     1605
     1606!
     1607!--    Calculate density by the equation of state for seawater
     1608       CALL cpu_log( log_point(38), 'eqns-seawater', 'start' )
     1609       CALL eqn_state_seawater
     1610       CALL cpu_log( log_point(38), 'eqns-seawater', 'stop' )
    15911611
    15921612    ENDIF
Note: See TracChangeset for help on using the changeset viewer.