Changeset 3771


Ignore:
Timestamp:
05/17/10 10:06:48 (15 years ago)
Author:
Mathieu Morlighem
Message:

Added some assertion

Location:
issm/trunk/src/c
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/include/macros.h

    r3595 r3771  
    55#ifndef _MACROS_H_
    66#define _MACROS_H_
     7
     8#ifdef HAVE_CONFIG_H
     9        #include "config.h"
     10#else
     11#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
     12#endif
    713
    814/*Printing macro: */
     
    2430#else
    2531#define ISSMASSERT(ignore)\
    26   ((void) 0)
     32  printf("ISSM_DEBUG undefined\n");
    2733#endif
     34#define ISSMASSERT2(statement)\
     35  if (!(statement)) ISSMERROR("ASSERT2 STOP"); else printf("NO STOP\n")
    2836
    2937/*The following macros hide the error exception handling in a matlab module. Just put
  • issm/trunk/src/c/parallel/diagnostic_core.cpp

    r3767 r3771  
    99#include "./parallel.h"
    1010#include "../modules.h"
     11#include "../include/macros.h"
    1112
    1213void diagnostic_core(DataSet* results,Model* model){
     
    7879        /*recover fem models: */
    7980        fem_dh=model->GetFormulation(DiagnosticAnalysisEnum,HorizAnalysisEnum);
    80         fem_dv=model->GetFormulation(DiagnosticAnalysisEnum,VertAnalysisEnum);
    81         fem_ds=model->GetFormulation(DiagnosticAnalysisEnum,StokesAnalysisEnum);
    82         fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum,HutterAnalysisEnum);
    83         fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum);
     81        fem_dv=model->GetFormulation(DiagnosticAnalysisEnum,VertAnalysisEnum);    ISSMASSERT(fem_dv); 
     82        fem_ds=model->GetFormulation(DiagnosticAnalysisEnum,StokesAnalysisEnum);  ISSMASSERT(fem_ds);
     83        fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum,HutterAnalysisEnum); ISSMASSERT(fem_dhu);
     84        fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum);                   ISSMASSERT(fem_sl);
    8485
    8586        //specific parameters for specific models
Note: See TracChangeset for help on using the changeset viewer.